Use lazy ugettext to avoid import loops

Conflicts:

	etherpadlite/models.py

etherpadlite/forms.py

@@ -1,5 +1,5 @@
 from django import forms
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 
 class PadCreate(forms.Form):
   name = forms.CharField(label=_("Name"))

etherpadlite/models.py

@@ -1,8 +1,8 @@
 from django.db import models
 from django.contrib.auth.models import User, Group
 from django.db.models.signals import pre_delete
-from django.utils.translation import ugettext as _
-
+from django.utils.translation import ugettext_lazy as _
+from django.conf import settings
 from py_etherpad import EtherpadLiteClient
 
 class PadServer(models.Model):

etherpadlite/views.py

@@ -8,7 +8,7 @@
 from django.template import RequestContext
 from django.core.context_processors import csrf
 from django.contrib.auth.decorators import login_required
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 from py_etherpad import EtherpadLiteClient
 
 @login_required(login_url='/etherpad')