diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index e15280b93c..8959ba83e5 100644
Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index f363ea28a3..8048f23e48 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -8,13 +8,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-08 00:51+0200\n"
+"POT-Creation-Date: 2005-10-17 16:26+0200\n"
 "PO-Revision-Date: 2005-10-08 00:03+0200\n"
 "Last-Translator: Georg Bauer <gb@bofh.ms>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: models/core.py:57
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Hier sollte ein absoluter Pfad stehen, ohne den Domainnamen. Beispiel: '/"
+"events/search/'."
+
+#: models/core.py:59
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Hier mus entweder ein absoluter Pfad oder eine komplette URL mit http:// am "
+"Anfang stehen."
+
+#: models/core.py:74
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Beispiel: '/about/contact/'. Wichtig: vorne und hinten muss ein / stehen."
+
+#: models/core.py:79
+msgid ""
+"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
+"use 'flatfiles/default'."
+msgstr ""
+"Beispiel: 'flatfiles/contact_page'. Wenn dieses Feld nicht gef�llt ist, wird "
+"'flatfiles/default' als Standard gew�hlt."
+
+#: models/core.py:80
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Wenn hier ein Haken ist, k�nnen nur angemeldete Benutzer diese Seite sehen."
+
+#: models/auth.py:33
+msgid "Use an MD5 hash -- not the raw password."
+msgstr "Nicht das Passwort selber eintragen, sondern dessen MD5 signatur."
+
+#: models/auth.py:34
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
+"Gibt an, ob der Benutzer sich an der Administrationsseite anmelden kann."
+
+#: models/auth.py:40
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Zus�tzlich zu den manuell angelegten Rechten erh�lt dieser Benutzer auch "
+"alle Rechte, die seine zugewiesenen Gruppen haben."
+
+#: conf/admin_templates/base_site.html:3
+msgid "Django site admin"
+msgstr "Django Systemverwaltung"
+
+#: conf/admin_templates/base_site.html:6
+msgid "Django administration"
+msgstr "Django Verwaltung"
+
 #: conf/admin_templates/admin_object_history.html:4
 #: conf/admin_templates/base.html:28
 #: conf/admin_templates/registration/password_change_done.html:3
@@ -49,43 +109,6 @@ msgstr ""
 "Dieses Objekt hat keine �nderungsgeschichte. Es wurde m�glicherweise nicht "
 "�ber diese Verwaltungsseiten angelegt."
 
-#: conf/admin_templates/changelist_generic.html:8
-#: conf/admin_templates/index.html:26
-msgid "Add"
-msgstr "Zuf�gen"
-
-#: conf/admin_templates/changelist_generic.html:26
-msgid "Click to change"
-msgstr "Zur �nderung klicken"
-
-#: conf/admin_templates/base_site.html:3
-msgid "Django site admin"
-msgstr "Django Systemverwaltung"
-
-#: conf/admin_templates/base_site.html:6
-msgid "Django administration"
-msgstr "Django Verwaltung"
-
-#: conf/admin_templates/index.html:32
-msgid "Change"
-msgstr "�ndern"
-
-#: conf/admin_templates/index.html:42
-msgid "You don't have permission to edit anything."
-msgstr "Sie haben keine Berechtigung irgendwas zu �ndern."
-
-#: conf/admin_templates/index.html:50
-msgid "Recent Actions"
-msgstr "K�rzliche Aktionen"
-
-#: conf/admin_templates/index.html:51
-msgid "My Actions"
-msgstr "Meine Aktionen"
-
-#: conf/admin_templates/index.html:55
-msgid "None available"
-msgstr "Keine vorhanden"
-
 #: conf/admin_templates/500.html:5
 msgid "Server error (500)"
 msgstr "Serverfehler (500)"
@@ -103,15 +126,6 @@ msgstr ""
 "eMail weitergegeben und sollte bald behoben sein. Vielen Dank f�r Ihr "
 "Verst�ndnis."
 
-#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7
-msgid "Page not found"
-msgstr "Seite nicht gefunden"
-
-#: conf/admin_templates/404.html:9
-msgid "We're sorry, but the requested page could not be found."
-msgstr ""
-"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden."
-
 #: conf/admin_templates/delete_confirmation_generic.html:6
 #, python-format
 msgid ""
@@ -136,6 +150,39 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ja, ich bin sicher"
 
+#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7
+msgid "Page not found"
+msgstr "Seite nicht gefunden"
+
+#: conf/admin_templates/404.html:9
+msgid "We're sorry, but the requested page could not be found."
+msgstr ""
+"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden."
+
+#: conf/admin_templates/index.html:26
+msgid "Add"
+msgstr "Zuf�gen"
+
+#: conf/admin_templates/index.html:32
+msgid "Change"
+msgstr "�ndern"
+
+#: conf/admin_templates/index.html:42
+msgid "You don't have permission to edit anything."
+msgstr "Sie haben keine Berechtigung irgendwas zu �ndern."
+
+#: conf/admin_templates/index.html:50
+msgid "Recent Actions"
+msgstr "K�rzliche Aktionen"
+
+#: conf/admin_templates/index.html:51
+msgid "My Actions"
+msgstr "Meine Aktionen"
+
+#: conf/admin_templates/index.html:55
+msgid "None available"
+msgstr "Keine vorhanden"
+
 #: conf/admin_templates/login.html:14
 msgid "Username:"
 msgstr "Benutzername:"
@@ -281,6 +328,259 @@ msgstr "Vielen Dank, das Sie unsere Seiten benutzen!"
 msgid "The %(site_name)s team"
 msgstr "Das Team von %(site_name)s"
 
-#: core/validators.py:56
+#: core/validators.py:57
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Der Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten."
+
+#: core/validators.py:61
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr ""
+"Der Wert darf nur Buchstaben, Ziffern, Unterstriche und Schr�gstriche "
+"enthalten."
+
+#: core/validators.py:65
+msgid "Uppercase letters are not allowed here."
+msgstr "Gro�buchstaben sind hier nicht erlaubt."
+
+#: core/validators.py:69
+msgid "Lowercase letters are not allowed here."
+msgstr "Kleinbuchstaben sind hier nicht erlaubt."
+
+#: core/validators.py:76
+msgid "Enter only digits separated by commas."
+msgstr "Hier sind nur durch Komma getrennte Ziffern erlaubt."
+
+#: core/validators.py:88
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "Bitte mit Komma getrennte, g�ltige eMail-Adressen eingeben."
+
+#: core/validators.py:95
+msgid "Please enter a valid IP address."
+msgstr "Bitte eine g�ltige IP-Adresse eingeben."
+
+#: core/validators.py:99
+msgid "Empty values are not allowed here."
+msgstr "Dieses Feld darf nicht leer sein."
+
+#: core/validators.py:103
+msgid "Non-numeric characters aren't allowed here."
+msgstr "Nichtnumerische Zeichen sind hier nicht erlaubt."
+
+#: core/validators.py:107
+msgid "This value can't be comprised solely of digits."
+msgstr "Dieser Wert darf nicht nur aus Ziffern bestehen."
+
+#: core/validators.py:112
+msgid "Enter a whole number."
+msgstr "Bitte eine ganze Zahl eingeben."
+
+#: core/validators.py:116
+msgid "Only alphabetical characters are allowed here."
+msgstr "Nur alphabetische Zeichen sind hier erlaubt."
+
+#: core/validators.py:120
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Bitte ein g�ltiges Datum im Format JJJJ-MM-TT eingeben."
+
+#: core/validators.py:124
+msgid "Enter a valid time in HH:MM format."
+msgstr "Bitte eine g�ltige Zeit im Format SS:MM eingeben."
+
+#: core/validators.py:128
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr ""
+"Bitte eine g�ltige Datum+Zeit Angabe im Format JJJJ-MM-TT SS:MM eingeben."
+
+#: core/validators.py:132
+msgid "Enter a valid e-mail address."
+msgstr "Bitte eine g�ltige eMail-Adresse eingeben"
+
+#: core/validators.py:144
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Bitte ein Bild hochladen. Die Datei, die hochgeladen wurde, ist kein Bild "
+"oder ist defekt."
+
+#: core/validators.py:151
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr "Die URL %s zeigt nicht auf ein g�ltiges Bild."
+
+#: core/validators.py:155
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr ""
+"Telefonnummern m�ssen im Format XXX-XXX-XXXX sein. \"%s\" ist ung�ltig."
+
+#: core/validators.py:163
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr "Die URL %s zeigt nicht auf ein g�ltiges QuickTime video."
+
+#: core/validators.py:167
+msgid "A valid URL is required."
+msgstr "Eine g�ltige URL ist hier verlangt."
+
+#: core/validators.py:181
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+"Bitte g�ltiges HTML eingeben. Fehler sind:\n"
+"%s"
+
+#: core/validators.py:188
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr "Ung�ltiges XML: %s"
+
+#: core/validators.py:198
+#, python-format
+msgid "Invalid URL: %s"
+msgstr "Ung�ltige URL: %s"
+
+#: core/validators.py:200
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "Die URL %s funktioniert nicht."
+
+#: core/validators.py:206
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "Bitte eine g�ltige Abk�rzung f�r einen US-Staat eingeben."
+
+#: core/validators.py:221
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] "Keine Schimpfworte! Das Wort %s ist hier nicht gern gesehen!"
+msgstr[1] "Keine Schimpfworte! Die W�rter %s sind hier nicht gern gesehen!"
+
+#: core/validators.py:228
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr "Dieses Feld muss zum Feld '%s' passen."
+
+#: core/validators.py:247
+msgid "Please enter something for at least one field."
+msgstr "Bitte mindestens eins der Felder ausf�llen."
+
+#: core/validators.py:256 core/validators.py:267
+msgid "Please enter both fields or leave them both empty."
+msgstr "Bitte entweder beide Felder ausf�llen, oder beide leer lassen."
+
+#: core/validators.py:274
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr "Dieses Feld muss gef�llt sein, wenn Feld %(field)s den Wert %(value)s hat."
+
+#: core/validators.py:286
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr "Dieses Feld muss gef�llt sein, wenn Feld %(field)s nicht %(value)s ist."
+
+#: core/validators.py:305
+msgid "Duplicate values are not allowed."
+msgstr "Doppelte Werte sind hier nicht erlaubt."
+
+#: core/validators.py:328
+#, python-format
+msgid "This value must be a power of %s."
+msgstr "Dieser Wert muss eine Potenz von %s sein."
+
+#: core/validators.py:339
+msgid "Please enter a valid decimal number."
+msgstr "Bitte eine g�ltige Dezimalzahl eingeben."
+
+#: core/validators.py:341
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] "Bitte eine g�ltige Dezimalzahl mit maximal %s Ziffer eingeben."
+msgstr[1] "Bitte eine g�ltige Dezimalzahl mit maximal %s Ziffern eingeben."
+
+#: core/validators.py:344
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] "Bitte eine g�ltige Dezimalzahl mit maximal %s Dezimalstelle  eingeben."
+msgstr[1] "Bitte eine g�ltige Dezimalzahl mit maximal %s Dezimalstellen eingeben."
+
+#: core/validators.py:354
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr ""
+"Bitte sicherstellen, da� die hochgeladene Datei mindestens %s Bytes gross "
+"ist."
+
+#: core/validators.py:355
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr ""
+"Bitte sicherstellen, da� die hochgeladene Datei maximal %s Bytes gross ist."
+
+#: core/validators.py:368
+msgid "The format for this field is wrong."
+msgstr "Das Format f�r dieses Feld ist falsch."
+
+#: core/validators.py:383
+msgid "This field is invalid."
+msgstr "Dieses Feld ist ung�ltig."
+
+#: core/validators.py:418
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "Konnte nichts von %s empfangen."
+
+#: core/validators.py:421
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr "Die URL %(url)s lieferte den falschen Content-Type '%(contenttype)s'."
+
+#: core/validators.py:454
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr "Bitte das ungeschlossene %(tag)s Tag in Zeile %(line)s schlie�en. Die Zeile beginnt mit \"%(start)s\"."
+
+#: core/validators.py:458
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr "In Zeile %(line)s ist Text, der nicht in dem Kontext erlaubt ist. Die Zeile beginnt mit \"%(start)s\"."
+
+#: core/validators.py:463
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr "Das Attribute %(attr)s in Zeile %(line)s ist ung�ltig. Die Zeile beginnt mit \"%(start)s\"."
+
+#: core/validators.py:468
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr "<%(tag)s> in Zeile %(line)s ist ung�ltig. Die Zeile beginnt mit \"%(start)s\"."
+
+#: core/validators.py:472
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr "Ein Tag in Zeile %(line)s hat eines oder mehrere Pflichtattribute nicht. Die Zeile beginnt mit \"%(start)s\"."
+
+#: core/validators.py:477
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr "Das Attribut %(attr)s in Zeile %(line)s hat einen ung�ltigen Wert. Die Zeile beginnt mit \"%(start)s\"."
+
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index ca4d64058b..db8f41c11f 100644
Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index 48d640a126..e0897f4f42 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -7,79 +7,117 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-01 18:22+0200\n"
+"POT-Creation-Date: 2005-10-17 16:26+0200\n"
 "PO-Revision-Date: 2005-10-04 20:59GMT\n"
-"Last-Translator: Ricardo Javier C�rdenes Medina <ricardo.cardenes@gmail.com>\n"
+"Last-Translator: Ricardo Javier C�rdenes Medina <ricardo.cardenes@gmail."
+"com>\n"
 "Language-Team: Espa�ol <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
 
-#: core/validators.py:56
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Este valor debe contener s�lo letras, n�meros y gui�n bajo."
+#: models/core.py:57
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
 
-#: conf/admin_templates/404.html:3 conf/admin_templates/404.html:7
-#: conf/admin_templates/404.html.py:1 conf/admin_templates/404.html.py:2
-msgid "Page not found"
-msgstr "P�gina no encontrada"
+#: models/core.py:59
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
 
-#: conf/admin_templates/404.html:9 conf/admin_templates/404.html.py:3
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Lo sentimos, pero no se encuentra la p�gina solicitada."
+#: models/core.py:74
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
 
-#: conf/admin_templates/index.html:26
-#: conf/admin_templates/changelist_generic.html:8
-#: conf/admin_templates/changelist_generic.html.py:1
-#: conf/admin_templates/index.html.py:1
-msgid "Add"
-msgstr "Agregar"
+#: models/core.py:79
+msgid ""
+"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
+"use 'flatfiles/default'."
+msgstr ""
 
-#: conf/admin_templates/index.html:32 conf/admin_templates/index.html.py:2
-msgid "Change"
-msgstr "Modificar"
+#: models/core.py:80
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
 
-#: conf/admin_templates/index.html:50 conf/admin_templates/index.html.py:4
-msgid "Recent Actions"
-msgstr "Acciones recientes"
+#: models/auth.py:33
+msgid "Use an MD5 hash -- not the raw password."
+msgstr ""
 
-#: conf/admin_templates/index.html:51 conf/admin_templates/index.html.py:5
-msgid "My Actions"
-msgstr "Mis acciones"
+#: models/auth.py:34
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
 
-#: conf/admin_templates/index.html:55 conf/admin_templates/index.html.py:6
-msgid "None available"
-msgstr "Ninguno disponible"
+#: models/auth.py:40
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
 
 #: conf/admin_templates/base_site.html:3
-#: conf/admin_templates/base_site.html.py:1
 msgid "Django site admin"
 msgstr "Sitio de administraci�n de Django"
 
 #: conf/admin_templates/base_site.html:6
-#: conf/admin_templates/base_site.html.py:2
 msgid "Django administration"
 msgstr "Administraci�n de Django"
 
-#: conf/admin_templates/500.html:5 conf/admin_templates/500.html.py:1
+#: conf/admin_templates/admin_object_history.html:4
+#: conf/admin_templates/base.html:28
+#: conf/admin_templates/registration/password_change_done.html:3
+#: conf/admin_templates/registration/password_reset_form.html:3
+#: conf/admin_templates/registration/logged_out.html:3
+#: conf/admin_templates/registration/password_reset_done.html:3
+#: conf/admin_templates/registration/password_change_form.html:3
+msgid "Home"
+msgstr "Inicio"
+
+#: conf/admin_templates/admin_object_history.html:4
+msgid "History"
+msgstr "Hist�rico"
+
+#: conf/admin_templates/admin_object_history.html:17
+msgid "Date/time"
+msgstr "Fecha/hora"
+
+#: conf/admin_templates/admin_object_history.html:18
+msgid "User"
+msgstr "Usuario"
+
+#: conf/admin_templates/admin_object_history.html:19
+msgid "Action"
+msgstr "Acci�n"
+
+#: conf/admin_templates/admin_object_history.html:35
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Este objeto no tiene hist�rico de cambios. Probablemente no fue a�adido "
+"usando este sitio de administraci�n."
+
+#: conf/admin_templates/500.html:5
 msgid "Server error (500)"
 msgstr "Error del servidor (500)"
 
 #: conf/admin_templates/500.html:8
-msgid "Server error <em>(500)</em>"
-msgstr "Error del servidor <em>(500)</em>"
+msgid "Server Error <em>(500)</em>"
+msgstr "Error de servidor <em>(500)</em>"
 
-#: conf/admin_templates/500.html:9 conf/admin_templates/500.html.py:3
+#: conf/admin_templates/500.html:9
 msgid ""
 "There's been an error. It's been reported to the site administrators via e-"
 "mail and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Ha ocurrido un error. Se ha informado a los administradores del sitio mediante "
-"correo electr�nico y deber�a arreglarse en breve. Gracias por su paciencia"
+"Ha ocurrido un error. Se ha informado a los administradores del sitio "
+"mediante correo electr�nico y deber�a arreglarse en breve. Gracias por su "
+"paciencia"
 
 #: conf/admin_templates/delete_confirmation_generic.html:6
-#: conf/admin_templates/delete_confirmation_generic.html.py:1
 #, python-format
 msgid ""
 "Deleting the %(object_name)s  '%(object)s' would result in deleting related "
@@ -91,100 +129,102 @@ msgstr ""
 "siguientes tipos de objetos:"
 
 #: conf/admin_templates/delete_confirmation_generic.html:13
-#: conf/admin_templates/delete_confirmation_generic.html.py:2
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
 "the following related items will be deleted:"
 msgstr ""
-"�Est� seguro de que quiere borrar los %(object_name)s \"%(object)s\"? "
-"Se borrar�n los siguientes objetos relacionados:"
+"�Est� seguro de que quiere borrar los %(object_name)s \"%(object)s\"? Se "
+"borrar�n los siguientes objetos relacionados:"
 
-#: conf/admin_templates/login.html:14 conf/admin_templates/login.html.py:1
-msgid "Username:"
-msgstr "Usuario:"
-
-#: conf/admin_templates/login.html:17 conf/admin_templates/login.html.py:2
-msgid "Password:"
-msgstr "Clave:"
-
-#: conf/admin_templates/login.html:19 conf/admin_templates/login.html.py:3
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "�Ha <a href=\"/password_reset/\">olvidado su clave</a>?"
-
-#: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:1
-msgid "Welcome,"
-msgstr "Bienvenido,"
-
-#: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:2
-#: conf/admin_templates/base.html.py:5
-msgid "Change password"
-msgstr "Cambiar clave"
-
-#: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:3
-#: conf/admin_templates/base.html.py:5
-msgid "Log out"
-msgstr "Terminar"
-
-#: conf/admin_templates/base.html:28 conf/admin_templates/base.html.py:4
-#: conf/admin_templates/registration/password_change_done.html.py:1
-#: conf/admin_templates/registration/password_reset_form.html.py:1
-#: conf/admin_templates/registration/logged_out.html.py:1
-#: conf/admin_templates/registration/password_reset_done.html.py:1
-#: conf/admin_templates/registration/password_change_form.html.py:1
-#: conf/admin_templates/admin_object_history.html.py:1
-msgid "Home"
-msgstr "Inicio"
-
-#: conf/admin_templates/index.html:42 conf/admin_templates/index.html.py:3
-msgid "You don't have permission to edit anything."
-msgstr "No tiene permiso para editar nada."
-
-#: conf/admin_templates/changelist_generic.html.py:2
-msgid "Click to change"
-msgstr "Cambie para modificar"
-
-#: conf/admin_templates/500.html.py:2
-msgid "Server Error <em>(500)</em>"
-msgstr "Error de servidor <em>(500)</em>"
-
-#: conf/admin_templates/delete_confirmation_generic.html.py:3
+#: conf/admin_templates/delete_confirmation_generic.html:17
 msgid "Yes, I'm sure"
 msgstr "S�, estoy seguro"
 
-#: conf/admin_templates/login.html.py:4
+#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7
+msgid "Page not found"
+msgstr "P�gina no encontrada"
+
+#: conf/admin_templates/404.html:9
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Lo sentimos, pero no se encuentra la p�gina solicitada."
+
+#: conf/admin_templates/index.html:26
+msgid "Add"
+msgstr "Agregar"
+
+#: conf/admin_templates/index.html:32
+msgid "Change"
+msgstr "Modificar"
+
+#: conf/admin_templates/index.html:42
+msgid "You don't have permission to edit anything."
+msgstr "No tiene permiso para editar nada."
+
+#: conf/admin_templates/index.html:50
+msgid "Recent Actions"
+msgstr "Acciones recientes"
+
+#: conf/admin_templates/index.html:51
+msgid "My Actions"
+msgstr "Mis acciones"
+
+#: conf/admin_templates/index.html:55
+msgid "None available"
+msgstr "Ninguno disponible"
+
+#: conf/admin_templates/login.html:14
+msgid "Username:"
+msgstr "Usuario:"
+
+#: conf/admin_templates/login.html:17
+msgid "Password:"
+msgstr "Clave:"
+
+#: conf/admin_templates/login.html:19
+msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+msgstr "�Ha <a href=\"/password_reset/\">olvidado su clave</a>?"
+
+#: conf/admin_templates/login.html:23
 msgid "Log in"
 msgstr "Registrarse"
 
-#: conf/admin_templates/registration/password_change_done.html.py:2
-#: conf/admin_templates/registration/password_change_form.html.py:2
-#: conf/admin_templates/registration/password_change_form.html.py:3
-#: conf/admin_templates/registration/password_change_done.html.py:6
-#: conf/admin_templates/registration/password_change_form.html.py:4
-#: conf/admin_templates/registration/password_change_form.html.py:10
+#: conf/admin_templates/base.html:22
+msgid "Welcome,"
+msgstr "Bienvenido,"
+
+#: conf/admin_templates/base.html:22
+msgid "Change password"
+msgstr "Cambiar clave"
+
+#: conf/admin_templates/base.html:22
+msgid "Log out"
+msgstr "Terminar"
+
+#: conf/admin_templates/registration/password_change_done.html:3
+#: conf/admin_templates/registration/password_change_form.html:3
+#: conf/admin_templates/registration/password_change_form.html:5
+#: conf/admin_templates/registration/password_change_form.html:9
 msgid "Password change"
 msgstr "Cambiar clave"
 
-#: conf/admin_templates/registration/password_change_done.html.py:3
-#: conf/admin_templates/registration/password_change_done.html.py:4
+#: conf/admin_templates/registration/password_change_done.html:5
+#: conf/admin_templates/registration/password_change_done.html:9
 msgid "Password change successful"
 msgstr "Cambio de clave con �xito"
 
-#: conf/admin_templates/registration/password_change_done.html.py:5
+#: conf/admin_templates/registration/password_change_done.html:11
 msgid "Your password was changed."
 msgstr "Su clave ha cambiado."
 
-#: conf/admin_templates/registration/password_reset_form.html.py:2
-#: conf/admin_templates/registration/password_reset_form.html.py:3
-#: conf/admin_templates/registration/password_reset_form.html.py:4
-#: conf/admin_templates/registration/password_reset_done.html.py:2
-#: conf/admin_templates/registration/password_reset_form.html.py:8
-#: conf/admin_templates/registration/password_reset_form.html.py:9
-#: conf/admin_templates/registration/password_reset_done.html.py:6
+#: conf/admin_templates/registration/password_reset_form.html:3
+#: conf/admin_templates/registration/password_reset_form.html:5
+#: conf/admin_templates/registration/password_reset_form.html:9
+#: conf/admin_templates/registration/password_reset_done.html:3
 msgid "Password reset"
 msgstr "Recuperar clave"
 
-#: conf/admin_templates/registration/password_reset_form.html.py:5
+#: conf/admin_templates/registration/password_reset_form.html:11
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll reset "
 "your password and e-mail the new one to you."
@@ -192,37 +232,36 @@ msgstr ""
 "�Ha olvidado su clave? Introduzca su direcci�n de correo, y crearemos una "
 "nueva que le enviaremos por correo."
 
-#: conf/admin_templates/registration/password_reset_form.html.py:6
+#: conf/admin_templates/registration/password_reset_form.html:15
 msgid "E-mail address:"
 msgstr "Direcci�n de correo:"
 
-#: conf/admin_templates/registration/password_reset_form.html.py:7
+#: conf/admin_templates/registration/password_reset_form.html:15
 msgid "Reset my password"
 msgstr "Recuperar mi clave"
 
-#: conf/admin_templates/registration/logged_out.html.py:2
+#: conf/admin_templates/registration/logged_out.html:7
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy."
 
-#: conf/admin_templates/registration/logged_out.html.py:3
+#: conf/admin_templates/registration/logged_out.html:9
 msgid "Log in again"
 msgstr "Registrarse de nuevo"
 
-#: conf/admin_templates/registration/password_reset_done.html.py:3
-#: conf/admin_templates/registration/password_reset_done.html.py:4
+#: conf/admin_templates/registration/password_reset_done.html:5
+#: conf/admin_templates/registration/password_reset_done.html:9
 msgid "Password reset successful"
 msgstr "Recuperaci�n de clave con �xito"
 
-#: conf/admin_templates/registration/password_reset_done.html.py:5
+#: conf/admin_templates/registration/password_reset_done.html:11
 msgid ""
 "We've e-mailed a new password to the e-mail address you submitted. You "
 "should be receiving it shortly."
 msgstr ""
-"Le hemos enviado una clave nueva a la direcci�n que ha suministrado. "
-"Deber�a recibirla en breve."
+"Le hemos enviado una clave nueva a la direcci�n que ha suministrado. Deber�a "
+"recibirla en breve."
 
-#: conf/admin_templates/registration/password_change_form.html.py:4
-#: conf/admin_templates/registration/password_change_form.html.py:5
+#: conf/admin_templates/registration/password_change_form.html:11
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -230,78 +269,302 @@ msgstr ""
 "Por favor, introduzca su clave antigua, por seguridad, y despu�s introduzca "
 "la nueva clave dos veces para verificar que la ha escrito correctamente."
 
-#: conf/admin_templates/registration/password_change_form.html.py:5
-#: conf/admin_templates/registration/password_change_form.html.py:6
+#: conf/admin_templates/registration/password_change_form.html:16
 msgid "Old password:"
 msgstr "Clave antigua:"
 
-#: conf/admin_templates/registration/password_change_form.html.py:6
-#: conf/admin_templates/registration/password_change_form.html.py:7
+#: conf/admin_templates/registration/password_change_form.html:18
 msgid "New password:"
 msgstr "Clave nueva:"
 
-#: conf/admin_templates/registration/password_change_form.html.py:7
-#: conf/admin_templates/registration/password_change_form.html.py:8
+#: conf/admin_templates/registration/password_change_form.html:20
 msgid "Confirm password:"
 msgstr "Confirme clave:"
 
-#: conf/admin_templates/registration/password_change_form.html.py:8
-#: conf/admin_templates/registration/password_change_form.html.py:9
+#: conf/admin_templates/registration/password_change_form.html:22
 msgid "Change my password"
 msgstr "Cambiar mi clave"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:1
+#: conf/admin_templates/registration/password_reset_email.html:1
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr "Recibe este mensaje debido a que solicit� recuperar la clave"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:2
+#: conf/admin_templates/registration/password_reset_email.html:2
 #, python-format
 msgid "for your user account at %(site_name)s"
 msgstr "de su cuenta de usuario en %(site_name)s."
 
-#: conf/admin_templates/registration/password_reset_email.html.py:3
+#: conf/admin_templates/registration/password_reset_email.html:4
 #, python-format
 msgid "Your new password is: %(new_password)s"
 msgstr "Su nueva clave es: %(new_password)s"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:4
+#: conf/admin_templates/registration/password_reset_email.html:6
 msgid "Feel free to change this password by going to this page:"
 msgstr "Puede cambiarla accediendo a esta p�gina:"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:5
+#: conf/admin_templates/registration/password_reset_email.html:10
 msgid "Your username, in case you've forgotten:"
 msgstr "Su nombre de usuario, en caso de haberlo olvidado:"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:6
+#: conf/admin_templates/registration/password_reset_email.html:12
 msgid "Thanks for using our site!"
 msgstr "�Gracias por usar nuestro sitio!"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:7
+#: conf/admin_templates/registration/password_reset_email.html:14
 #, python-format
 msgid "The %(site_name)s team"
 msgstr "El equipo de %(site_name)s"
 
-#: conf/admin_templates/admin_object_history.html.py:2
-msgid "History"
-msgstr "Hist�rico"
+#: core/validators.py:57
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Este valor debe contener s�lo letras, n�meros y gui�n bajo."
 
-#: conf/admin_templates/admin_object_history.html.py:3
-msgid "Date/time"
-msgstr "Fecha/hora"
+#: core/validators.py:61
+#, fuzzy
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr "Este valor debe contener s�lo letras, n�meros y gui�n bajo."
 
-#: conf/admin_templates/admin_object_history.html.py:4
-msgid "User"
-msgstr "Usuario"
-
-#: conf/admin_templates/admin_object_history.html.py:5
-msgid "Action"
-msgstr "Acci�n"
-
-#: conf/admin_templates/admin_object_history.html.py:6
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
+#: core/validators.py:65
+msgid "Uppercase letters are not allowed here."
 msgstr ""
-"Este objeto no tiene hist�rico de cambios. Probablemente no fue a�adido "
-"usando este sitio de administraci�n."
 
+#: core/validators.py:69
+msgid "Lowercase letters are not allowed here."
+msgstr ""
+
+#: core/validators.py:76
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: core/validators.py:88
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr ""
+
+#: core/validators.py:95
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#: core/validators.py:99
+msgid "Empty values are not allowed here."
+msgstr ""
+
+#: core/validators.py:103
+msgid "Non-numeric characters aren't allowed here."
+msgstr ""
+
+#: core/validators.py:107
+msgid "This value can't be comprised solely of digits."
+msgstr ""
+
+#: core/validators.py:112
+msgid "Enter a whole number."
+msgstr ""
+
+#: core/validators.py:116
+msgid "Only alphabetical characters are allowed here."
+msgstr ""
+
+#: core/validators.py:120
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr ""
+
+#: core/validators.py:124
+msgid "Enter a valid time in HH:MM format."
+msgstr ""
+
+#: core/validators.py:128
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr ""
+
+#: core/validators.py:132
+#, fuzzy
+msgid "Enter a valid e-mail address."
+msgstr "Direcci�n de correo:"
+
+#: core/validators.py:144
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: core/validators.py:151
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr ""
+
+#: core/validators.py:155
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr ""
+
+#: core/validators.py:163
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr ""
+
+#: core/validators.py:167
+msgid "A valid URL is required."
+msgstr ""
+
+#: core/validators.py:181
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+
+#: core/validators.py:188
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr ""
+
+#: core/validators.py:198
+#, python-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+#: core/validators.py:200
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr ""
+
+#: core/validators.py:206
+msgid "Enter a valid U.S. state abbreviation."
+msgstr ""
+
+#: core/validators.py:221
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:228
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr ""
+
+#: core/validators.py:247
+msgid "Please enter something for at least one field."
+msgstr ""
+
+#: core/validators.py:256 core/validators.py:267
+msgid "Please enter both fields or leave them both empty."
+msgstr ""
+
+#: core/validators.py:274
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr ""
+
+#: core/validators.py:286
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr ""
+
+#: core/validators.py:305
+msgid "Duplicate values are not allowed."
+msgstr ""
+
+#: core/validators.py:328
+#, python-format
+msgid "This value must be a power of %s."
+msgstr ""
+
+#: core/validators.py:339
+msgid "Please enter a valid decimal number."
+msgstr ""
+
+#: core/validators.py:341
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:344
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:354
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr ""
+
+#: core/validators.py:355
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr ""
+
+#: core/validators.py:368
+msgid "The format for this field is wrong."
+msgstr ""
+
+#: core/validators.py:383
+msgid "This field is invalid."
+msgstr ""
+
+#: core/validators.py:418
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr ""
+
+#: core/validators.py:421
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+
+#: core/validators.py:454
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:458
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:463
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:468
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:472
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:477
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#~ msgid "Server error <em>(500)</em>"
+#~ msgstr "Error del servidor <em>(500)</em>"
+
+#~ msgid "Click to change"
+#~ msgstr "Cambie para modificar"
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index cbf806c417..5ff502c1cf 100644
Binary files a/django/conf/locale/it/LC_MESSAGES/django.mo and b/django/conf/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index 57d56f05d8..2e7aff6bb2 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-01 18:22+0200\n"
+"POT-Creation-Date: 2005-10-17 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,61 +16,98 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: core/validators.py:56
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Sono ammessi solo lettere, numeri e caratteri di sottolineaturai."
+#: models/core.py:57
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
 
-#: conf/admin_templates/404.html:3 conf/admin_templates/404.html:7
-#: conf/admin_templates/404.html.py:1 conf/admin_templates/404.html.py:2
-msgid "Page not found"
-msgstr "Pagina non trovata"
+#: models/core.py:59
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
 
-#: conf/admin_templates/404.html:9 conf/admin_templates/404.html.py:3
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Spiacente, ma la pagina richiesta non esiste."
+#: models/core.py:74
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
 
-#: conf/admin_templates/index.html:26
-#: conf/admin_templates/changelist_generic.html:8
-#: conf/admin_templates/changelist_generic.html.py:1
-#: conf/admin_templates/index.html.py:1
-msgid "Add"
-msgstr "Aggiungi"
+#: models/core.py:79
+msgid ""
+"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
+"use 'flatfiles/default'."
+msgstr ""
 
-#: conf/admin_templates/index.html:32 conf/admin_templates/index.html.py:2
-msgid "Change"
-msgstr "Cambia"
+#: models/core.py:80
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
 
-#: conf/admin_templates/index.html:50 conf/admin_templates/index.html.py:4
-msgid "Recent Actions"
-msgstr "Azioni Recenti"
+#: models/auth.py:33
+msgid "Use an MD5 hash -- not the raw password."
+msgstr ""
 
-#: conf/admin_templates/index.html:51 conf/admin_templates/index.html.py:5
-msgid "My Actions"
-msgstr "Proprie Azioni"
+#: models/auth.py:34
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
 
-#: conf/admin_templates/index.html:55 conf/admin_templates/index.html.py:6
-msgid "None available"
-msgstr "Nessuna disponibile"
+#: models/auth.py:40
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
 
 #: conf/admin_templates/base_site.html:3
-#: conf/admin_templates/base_site.html.py:1
 msgid "Django site admin"
 msgstr "Amministrazione sito Django"
 
 #: conf/admin_templates/base_site.html:6
-#: conf/admin_templates/base_site.html.py:2
 msgid "Django administration"
 msgstr "Amministrazione Django"
 
-#: conf/admin_templates/500.html:5 conf/admin_templates/500.html.py:1
+#: conf/admin_templates/admin_object_history.html:4
+#: conf/admin_templates/base.html:28
+#: conf/admin_templates/registration/password_change_done.html:3
+#: conf/admin_templates/registration/password_reset_form.html:3
+#: conf/admin_templates/registration/logged_out.html:3
+#: conf/admin_templates/registration/password_reset_done.html:3
+#: conf/admin_templates/registration/password_change_form.html:3
+msgid "Home"
+msgstr "Pagina iniziale"
+
+#: conf/admin_templates/admin_object_history.html:4
+msgid "History"
+msgstr "Storia"
+
+#: conf/admin_templates/admin_object_history.html:17
+msgid "Date/time"
+msgstr "Data/ora"
+
+#: conf/admin_templates/admin_object_history.html:18
+msgid "User"
+msgstr "Utente"
+
+#: conf/admin_templates/admin_object_history.html:19
+msgid "Action"
+msgstr "Azione"
+
+#: conf/admin_templates/admin_object_history.html:35
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Questo oggetto non ha cambiamenti storicizzati. Probabilmente non � stato "
+"creato con questo sito amministrativo."
+
+#: conf/admin_templates/500.html:5
 msgid "Server error (500)"
 msgstr "Errore del server (500)"
 
 #: conf/admin_templates/500.html:8
-msgid "Server error <em>(500)</em>"
-msgstr "Errore del server <em>(500)</em>"
+msgid "Server Error <em>(500)</em>"
+msgstr "Errore del Server <em>(500)</em>"
 
-#: conf/admin_templates/500.html:9 conf/admin_templates/500.html.py:3
+#: conf/admin_templates/500.html:9
 msgid ""
 "There's been an error. It's been reported to the site administrators via e-"
 "mail and should be fixed shortly. Thanks for your patience."
@@ -79,7 +116,6 @@ msgstr ""
 "mail e verr� risolto a breve. Grazie per la vostra pazienza"
 
 #: conf/admin_templates/delete_confirmation_generic.html:6
-#: conf/admin_templates/delete_confirmation_generic.html.py:1
 #, python-format
 msgid ""
 "Deleting the %(object_name)s  '%(object)s' would result in deleting related "
@@ -91,129 +127,131 @@ msgstr ""
 "i seguenti tipi di oggetti:"
 
 #: conf/admin_templates/delete_confirmation_generic.html:13
-#: conf/admin_templates/delete_confirmation_generic.html.py:2
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
 "the following related items will be deleted:"
 msgstr ""
-"Sei sicuro di voler rimuovere %(object_name)s \"%(object)s\"? I seguenti"
-"oggetti relazionati saranno rimossi:"
+"Sei sicuro di voler rimuovere %(object_name)s \"%(object)s\"? I "
+"seguentioggetti relazionati saranno rimossi:"
 
-#: conf/admin_templates/login.html:14 conf/admin_templates/login.html.py:1
-msgid "Username:"
-msgstr "Nome utente:"
-
-#: conf/admin_templates/login.html:17 conf/admin_templates/login.html.py:2
-msgid "Password:"
-msgstr "Password:"
-
-#: conf/admin_templates/login.html:19 conf/admin_templates/login.html.py:3
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "Hai <a href=\"/password_reset/\">dimenticato la tua password</a>?"
-
-#: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:1
-msgid "Welcome,"
-msgstr "Benvenuto,"
-
-#: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:2
-#: conf/admin_templates/base.html.py:5
-msgid "Change password"
-msgstr "Cambia la password"
-
-#: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:3
-#: conf/admin_templates/base.html.py:5
-msgid "Log out"
-msgstr "Esci"
-
-#: conf/admin_templates/base.html:28 conf/admin_templates/base.html.py:4
-#: conf/admin_templates/registration/password_change_done.html.py:1
-#: conf/admin_templates/registration/password_reset_form.html.py:1
-#: conf/admin_templates/registration/logged_out.html.py:1
-#: conf/admin_templates/registration/password_reset_done.html.py:1
-#: conf/admin_templates/registration/password_change_form.html.py:1
-#: conf/admin_templates/admin_object_history.html.py:1
-msgid "Home"
-msgstr "Pagina iniziale"
-
-#: conf/admin_templates/index.html:42 conf/admin_templates/index.html.py:3
-msgid "You don't have permission to edit anything."
-msgstr "Non hai i permessi di modificare nulla."
-
-#: conf/admin_templates/changelist_generic.html.py:2
-msgid "Click to change"
-msgstr "Clicca per cambiare"
-
-#: conf/admin_templates/500.html.py:2
-msgid "Server Error <em>(500)</em>"
-msgstr "Errore del Server <em>(500)</em>"
-
-#: conf/admin_templates/delete_confirmation_generic.html.py:3
+#: conf/admin_templates/delete_confirmation_generic.html:17
 msgid "Yes, I'm sure"
 msgstr "S�, sono sicuro"
 
-#: conf/admin_templates/login.html.py:4
+#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7
+msgid "Page not found"
+msgstr "Pagina non trovata"
+
+#: conf/admin_templates/404.html:9
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Spiacente, ma la pagina richiesta non esiste."
+
+#: conf/admin_templates/index.html:26
+msgid "Add"
+msgstr "Aggiungi"
+
+#: conf/admin_templates/index.html:32
+msgid "Change"
+msgstr "Cambia"
+
+#: conf/admin_templates/index.html:42
+msgid "You don't have permission to edit anything."
+msgstr "Non hai i permessi di modificare nulla."
+
+#: conf/admin_templates/index.html:50
+msgid "Recent Actions"
+msgstr "Azioni Recenti"
+
+#: conf/admin_templates/index.html:51
+msgid "My Actions"
+msgstr "Proprie Azioni"
+
+#: conf/admin_templates/index.html:55
+msgid "None available"
+msgstr "Nessuna disponibile"
+
+#: conf/admin_templates/login.html:14
+msgid "Username:"
+msgstr "Nome utente:"
+
+#: conf/admin_templates/login.html:17
+msgid "Password:"
+msgstr "Password:"
+
+#: conf/admin_templates/login.html:19
+msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+msgstr "Hai <a href=\"/password_reset/\">dimenticato la tua password</a>?"
+
+#: conf/admin_templates/login.html:23
 msgid "Log in"
 msgstr "Accedi"
 
-#: conf/admin_templates/registration/password_change_done.html.py:2
-#: conf/admin_templates/registration/password_change_form.html.py:2
-#: conf/admin_templates/registration/password_change_form.html.py:3
-#: conf/admin_templates/registration/password_change_done.html.py:6
-#: conf/admin_templates/registration/password_change_form.html.py:4
-#: conf/admin_templates/registration/password_change_form.html.py:10
+#: conf/admin_templates/base.html:22
+msgid "Welcome,"
+msgstr "Benvenuto,"
+
+#: conf/admin_templates/base.html:22
+msgid "Change password"
+msgstr "Cambia la password"
+
+#: conf/admin_templates/base.html:22
+msgid "Log out"
+msgstr "Esci"
+
+#: conf/admin_templates/registration/password_change_done.html:3
+#: conf/admin_templates/registration/password_change_form.html:3
+#: conf/admin_templates/registration/password_change_form.html:5
+#: conf/admin_templates/registration/password_change_form.html:9
 msgid "Password change"
 msgstr "Cambia la password"
 
-#: conf/admin_templates/registration/password_change_done.html.py:3
-#: conf/admin_templates/registration/password_change_done.html.py:4
+#: conf/admin_templates/registration/password_change_done.html:5
+#: conf/admin_templates/registration/password_change_done.html:9
 msgid "Password change successful"
 msgstr "La password � stata cambiata con successo"
 
-#: conf/admin_templates/registration/password_change_done.html.py:5
+#: conf/admin_templates/registration/password_change_done.html:11
 msgid "Your password was changed."
 msgstr "La tua password � stata cambiata"
 
-#: conf/admin_templates/registration/password_reset_form.html.py:2
-#: conf/admin_templates/registration/password_reset_form.html.py:3
-#: conf/admin_templates/registration/password_reset_form.html.py:4
-#: conf/admin_templates/registration/password_reset_done.html.py:2
-#: conf/admin_templates/registration/password_reset_form.html.py:8
-#: conf/admin_templates/registration/password_reset_form.html.py:9
-#: conf/admin_templates/registration/password_reset_done.html.py:6
+#: conf/admin_templates/registration/password_reset_form.html:3
+#: conf/admin_templates/registration/password_reset_form.html:5
+#: conf/admin_templates/registration/password_reset_form.html:9
+#: conf/admin_templates/registration/password_reset_done.html:3
 msgid "Password reset"
 msgstr "Resetta la password"
 
-#: conf/admin_templates/registration/password_reset_form.html.py:5
+#: conf/admin_templates/registration/password_reset_form.html:11
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll reset "
 "your password and e-mail the new one to you."
 msgstr ""
-"Hai dimenticato la tua password? Inserisci il tuo indirizzo e-mail qui sotto, "
-"la tua password sar� resettata e una nuova password ti verr� spedita."
+"Hai dimenticato la tua password? Inserisci il tuo indirizzo e-mail qui "
+"sotto, la tua password sar� resettata e una nuova password ti verr� spedita."
 
-#: conf/admin_templates/registration/password_reset_form.html.py:6
+#: conf/admin_templates/registration/password_reset_form.html:15
 msgid "E-mail address:"
 msgstr "Indirizzo e-mail:"
 
-#: conf/admin_templates/registration/password_reset_form.html.py:7
+#: conf/admin_templates/registration/password_reset_form.html:15
 msgid "Reset my password"
 msgstr "Resetta la mia password"
 
-#: conf/admin_templates/registration/logged_out.html.py:2
+#: conf/admin_templates/registration/logged_out.html:7
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "Grazie per aver speso il tuo tempo prezioso con questo sito."
 
-#: conf/admin_templates/registration/logged_out.html.py:3
+#: conf/admin_templates/registration/logged_out.html:9
 msgid "Log in again"
 msgstr "Accedi di nuovo"
 
-#: conf/admin_templates/registration/password_reset_done.html.py:3
-#: conf/admin_templates/registration/password_reset_done.html.py:4
+#: conf/admin_templates/registration/password_reset_done.html:5
+#: conf/admin_templates/registration/password_reset_done.html:9
 msgid "Password reset successful"
 msgstr "Password resettata con successo"
 
-#: conf/admin_templates/registration/password_reset_done.html.py:5
+#: conf/admin_templates/registration/password_reset_done.html:11
 msgid ""
 "We've e-mailed a new password to the e-mail address you submitted. You "
 "should be receiving it shortly."
@@ -221,8 +259,7 @@ msgstr ""
 "Ti abbiamo inviato la nuova password all'indirizzo e-mail da te selezionato. "
 "Dovresti riceverla a breve."
 
-#: conf/admin_templates/registration/password_change_form.html.py:4
-#: conf/admin_templates/registration/password_change_form.html.py:5
+#: conf/admin_templates/registration/password_change_form.html:11
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -230,78 +267,303 @@ msgstr ""
 "Inserisci la tua vecchia password, per ragioni di sicurezza, e poi la tua "
 "nuova password due volte per verificare che tu l'abbia scritta correttamente."
 
-#: conf/admin_templates/registration/password_change_form.html.py:5
-#: conf/admin_templates/registration/password_change_form.html.py:6
+#: conf/admin_templates/registration/password_change_form.html:16
 msgid "Old password:"
 msgstr "Vecchia password:"
 
-#: conf/admin_templates/registration/password_change_form.html.py:6
-#: conf/admin_templates/registration/password_change_form.html.py:7
+#: conf/admin_templates/registration/password_change_form.html:18
 msgid "New password:"
 msgstr "Nuova password:"
 
-#: conf/admin_templates/registration/password_change_form.html.py:7
-#: conf/admin_templates/registration/password_change_form.html.py:8
+#: conf/admin_templates/registration/password_change_form.html:20
 msgid "Confirm password:"
 msgstr "Conferma password:"
 
-#: conf/admin_templates/registration/password_change_form.html.py:8
-#: conf/admin_templates/registration/password_change_form.html.py:9
+#: conf/admin_templates/registration/password_change_form.html:22
 msgid "Change my password"
 msgstr "Cambia la mia password"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:1
+#: conf/admin_templates/registration/password_reset_email.html:1
 msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "Hai ricevuto questa e-mail perch� hai richesto di resettare la password"
+msgstr ""
+"Hai ricevuto questa e-mail perch� hai richesto di resettare la password"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:2
+#: conf/admin_templates/registration/password_reset_email.html:2
 #, python-format
 msgid "for your user account at %(site_name)s"
 msgstr "per il tuo account utente su %(site_name)s"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:3
+#: conf/admin_templates/registration/password_reset_email.html:4
 #, python-format
 msgid "Your new password is: %(new_password)s"
 msgstr "La tua nuova password �: %(new_password)s"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:4
+#: conf/admin_templates/registration/password_reset_email.html:6
 msgid "Feel free to change this password by going to this page:"
 msgstr "Puoi cambiare la tua password su questa pagina:"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:5
+#: conf/admin_templates/registration/password_reset_email.html:10
 msgid "Your username, in case you've forgotten:"
 msgstr "Il tuo nome utente, in caso tu l'abbia dimenticato:"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:6
+#: conf/admin_templates/registration/password_reset_email.html:12
 msgid "Thanks for using our site!"
 msgstr "Ti ringraziamo per l'utilizzo del nostro sito!"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:7
+#: conf/admin_templates/registration/password_reset_email.html:14
 #, python-format
 msgid "The %(site_name)s team"
 msgstr "Il team di %(site_name)s"
 
-#: conf/admin_templates/admin_object_history.html.py:2
-msgid "History"
-msgstr "Storia"
+#: core/validators.py:57
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Sono ammessi solo lettere, numeri e caratteri di sottolineaturai."
 
-#: conf/admin_templates/admin_object_history.html.py:3
-msgid "Date/time"
-msgstr "Data/ora"
+#: core/validators.py:61
+#, fuzzy
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr "Sono ammessi solo lettere, numeri e caratteri di sottolineaturai."
 
-#: conf/admin_templates/admin_object_history.html.py:4
-msgid "User"
-msgstr "Utente"
-
-#: conf/admin_templates/admin_object_history.html.py:5
-msgid "Action"
-msgstr "Azione"
-
-#: conf/admin_templates/admin_object_history.html.py:6
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
+#: core/validators.py:65
+msgid "Uppercase letters are not allowed here."
 msgstr ""
-"Questo oggetto non ha cambiamenti storicizzati. Probabilmente non � stato "
-"creato con questo sito amministrativo."
 
+#: core/validators.py:69
+msgid "Lowercase letters are not allowed here."
+msgstr ""
+
+#: core/validators.py:76
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: core/validators.py:88
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr ""
+
+#: core/validators.py:95
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#: core/validators.py:99
+msgid "Empty values are not allowed here."
+msgstr ""
+
+#: core/validators.py:103
+msgid "Non-numeric characters aren't allowed here."
+msgstr ""
+
+#: core/validators.py:107
+msgid "This value can't be comprised solely of digits."
+msgstr ""
+
+#: core/validators.py:112
+msgid "Enter a whole number."
+msgstr ""
+
+#: core/validators.py:116
+msgid "Only alphabetical characters are allowed here."
+msgstr ""
+
+#: core/validators.py:120
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr ""
+
+#: core/validators.py:124
+msgid "Enter a valid time in HH:MM format."
+msgstr ""
+
+#: core/validators.py:128
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr ""
+
+#: core/validators.py:132
+#, fuzzy
+msgid "Enter a valid e-mail address."
+msgstr "Indirizzo e-mail:"
+
+#: core/validators.py:144
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: core/validators.py:151
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr ""
+
+#: core/validators.py:155
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr ""
+
+#: core/validators.py:163
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr ""
+
+#: core/validators.py:167
+msgid "A valid URL is required."
+msgstr ""
+
+#: core/validators.py:181
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+
+#: core/validators.py:188
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr ""
+
+#: core/validators.py:198
+#, python-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+#: core/validators.py:200
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr ""
+
+#: core/validators.py:206
+msgid "Enter a valid U.S. state abbreviation."
+msgstr ""
+
+#: core/validators.py:221
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:228
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr ""
+
+#: core/validators.py:247
+msgid "Please enter something for at least one field."
+msgstr ""
+
+#: core/validators.py:256 core/validators.py:267
+msgid "Please enter both fields or leave them both empty."
+msgstr ""
+
+#: core/validators.py:274
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr ""
+
+#: core/validators.py:286
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr ""
+
+#: core/validators.py:305
+msgid "Duplicate values are not allowed."
+msgstr ""
+
+#: core/validators.py:328
+#, python-format
+msgid "This value must be a power of %s."
+msgstr ""
+
+#: core/validators.py:339
+msgid "Please enter a valid decimal number."
+msgstr ""
+
+#: core/validators.py:341
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:344
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:354
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr ""
+
+#: core/validators.py:355
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr ""
+
+#: core/validators.py:368
+msgid "The format for this field is wrong."
+msgstr ""
+
+#: core/validators.py:383
+msgid "This field is invalid."
+msgstr ""
+
+#: core/validators.py:418
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr ""
+
+#: core/validators.py:421
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+
+#: core/validators.py:454
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:458
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:463
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:468
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:472
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:477
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#~ msgid "Server error <em>(500)</em>"
+#~ msgstr "Errore del server <em>(500)</em>"
+
+#~ msgid "Click to change"
+#~ msgstr "Clicca per cambiare"
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index 395b7554e3..1ce1976f4c 100644
Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index c005bb39d8..85d707618f 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
-"Report-Msgid-Bugs-To: jpaulofarias@gmail.com\n"
-"POT-Creation-Date: 2005-10-11 09:11-0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-10-17 16:26+0200\n"
 "PO-Revision-Date: 2005-10-11 09:12GMT-3\n"
 "Last-Translator: João Paulo Farias <jpaulofarias@gmail.com>\n"
 "Language-Team: Português do Brasil <pt-br@li.org>\n"
@@ -16,46 +16,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7
-msgid "Page not found"
-msgstr "Página não encontrada"
+#: models/core.py:57
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
 
-#: conf/admin_templates/404.html:9
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Desculpe, mas a página requisitada não pode ser encontrada."
+#: models/core.py:59
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
 
-#: conf/admin_templates/index.html:26
-#: conf/admin_templates/changelist_generic.html:8
-msgid "Add"
-msgstr "Adicionar"
+#: models/core.py:74
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
 
-#: conf/admin_templates/index.html:32
-msgid "Change"
-msgstr "Modificar"
+#: models/core.py:79
+msgid ""
+"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
+"use 'flatfiles/default'."
+msgstr ""
 
-#: conf/admin_templates/index.html:42
-msgid "You don't have permission to edit anything."
-msgstr "Você não tem permissão para edição."
+#: models/core.py:80
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
 
-#: conf/admin_templates/index.html:50
-msgid "Recent Actions"
-msgstr "Ações Recentes"
+#: models/auth.py:33
+msgid "Use an MD5 hash -- not the raw password."
+msgstr ""
 
-#: conf/admin_templates/index.html:51
-msgid "My Actions"
-msgstr "Minhas Ações"
+#: models/auth.py:34
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
 
-#: conf/admin_templates/index.html:55
-msgid "None available"
-msgstr "Nenhuma disponível"
+#: models/auth.py:40
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+
+#: conf/admin_templates/base_site.html:3
+msgid "Django site admin"
+msgstr "Site de administração do Django"
+
+#: conf/admin_templates/base_site.html:6
+msgid "Django administration"
+msgstr "Administração do Django"
 
 #: conf/admin_templates/admin_object_history.html:4
 #: conf/admin_templates/base.html:28
+#: conf/admin_templates/registration/password_change_done.html:3
 #: conf/admin_templates/registration/password_reset_form.html:3
 #: conf/admin_templates/registration/logged_out.html:3
 #: conf/admin_templates/registration/password_reset_done.html:3
 #: conf/admin_templates/registration/password_change_form.html:3
-#: conf/admin_templates/registration/password_change_done.html:3
 msgid "Home"
 msgstr "Início"
 
@@ -83,14 +99,6 @@ msgstr ""
 "Este objeto não tem um histórico de alterações. Ele provavelmente não foi "
 "adicionado por este site de administração."
 
-#: conf/admin_templates/base_site.html:3
-msgid "Django site admin"
-msgstr "Site de administração do Django"
-
-#: conf/admin_templates/base_site.html:6
-msgid "Django administration"
-msgstr "Administração do Django"
-
 #: conf/admin_templates/500.html:5
 msgid "Server error (500)"
 msgstr "Erro no servidor (500)"
@@ -104,8 +112,8 @@ msgid ""
 "There's been an error. It's been reported to the site administrators via e-"
 "mail and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Houve um erro. Este foi reportado aos administradores do site através d "
-"e-mail e deve ser consertado em breve. Obrigado pela compreensão."
+"Houve um erro. Este foi reportado aos administradores do site através d e-"
+"mail e deve ser consertado em breve. Obrigado pela compreensão."
 
 #: conf/admin_templates/delete_confirmation_generic.html:6
 #, python-format
@@ -124,16 +132,44 @@ msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
 "the following related items will be deleted:"
 msgstr ""
-"Você tem certeza que quer remover o \"%(object)s\" %(object_name)s? Todos "
-"os seguintes itens relacionados serão removidos:"
+"Você tem certeza que quer remover o \"%(object)s\" %(object_name)s? Todos os "
+"seguintes itens relacionados serão removidos:"
 
 #: conf/admin_templates/delete_confirmation_generic.html:17
 msgid "Yes, I'm sure"
 msgstr "Sim, tenho certeza"
 
-#: conf/admin_templates/changelist_generic.html:26
-msgid "Click to change"
-msgstr "Clique para alterar"
+#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7
+msgid "Page not found"
+msgstr "Página não encontrada"
+
+#: conf/admin_templates/404.html:9
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Desculpe, mas a página requisitada não pode ser encontrada."
+
+#: conf/admin_templates/index.html:26
+msgid "Add"
+msgstr "Adicionar"
+
+#: conf/admin_templates/index.html:32
+msgid "Change"
+msgstr "Modificar"
+
+#: conf/admin_templates/index.html:42
+msgid "You don't have permission to edit anything."
+msgstr "Você não tem permissão para edição."
+
+#: conf/admin_templates/index.html:50
+msgid "Recent Actions"
+msgstr "Ações Recentes"
+
+#: conf/admin_templates/index.html:51
+msgid "My Actions"
+msgstr "Minhas Ações"
+
+#: conf/admin_templates/index.html:55
+msgid "None available"
+msgstr "Nenhuma disponível"
 
 #: conf/admin_templates/login.html:14
 msgid "Username:"
@@ -163,6 +199,22 @@ msgstr "Alterar senha"
 msgid "Log out"
 msgstr "Encerrar sessão"
 
+#: conf/admin_templates/registration/password_change_done.html:3
+#: conf/admin_templates/registration/password_change_form.html:3
+#: conf/admin_templates/registration/password_change_form.html:5
+#: conf/admin_templates/registration/password_change_form.html:9
+msgid "Password change"
+msgstr "Alterar senha"
+
+#: conf/admin_templates/registration/password_change_done.html:5
+#: conf/admin_templates/registration/password_change_done.html:9
+msgid "Password change successful"
+msgstr "Senha alterada com sucesso"
+
+#: conf/admin_templates/registration/password_change_done.html:11
+msgid "Your password was changed."
+msgstr "Sua senha foi alterada."
+
 #: conf/admin_templates/registration/password_reset_form.html:3
 #: conf/admin_templates/registration/password_reset_form.html:5
 #: conf/admin_templates/registration/password_reset_form.html:9
@@ -186,6 +238,51 @@ msgstr "Endereço de e-mail:"
 msgid "Reset my password"
 msgstr "Reinicializar minha senha"
 
+#: conf/admin_templates/registration/logged_out.html:7
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Obrigado por visitar nosso Web site hoje."
+
+#: conf/admin_templates/registration/logged_out.html:9
+msgid "Log in again"
+msgstr "Acessar novamente"
+
+#: conf/admin_templates/registration/password_reset_done.html:5
+#: conf/admin_templates/registration/password_reset_done.html:9
+msgid "Password reset successful"
+msgstr "Senha inicializada com sucesso"
+
+#: conf/admin_templates/registration/password_reset_done.html:11
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Nós enviamos uma nova senha para o e-mail que você informou. Você deve estar "
+"recebendo uma mensagem em breve."
+
+#: conf/admin_templates/registration/password_change_form.html:11
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Por favor, informe sua senha antiga, por segurança, e então informe sua nova "
+"senha duas vezes para que possamos verificar que se ela está correta."
+
+#: conf/admin_templates/registration/password_change_form.html:16
+msgid "Old password:"
+msgstr "Senha antiga:"
+
+#: conf/admin_templates/registration/password_change_form.html:18
+msgid "New password:"
+msgstr "Nova senha:"
+
+#: conf/admin_templates/registration/password_change_form.html:20
+msgid "Confirm password:"
+msgstr "Confirme a senha:"
+
+#: conf/admin_templates/registration/password_change_form.html:22
+msgid "Change my password"
+msgstr "Alterar minha senha"
+
 #: conf/admin_templates/registration/password_reset_email.html:1
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr "Você está recebendo este e-mail porque você pediu uma nova senha"
@@ -217,67 +314,252 @@ msgstr "Obrigado por usar nosso site!"
 msgid "The %(site_name)s team"
 msgstr "Time do %(site_name)s"
 
-#: conf/admin_templates/registration/logged_out.html:7
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Obrigado por visitar nosso Web site hoje."
-
-#: conf/admin_templates/registration/logged_out.html:9
-msgid "Log in again"
-msgstr "Acessar novamente"
-
-#: conf/admin_templates/registration/password_reset_done.html:5
-#: conf/admin_templates/registration/password_reset_done.html:9
-msgid "Password reset successful"
-msgstr "Senha inicializada com sucesso"
-
-#: conf/admin_templates/registration/password_reset_done.html:11
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"Nós enviamos uma nova senha para o e-mail que você informou. Você deve "
-"estar recebendo uma mensagem em breve."
-
-#: conf/admin_templates/registration/password_change_form.html:3
-#: conf/admin_templates/registration/password_change_form.html:5
-#: conf/admin_templates/registration/password_change_form.html:9
-#: conf/admin_templates/registration/password_change_done.html:3
-msgid "Password change"
-msgstr "Alterar senha"
-
-#: conf/admin_templates/registration/password_change_form.html:11
-msgid ""
-"Please enter your old password, for security's sake, and then enter your new "
-"password twice so we can verify you typed it in correctly."
-msgstr ""
-"Por favor, informe sua senha antiga, por segurança, e então informe sua nova "
-"senha duas vezes para que possamos verificar que se ela está correta."
-
-#: conf/admin_templates/registration/password_change_form.html:16
-msgid "Old password:"
-msgstr "Senha antiga:"
-
-#: conf/admin_templates/registration/password_change_form.html:18
-msgid "New password:"
-msgstr "Nova senha:"
-
-#: conf/admin_templates/registration/password_change_form.html:20
-msgid "Confirm password:"
-msgstr "Confirme a senha:"
-
-#: conf/admin_templates/registration/password_change_form.html:22
-msgid "Change my password"
-msgstr "Alterar minha senha"
-
-#: conf/admin_templates/registration/password_change_done.html:5
-#: conf/admin_templates/registration/password_change_done.html:9
-msgid "Password change successful"
-msgstr "Senha alterada com sucesso"
-
-#: conf/admin_templates/registration/password_change_done.html:11
-msgid "Your password was changed."
-msgstr "Sua senha foi alterada."
-
-#: core/validators.py:56
+#: core/validators.py:57
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Deve conter apenas letras, números e sublinhados (_)."
+
+#: core/validators.py:61
+#, fuzzy
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr "Deve conter apenas letras, números e sublinhados (_)."
+
+#: core/validators.py:65
+msgid "Uppercase letters are not allowed here."
+msgstr ""
+
+#: core/validators.py:69
+msgid "Lowercase letters are not allowed here."
+msgstr ""
+
+#: core/validators.py:76
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: core/validators.py:88
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr ""
+
+#: core/validators.py:95
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#: core/validators.py:99
+msgid "Empty values are not allowed here."
+msgstr ""
+
+#: core/validators.py:103
+msgid "Non-numeric characters aren't allowed here."
+msgstr ""
+
+#: core/validators.py:107
+msgid "This value can't be comprised solely of digits."
+msgstr ""
+
+#: core/validators.py:112
+msgid "Enter a whole number."
+msgstr ""
+
+#: core/validators.py:116
+msgid "Only alphabetical characters are allowed here."
+msgstr ""
+
+#: core/validators.py:120
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr ""
+
+#: core/validators.py:124
+msgid "Enter a valid time in HH:MM format."
+msgstr ""
+
+#: core/validators.py:128
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr ""
+
+#: core/validators.py:132
+#, fuzzy
+msgid "Enter a valid e-mail address."
+msgstr "Endereço de e-mail:"
+
+#: core/validators.py:144
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: core/validators.py:151
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr ""
+
+#: core/validators.py:155
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr ""
+
+#: core/validators.py:163
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr ""
+
+#: core/validators.py:167
+msgid "A valid URL is required."
+msgstr ""
+
+#: core/validators.py:181
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+
+#: core/validators.py:188
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr ""
+
+#: core/validators.py:198
+#, python-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+#: core/validators.py:200
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr ""
+
+#: core/validators.py:206
+msgid "Enter a valid U.S. state abbreviation."
+msgstr ""
+
+#: core/validators.py:221
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:228
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr ""
+
+#: core/validators.py:247
+msgid "Please enter something for at least one field."
+msgstr ""
+
+#: core/validators.py:256 core/validators.py:267
+msgid "Please enter both fields or leave them both empty."
+msgstr ""
+
+#: core/validators.py:274
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr ""
+
+#: core/validators.py:286
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr ""
+
+#: core/validators.py:305
+msgid "Duplicate values are not allowed."
+msgstr ""
+
+#: core/validators.py:328
+#, python-format
+msgid "This value must be a power of %s."
+msgstr ""
+
+#: core/validators.py:339
+msgid "Please enter a valid decimal number."
+msgstr ""
+
+#: core/validators.py:341
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:344
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:354
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr ""
+
+#: core/validators.py:355
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr ""
+
+#: core/validators.py:368
+msgid "The format for this field is wrong."
+msgstr ""
+
+#: core/validators.py:383
+msgid "This field is invalid."
+msgstr ""
+
+#: core/validators.py:418
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr ""
+
+#: core/validators.py:421
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+
+#: core/validators.py:454
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:458
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:463
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:468
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:472
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:477
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#~ msgid "Click to change"
+#~ msgstr "Clique para alterar"
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index c9e8cb6e73..fcbf92d9af 100644
Binary files a/django/conf/locale/ru/LC_MESSAGES/django.mo and b/django/conf/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index 19d3ab216a..7f5844da47 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-01 18:22+0200\n"
+"POT-Creation-Date: 2005-10-17 16:26+0200\n"
 "PO-Revision-Date: 2005-10-05 00:00\n"
 "Last-Translator: Dmitry Sorokin <ds@@dial.com.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,70 +15,106 @@ msgstr ""
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: core/validators.py:56
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "�������� ����� ��������� ������ �����, ����� � �������������."
+#: models/core.py:57
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
 
-#: conf/admin_templates/404.html:3 conf/admin_templates/404.html:7
-#: conf/admin_templates/404.html.py:1 conf/admin_templates/404.html.py:2
-msgid "Page not found"
-msgstr "�������� �� �������"
+#: models/core.py:59
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
 
-#: conf/admin_templates/404.html:9 conf/admin_templates/404.html.py:3
-msgid "We're sorry, but the requested page could not be found."
-msgstr "� ���������, ������������� ���� �������� �� �������."
+#: models/core.py:74
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
 
-#: conf/admin_templates/index.html:26
-#: conf/admin_templates/changelist_generic.html:8
-#: conf/admin_templates/changelist_generic.html.py:1
-#: conf/admin_templates/index.html.py:1
-msgid "Add"
-msgstr "��������"
+#: models/core.py:79
+msgid ""
+"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
+"use 'flatfiles/default'."
+msgstr ""
 
-#: conf/admin_templates/index.html:32 conf/admin_templates/index.html.py:2
-msgid "Change"
-msgstr "��������"
+#: models/core.py:80
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
 
-#: conf/admin_templates/index.html:50 conf/admin_templates/index.html.py:4
-msgid "Recent Actions"
-msgstr "��������� ��������"
+#: models/auth.py:33
+msgid "Use an MD5 hash -- not the raw password."
+msgstr ""
 
-#: conf/admin_templates/index.html:51 conf/admin_templates/index.html.py:5
-msgid "My Actions"
-msgstr "��� ��������"
+#: models/auth.py:34
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
 
-#: conf/admin_templates/index.html:55 conf/admin_templates/index.html.py:6
-msgid "None available"
-msgstr "����������"
+#: models/auth.py:40
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
 
 #: conf/admin_templates/base_site.html:3
-#: conf/admin_templates/base_site.html.py:1
 msgid "Django site admin"
 msgstr "���������������� ���� Django"
 
 #: conf/admin_templates/base_site.html:6
-#: conf/admin_templates/base_site.html.py:2
 msgid "Django administration"
 msgstr "����������������� Django"
 
-#: conf/admin_templates/500.html:5 conf/admin_templates/500.html.py:1
+#: conf/admin_templates/admin_object_history.html:4
+#: conf/admin_templates/base.html:28
+#: conf/admin_templates/registration/password_change_done.html:3
+#: conf/admin_templates/registration/password_reset_form.html:3
+#: conf/admin_templates/registration/logged_out.html:3
+#: conf/admin_templates/registration/password_reset_done.html:3
+#: conf/admin_templates/registration/password_change_form.html:3
+msgid "Home"
+msgstr "������"
+
+#: conf/admin_templates/admin_object_history.html:4
+msgid "History"
+msgstr "�������"
+
+#: conf/admin_templates/admin_object_history.html:17
+msgid "Date/time"
+msgstr "����/�����"
+
+#: conf/admin_templates/admin_object_history.html:18
+msgid "User"
+msgstr "������������"
+
+#: conf/admin_templates/admin_object_history.html:19
+msgid "Action"
+msgstr "��������"
+
+#: conf/admin_templates/admin_object_history.html:35
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"������ ������ �� ����� ������� ���������. �������� �� �� ��� �������� ����� "
+"������ ���������������� ����."
+
+#: conf/admin_templates/500.html:5
 msgid "Server error (500)"
 msgstr "������ ������� (500)"
 
 #: conf/admin_templates/500.html:8
-msgid "Server error <em>(500)</em>"
+msgid "Server Error <em>(500)</em>"
 msgstr "������ ������� <em>(500)</em>"
 
-#: conf/admin_templates/500.html:9 conf/admin_templates/500.html.py:3
+#: conf/admin_templates/500.html:9
 msgid ""
 "There's been an error. It's been reported to the site administrators via e-"
 "mail and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"��������� ������. ����� �� ������ ��������� ��������������� ����� �� e-mail"
-"� ��� ������ ���� ������ ����������. ���������� ��� �� �������� � ������."
+"��������� ������. ����� �� ������ ��������� ��������������� ����� �� e-mail� "
+"��� ������ ���� ������ ����������. ���������� ��� �� �������� � ������."
 
 #: conf/admin_templates/delete_confirmation_generic.html:6
-#: conf/admin_templates/delete_confirmation_generic.html.py:1
 #, python-format
 msgid ""
 "Deleting the %(object_name)s  '%(object)s' would result in deleting related "
@@ -86,104 +122,106 @@ msgid ""
 "types of objects:"
 msgstr ""
 "�������� ������� %(object_name)s '%(object)s' �������� � �������� ��������� "
-"��, ��������������� ��� ���� ������������ ��� �������� ���������"
-"����� ��������:"
+"��, ��������������� ��� ���� ������������ ��� �������� �������������� "
+"��������:"
 
 #: conf/admin_templates/delete_confirmation_generic.html:13
-#: conf/admin_templates/delete_confirmation_generic.html.py:2
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
 "the following related items will be deleted:"
 msgstr ""
-"�� �������, ��� ������ �������  %(object_name)s \"%(object)s\"? ��� ���������"
-"������� ����� ����� �������:"
+"�� �������, ��� ������ �������  %(object_name)s \"%(object)s\"? ��� "
+"���������������� ����� ����� �������:"
 
-#: conf/admin_templates/login.html:14 conf/admin_templates/login.html.py:1
-msgid "Username:"
-msgstr "���:"
-
-#: conf/admin_templates/login.html:17 conf/admin_templates/login.html.py:2
-msgid "Password:"
-msgstr "������:"
-
-#: conf/admin_templates/login.html:19 conf/admin_templates/login.html.py:3
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "�� <a href=\"/password_reset/\">������ ������</a>?"
-
-#: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:1
-msgid "Welcome,"
-msgstr "����� ����������,"
-
-#: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:2
-#: conf/admin_templates/base.html.py:5
-msgid "Change password"
-msgstr "��������� ������"
-
-#: conf/admin_templates/base.html:22 conf/admin_templates/base.html.py:3
-#: conf/admin_templates/base.html.py:5
-msgid "Log out"
-msgstr "�����"
-
-#: conf/admin_templates/base.html:28 conf/admin_templates/base.html.py:4
-#: conf/admin_templates/registration/password_change_done.html.py:1
-#: conf/admin_templates/registration/password_reset_form.html.py:1
-#: conf/admin_templates/registration/logged_out.html.py:1
-#: conf/admin_templates/registration/password_reset_done.html.py:1
-#: conf/admin_templates/registration/password_change_form.html.py:1
-#: conf/admin_templates/admin_object_history.html.py:1
-msgid "Home"
-msgstr "������"
-
-#: conf/admin_templates/index.html:42 conf/admin_templates/index.html.py:3
-msgid "You don't have permission to edit anything."
-msgstr "������������ ���� ��� ��������������."
-
-#: conf/admin_templates/changelist_generic.html.py:2
-msgid "Click to change"
-msgstr "�������� ��� ���������"
-
-#: conf/admin_templates/500.html.py:2
-msgid "Server Error <em>(500)</em>"
-msgstr "������ ������� <em>(500)</em>"
-
-#: conf/admin_templates/delete_confirmation_generic.html.py:3
+#: conf/admin_templates/delete_confirmation_generic.html:17
 msgid "Yes, I'm sure"
 msgstr "��, � ������"
 
-#: conf/admin_templates/login.html.py:4
+#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7
+msgid "Page not found"
+msgstr "�������� �� �������"
+
+#: conf/admin_templates/404.html:9
+msgid "We're sorry, but the requested page could not be found."
+msgstr "� ���������, ������������� ���� �������� �� �������."
+
+#: conf/admin_templates/index.html:26
+msgid "Add"
+msgstr "��������"
+
+#: conf/admin_templates/index.html:32
+msgid "Change"
+msgstr "��������"
+
+#: conf/admin_templates/index.html:42
+msgid "You don't have permission to edit anything."
+msgstr "������������ ���� ��� ��������������."
+
+#: conf/admin_templates/index.html:50
+msgid "Recent Actions"
+msgstr "��������� ��������"
+
+#: conf/admin_templates/index.html:51
+msgid "My Actions"
+msgstr "��� ��������"
+
+#: conf/admin_templates/index.html:55
+msgid "None available"
+msgstr "����������"
+
+#: conf/admin_templates/login.html:14
+msgid "Username:"
+msgstr "���:"
+
+#: conf/admin_templates/login.html:17
+msgid "Password:"
+msgstr "������:"
+
+#: conf/admin_templates/login.html:19
+msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+msgstr "�� <a href=\"/password_reset/\">������ ������</a>?"
+
+#: conf/admin_templates/login.html:23
 msgid "Log in"
 msgstr "����"
 
-#: conf/admin_templates/registration/password_change_done.html.py:2
-#: conf/admin_templates/registration/password_change_form.html.py:2
-#: conf/admin_templates/registration/password_change_form.html.py:3
-#: conf/admin_templates/registration/password_change_done.html.py:6
-#: conf/admin_templates/registration/password_change_form.html.py:4
-#: conf/admin_templates/registration/password_change_form.html.py:10
+#: conf/admin_templates/base.html:22
+msgid "Welcome,"
+msgstr "����� ����������,"
+
+#: conf/admin_templates/base.html:22
+msgid "Change password"
+msgstr "��������� ������"
+
+#: conf/admin_templates/base.html:22
+msgid "Log out"
+msgstr "�����"
+
+#: conf/admin_templates/registration/password_change_done.html:3
+#: conf/admin_templates/registration/password_change_form.html:3
+#: conf/admin_templates/registration/password_change_form.html:5
+#: conf/admin_templates/registration/password_change_form.html:9
 msgid "Password change"
 msgstr "��������� ������"
 
-#: conf/admin_templates/registration/password_change_done.html.py:3
-#: conf/admin_templates/registration/password_change_done.html.py:4
+#: conf/admin_templates/registration/password_change_done.html:5
+#: conf/admin_templates/registration/password_change_done.html:9
 msgid "Password change successful"
 msgstr "La password � stata cambiata con successo"
 
-#: conf/admin_templates/registration/password_change_done.html.py:5
+#: conf/admin_templates/registration/password_change_done.html:11
 msgid "Your password was changed."
 msgstr "��� ������ ��� �������."
 
-#: conf/admin_templates/registration/password_reset_form.html.py:2
-#: conf/admin_templates/registration/password_reset_form.html.py:3
-#: conf/admin_templates/registration/password_reset_form.html.py:4
-#: conf/admin_templates/registration/password_reset_done.html.py:2
-#: conf/admin_templates/registration/password_reset_form.html.py:8
-#: conf/admin_templates/registration/password_reset_form.html.py:9
-#: conf/admin_templates/registration/password_reset_done.html.py:6
+#: conf/admin_templates/registration/password_reset_form.html:3
+#: conf/admin_templates/registration/password_reset_form.html:5
+#: conf/admin_templates/registration/password_reset_form.html:9
+#: conf/admin_templates/registration/password_reset_done.html:3
 msgid "Password reset"
 msgstr "����� ������"
 
-#: conf/admin_templates/registration/password_reset_form.html.py:5
+#: conf/admin_templates/registration/password_reset_form.html:11
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll reset "
 "your password and e-mail the new one to you."
@@ -191,37 +229,36 @@ msgstr ""
 "������ ������? ������� ��� e-mail ����� ���� � �� ������� ��� ������ ������, "
 "� ������ ��� �� e-mail �����."
 
-#: conf/admin_templates/registration/password_reset_form.html.py:6
+#: conf/admin_templates/registration/password_reset_form.html:15
 msgid "E-mail address:"
 msgstr "E-mail �����:"
 
-#: conf/admin_templates/registration/password_reset_form.html.py:7
+#: conf/admin_templates/registration/password_reset_form.html:15
 msgid "Reset my password"
 msgstr "������� ������"
 
-#: conf/admin_templates/registration/logged_out.html.py:2
+#: conf/admin_templates/registration/logged_out.html:7
 msgid "Thanks for spending some quality time with the Web site today."
 msgstr "���������� �� ����������� ���� ������� ����� �� ���� �����."
 
-#: conf/admin_templates/registration/logged_out.html.py:3
+#: conf/admin_templates/registration/logged_out.html:9
 msgid "Log in again"
 msgstr "��������� ����"
 
-#: conf/admin_templates/registration/password_reset_done.html.py:3
-#: conf/admin_templates/registration/password_reset_done.html.py:4
+#: conf/admin_templates/registration/password_reset_done.html:5
+#: conf/admin_templates/registration/password_reset_done.html:9
 msgid "Password reset successful"
 msgstr "�������� ������� ������"
 
-#: conf/admin_templates/registration/password_reset_done.html.py:5
+#: conf/admin_templates/registration/password_reset_done.html:11
 msgid ""
 "We've e-mailed a new password to the e-mail address you submitted. You "
 "should be receiving it shortly."
 msgstr ""
-"�� ��������� ����� ������ �� ���������� ���� ������ ����������� �����. "
-"�� ������ �������� ��� ����� ������."
+"�� ��������� ����� ������ �� ���������� ���� ������ ����������� �����. �� "
+"������ �������� ��� ����� ������."
 
-#: conf/admin_templates/registration/password_change_form.html.py:4
-#: conf/admin_templates/registration/password_change_form.html.py:5
+#: conf/admin_templates/registration/password_change_form.html:11
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
@@ -229,78 +266,302 @@ msgstr ""
 "� ����� ������������, ����������, ������� ��� ������ ������, ����� - ����� "
 "������ ������, � ���, ����� �� ����� ��������� � ������������ ���������."
 
-#: conf/admin_templates/registration/password_change_form.html.py:5
-#: conf/admin_templates/registration/password_change_form.html.py:6
+#: conf/admin_templates/registration/password_change_form.html:16
 msgid "Old password:"
 msgstr "������ ������:"
 
-#: conf/admin_templates/registration/password_change_form.html.py:6
-#: conf/admin_templates/registration/password_change_form.html.py:7
+#: conf/admin_templates/registration/password_change_form.html:18
 msgid "New password:"
 msgstr "����� ������:"
 
-#: conf/admin_templates/registration/password_change_form.html.py:7
-#: conf/admin_templates/registration/password_change_form.html.py:8
+#: conf/admin_templates/registration/password_change_form.html:20
 msgid "Confirm password:"
 msgstr "����������� ������:"
 
-#: conf/admin_templates/registration/password_change_form.html.py:8
-#: conf/admin_templates/registration/password_change_form.html.py:9
+#: conf/admin_templates/registration/password_change_form.html:22
 msgid "Change my password"
 msgstr "��������� ������"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:1
+#: conf/admin_templates/registration/password_reset_email.html:1
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr "�� �������� ��� ��������� ������ ��� ���� ��������� ������� ������"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:2
+#: conf/admin_templates/registration/password_reset_email.html:2
 #, python-format
 msgid "for your user account at %(site_name)s"
 msgstr "��� ������ ����������������� �������� �� %(site_name)s"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:3
+#: conf/admin_templates/registration/password_reset_email.html:4
 #, python-format
 msgid "Your new password is: %(new_password)s"
 msgstr "��� ����� ������: %(new_password)s"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:4
+#: conf/admin_templates/registration/password_reset_email.html:6
 msgid "Feel free to change this password by going to this page:"
 msgstr "�� ������ ������ �������� ���� ������ ������� �� ��������:"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:5
+#: conf/admin_templates/registration/password_reset_email.html:10
 msgid "Your username, in case you've forgotten:"
 msgstr "���� ���, �� ������ ���� �� ��� ������:"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:6
+#: conf/admin_templates/registration/password_reset_email.html:12
 msgid "Thanks for using our site!"
 msgstr "������� �� ��������� ������ �����!"
 
-#: conf/admin_templates/registration/password_reset_email.html.py:7
+#: conf/admin_templates/registration/password_reset_email.html:14
 #, python-format
 msgid "The %(site_name)s team"
 msgstr "������� ����� di %(site_name)s"
 
-#: conf/admin_templates/admin_object_history.html.py:2
-msgid "History"
-msgstr "�������"
+#: core/validators.py:57
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "�������� ����� ��������� ������ �����, ����� � �������������."
 
-#: conf/admin_templates/admin_object_history.html.py:3
-msgid "Date/time"
-msgstr "����/�����"
+#: core/validators.py:61
+#, fuzzy
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr "�������� ����� ��������� ������ �����, ����� � �������������."
 
-#: conf/admin_templates/admin_object_history.html.py:4
-msgid "User"
-msgstr "������������"
-
-#: conf/admin_templates/admin_object_history.html.py:5
-msgid "Action"
-msgstr "��������"
-
-#: conf/admin_templates/admin_object_history.html.py:6
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
+#: core/validators.py:65
+msgid "Uppercase letters are not allowed here."
 msgstr ""
-"������ ������ �� ����� ������� ���������. �������� �� �� ��� �������� "
-"����� ������ ���������������� ����."
 
+#: core/validators.py:69
+msgid "Lowercase letters are not allowed here."
+msgstr ""
+
+#: core/validators.py:76
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: core/validators.py:88
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr ""
+
+#: core/validators.py:95
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#: core/validators.py:99
+msgid "Empty values are not allowed here."
+msgstr ""
+
+#: core/validators.py:103
+msgid "Non-numeric characters aren't allowed here."
+msgstr ""
+
+#: core/validators.py:107
+msgid "This value can't be comprised solely of digits."
+msgstr ""
+
+#: core/validators.py:112
+msgid "Enter a whole number."
+msgstr ""
+
+#: core/validators.py:116
+msgid "Only alphabetical characters are allowed here."
+msgstr ""
+
+#: core/validators.py:120
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr ""
+
+#: core/validators.py:124
+msgid "Enter a valid time in HH:MM format."
+msgstr ""
+
+#: core/validators.py:128
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr ""
+
+#: core/validators.py:132
+#, fuzzy
+msgid "Enter a valid e-mail address."
+msgstr "E-mail �����:"
+
+#: core/validators.py:144
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: core/validators.py:151
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr ""
+
+#: core/validators.py:155
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr ""
+
+#: core/validators.py:163
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr ""
+
+#: core/validators.py:167
+msgid "A valid URL is required."
+msgstr ""
+
+#: core/validators.py:181
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+
+#: core/validators.py:188
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr ""
+
+#: core/validators.py:198
+#, python-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+#: core/validators.py:200
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr ""
+
+#: core/validators.py:206
+msgid "Enter a valid U.S. state abbreviation."
+msgstr ""
+
+#: core/validators.py:221
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:228
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr ""
+
+#: core/validators.py:247
+msgid "Please enter something for at least one field."
+msgstr ""
+
+#: core/validators.py:256 core/validators.py:267
+msgid "Please enter both fields or leave them both empty."
+msgstr ""
+
+#: core/validators.py:274
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr ""
+
+#: core/validators.py:286
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr ""
+
+#: core/validators.py:305
+msgid "Duplicate values are not allowed."
+msgstr ""
+
+#: core/validators.py:328
+#, python-format
+msgid "This value must be a power of %s."
+msgstr ""
+
+#: core/validators.py:339
+msgid "Please enter a valid decimal number."
+msgstr ""
+
+#: core/validators.py:341
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:344
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+
+#: core/validators.py:354
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr ""
+
+#: core/validators.py:355
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr ""
+
+#: core/validators.py:368
+msgid "The format for this field is wrong."
+msgstr ""
+
+#: core/validators.py:383
+msgid "This field is invalid."
+msgstr ""
+
+#: core/validators.py:418
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr ""
+
+#: core/validators.py:421
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+
+#: core/validators.py:454
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:458
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:463
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:468
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:472
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:477
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#~ msgid "Server error <em>(500)</em>"
+#~ msgstr "������ ������� <em>(500)</em>"
+
+#~ msgid "Click to change"
+#~ msgstr "�������� ��� ���������"
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index 102b62339e..5f5508c6a6 100644
Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index d9451c201c..b3f1ca89b7 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -1,218 +1,289 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Django Serbian (latin) translation v1.0\n"
-"Report-Msgid-Bugs-To: Petar Marić <petar.maric@gmail.com>\n"
-"POT-Creation-Date: 2005-10-03 09:35+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2005-10-17 16:26+0200\n"
 "PO-Revision-Date: 2005-10-05 14:39+0100\n"
 "Last-Translator: Petar Marić <petar.maric@gmail.com>\n"
-"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail.com>\n"
+"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail."
+"com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Poedit-Language: Serbian\n"
 "X-Poedit-Country: YUGOSLAVIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: ../../../../\n"
 
-#: conf/admin_templates/404.html:1
-#: conf/admin_templates/404.html:2
-msgid "Page not found"
-msgstr "Strana nije pronađena"
+#: models/core.py:57
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
 
-#: conf/admin_templates/404.html:3
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Tražena strana ne postoji"
+#: models/core.py:59
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
 
-#: conf/admin_templates/500.html:1
-msgid "Server error (500)"
-msgstr "Greška na serveru (500)"
+#: models/core.py:74
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
 
-#: conf/admin_templates/500.html:2
-msgid "Server Error <em>(500)</em>"
-msgstr "Greška na serveru <em>(500)</em>"
+#: models/core.py:79
+msgid ""
+"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
+"use 'flatfiles/default'."
+msgstr ""
 
-#: conf/admin_templates/500.html:3
-msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
-msgstr "Dogodila se greška koja je prijavljena administratorima i biće popravljena uskoro. Hvala Vam na strpljenju."
+#: models/core.py:80
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
 
-#: conf/admin_templates/admin_object_history.html:1
-#: conf/admin_templates/base.html:4
-#: conf/admin_templates/registration/logged_out.html:1
-#: conf/admin_templates/registration/password_change_done.html:1
-#: conf/admin_templates/registration/password_change_form.html:1
-#: conf/admin_templates/registration/password_reset_done.html:1
-#: conf/admin_templates/registration/password_reset_form.html:1
-msgid "Home"
-msgstr "Početna strana"
+#: models/auth.py:33
+msgid "Use an MD5 hash -- not the raw password."
+msgstr ""
 
-#: conf/admin_templates/admin_object_history.html:2
-msgid "History"
-msgstr "Istorija"
+#: models/auth.py:34
+msgid "Designates whether the user can log into this admin site."
+msgstr ""
 
-#: conf/admin_templates/admin_object_history.html:3
-msgid "Date/time"
-msgstr "Datum/vreme"
+#: models/auth.py:40
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
 
-#: conf/admin_templates/admin_object_history.html:4
-msgid "User"
-msgstr "Korisnik"
-
-#: conf/admin_templates/admin_object_history.html:5
-msgid "Action"
-msgstr "Akcija"
-
-#: conf/admin_templates/admin_object_history.html:6
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
-msgstr "Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem administracije sajta."
-
-#: conf/admin_templates/base.html:1
-msgid "Welcome,"
-msgstr "Dobrodošli,"
-
-#: conf/admin_templates/base.html:2
-#: conf/admin_templates/base.html:5
-msgid "Change password"
-msgstr "Izmeni lozinku"
-
-#: conf/admin_templates/base.html:3
-#: conf/admin_templates/base.html:5
-msgid "Log out"
-msgstr "Odjavi se"
-
-#: conf/admin_templates/base_site.html:1
+#: conf/admin_templates/base_site.html:3
 msgid "Django site admin"
 msgstr "Django administracija sajta"
 
-#: conf/admin_templates/base_site.html:2
+#: conf/admin_templates/base_site.html:6
 msgid "Django administration"
 msgstr "Django administracija"
 
-#: conf/admin_templates/changelist_generic.html:1
-#: conf/admin_templates/index.html:1
-msgid "Add"
-msgstr "Dodaj"
+#: conf/admin_templates/admin_object_history.html:4
+#: conf/admin_templates/base.html:28
+#: conf/admin_templates/registration/password_change_done.html:3
+#: conf/admin_templates/registration/password_reset_form.html:3
+#: conf/admin_templates/registration/logged_out.html:3
+#: conf/admin_templates/registration/password_reset_done.html:3
+#: conf/admin_templates/registration/password_change_form.html:3
+msgid "Home"
+msgstr "Početna strana"
 
-#: conf/admin_templates/changelist_generic.html:2
-msgid "Click to change"
-msgstr "Kliknite za izmenu"
+#: conf/admin_templates/admin_object_history.html:4
+msgid "History"
+msgstr "Istorija"
+
+#: conf/admin_templates/admin_object_history.html:17
+msgid "Date/time"
+msgstr "Datum/vreme"
+
+#: conf/admin_templates/admin_object_history.html:18
+msgid "User"
+msgstr "Korisnik"
+
+#: conf/admin_templates/admin_object_history.html:19
+msgid "Action"
+msgstr "Akcija"
+
+#: conf/admin_templates/admin_object_history.html:35
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem "
+"administracije sajta."
+
+#: conf/admin_templates/500.html:5
+msgid "Server error (500)"
+msgstr "Greška na serveru (500)"
+
+#: conf/admin_templates/500.html:8
+msgid "Server Error <em>(500)</em>"
+msgstr "Greška na serveru <em>(500)</em>"
+
+#: conf/admin_templates/500.html:9
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Dogodila se greška koja je prijavljena administratorima i biće popravljena "
+"uskoro. Hvala Vam na strpljenju."
 
 # pridruženih =? related
-#: conf/admin_templates/delete_confirmation_generic.html:1
+#: conf/admin_templates/delete_confirmation_generic.html:6
 #, python-format
-msgid "Deleting the %(object_name)s  '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "Brisanjem %(object_name)s  '%(object)s' došlo bi do brisanja pridruženih objekata, ali nemate dozvole da brišete sledeće tipove objekata:"
+msgid ""
+"Deleting the %(object_name)s  '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Brisanjem %(object_name)s  '%(object)s' došlo bi do brisanja pridruženih "
+"objekata, ali nemate dozvole da brišete sledeće tipove objekata:"
 
-#: conf/admin_templates/delete_confirmation_generic.html:2
+#: conf/admin_templates/delete_confirmation_generic.html:13
 #, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
-msgstr "Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće obrisani i sledeći pridruženi objekti:"
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće "
+"obrisani i sledeći pridruženi objekti:"
 
-#: conf/admin_templates/delete_confirmation_generic.html:3
+#: conf/admin_templates/delete_confirmation_generic.html:17
 msgid "Yes, I'm sure"
 msgstr "Da, siguran sam"
 
-#: conf/admin_templates/index.html:2
+#: conf/admin_templates/404.html:3 conf/admin_templates/404.html.py:7
+msgid "Page not found"
+msgstr "Strana nije pronađena"
+
+#: conf/admin_templates/404.html:9
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Tražena strana ne postoji"
+
+#: conf/admin_templates/index.html:26
+msgid "Add"
+msgstr "Dodaj"
+
+#: conf/admin_templates/index.html:32
 msgid "Change"
 msgstr "Izmena"
 
-#: conf/admin_templates/index.html:3
+#: conf/admin_templates/index.html:42
 msgid "You don't have permission to edit anything."
 msgstr "Nemate dozvolu da vršite izmene."
 
-#: conf/admin_templates/index.html:4
+#: conf/admin_templates/index.html:50
 msgid "Recent Actions"
 msgstr "Skorije akcije"
 
-#: conf/admin_templates/index.html:5
+#: conf/admin_templates/index.html:51
 msgid "My Actions"
 msgstr "Moje akcije"
 
-#: conf/admin_templates/index.html:6
+#: conf/admin_templates/index.html:55
 msgid "None available"
 msgstr "Nema dostupnih"
 
-#: conf/admin_templates/login.html:1
+#: conf/admin_templates/login.html:14
 msgid "Username:"
 msgstr "Korisničko ime:"
 
-#: conf/admin_templates/login.html:2
+#: conf/admin_templates/login.html:17
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: conf/admin_templates/login.html:3
+#: conf/admin_templates/login.html:19
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Da li ste <a href=\"/password_reset/\">zaboravili Vašu lozinku?</a>?"
 
-#: conf/admin_templates/login.html:4
+#: conf/admin_templates/login.html:23
 msgid "Log in"
 msgstr "Prijavi se"
 
-#: conf/admin_templates/registration/logged_out.html:2
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Hvala Vam na poseti."
+#: conf/admin_templates/base.html:22
+msgid "Welcome,"
+msgstr "Dobrodošli,"
 
-#: conf/admin_templates/registration/logged_out.html:3
-msgid "Log in again"
-msgstr "Prijavi se ponovo"
+#: conf/admin_templates/base.html:22
+msgid "Change password"
+msgstr "Izmeni lozinku"
 
-#: conf/admin_templates/registration/password_change_done.html:2
-#: conf/admin_templates/registration/password_change_done.html:6
-#: conf/admin_templates/registration/password_change_form.html:2
+#: conf/admin_templates/base.html:22
+msgid "Log out"
+msgstr "Odjavi se"
+
+#: conf/admin_templates/registration/password_change_done.html:3
 #: conf/admin_templates/registration/password_change_form.html:3
-#: conf/admin_templates/registration/password_change_form.html:4
-#: conf/admin_templates/registration/password_change_form.html:10
+#: conf/admin_templates/registration/password_change_form.html:5
+#: conf/admin_templates/registration/password_change_form.html:9
 msgid "Password change"
 msgstr "Izmena lozinke"
 
-#: conf/admin_templates/registration/password_change_done.html:3
-#: conf/admin_templates/registration/password_change_done.html:4
+#: conf/admin_templates/registration/password_change_done.html:5
+#: conf/admin_templates/registration/password_change_done.html:9
 msgid "Password change successful"
 msgstr "Lozinka je uspešno izmenjena"
 
-#: conf/admin_templates/registration/password_change_done.html:5
+#: conf/admin_templates/registration/password_change_done.html:11
 msgid "Your password was changed."
 msgstr "Vaša lozinka je izmenjena."
 
-# Nadam se da drugi deo rečenice nie previše fancy
-#: conf/admin_templates/registration/password_change_form.html:5
-msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
-msgstr "Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi provere ispravnosti unosa nove lozinke."
-
-#: conf/admin_templates/registration/password_change_form.html:6
-msgid "Old password:"
-msgstr "Stara lozinka:"
-
-#: conf/admin_templates/registration/password_change_form.html:7
-msgid "New password:"
-msgstr "Nova lozinka:"
-
-#: conf/admin_templates/registration/password_change_form.html:8
-msgid "Confirm password:"
-msgstr "Potvrdite novu lozinku:"
-
-#: conf/admin_templates/registration/password_change_form.html:9
-msgid "Change my password"
-msgstr "Izmeni moju lozinku"
-
-#: conf/admin_templates/registration/password_reset_done.html:2
-#: conf/admin_templates/registration/password_reset_done.html:6
-#: conf/admin_templates/registration/password_reset_form.html:2
 #: conf/admin_templates/registration/password_reset_form.html:3
-#: conf/admin_templates/registration/password_reset_form.html:4
-#: conf/admin_templates/registration/password_reset_form.html:8
+#: conf/admin_templates/registration/password_reset_form.html:5
 #: conf/admin_templates/registration/password_reset_form.html:9
+#: conf/admin_templates/registration/password_reset_done.html:3
 msgid "Password reset"
 msgstr "Resetovanje lozinke"
 
-#: conf/admin_templates/registration/password_reset_done.html:3
-#: conf/admin_templates/registration/password_reset_done.html:4
+#: conf/admin_templates/registration/password_reset_form.html:11
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"Zaboravili ste svoju lozinku? Unesite Vašu e-mail adresu i dobićete novu "
+"lozinku na dati e-mail."
+
+#: conf/admin_templates/registration/password_reset_form.html:15
+msgid "E-mail address:"
+msgstr "E-mail adresa:"
+
+#: conf/admin_templates/registration/password_reset_form.html:15
+msgid "Reset my password"
+msgstr "Resetuj moju lozinku"
+
+#: conf/admin_templates/registration/logged_out.html:7
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Hvala Vam na poseti."
+
+#: conf/admin_templates/registration/logged_out.html:9
+msgid "Log in again"
+msgstr "Prijavi se ponovo"
+
+#: conf/admin_templates/registration/password_reset_done.html:5
+#: conf/admin_templates/registration/password_reset_done.html:9
 msgid "Password reset successful"
 msgstr "Vaša lozinka je uspešno resetovana"
 
-#: conf/admin_templates/registration/password_reset_done.html:5
-msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "Nova lozinka poslata Vam je na zadatu e-mail adresu. E-mail bi trebao da stigne u narednih nekoliko minuta."
+#: conf/admin_templates/registration/password_reset_done.html:11
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Nova lozinka poslata Vam je na zadatu e-mail adresu. E-mail bi trebao da "
+"stigne u narednih nekoliko minuta."
+
+# Nadam se da drugi deo rečenice nie previše fancy
+#: conf/admin_templates/registration/password_change_form.html:11
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi "
+"provere ispravnosti unosa nove lozinke."
+
+#: conf/admin_templates/registration/password_change_form.html:16
+msgid "Old password:"
+msgstr "Stara lozinka:"
+
+#: conf/admin_templates/registration/password_change_form.html:18
+msgid "New password:"
+msgstr "Nova lozinka:"
+
+#: conf/admin_templates/registration/password_change_form.html:20
+msgid "Confirm password:"
+msgstr "Potvrdite novu lozinku:"
+
+#: conf/admin_templates/registration/password_change_form.html:22
+msgid "Change my password"
+msgstr "Izmeni moju lozinku"
 
 #: conf/admin_templates/registration/password_reset_email.html:1
 msgid "You're receiving this e-mail because you requested a password reset"
@@ -223,41 +294,277 @@ msgstr "Primili ste ovaj e-mail jer ste tražili resetovanje lozinke"
 msgid "for your user account at %(site_name)s"
 msgstr "za vaš korisnički nalog na %(site_name)s"
 
-#: conf/admin_templates/registration/password_reset_email.html:3
+#: conf/admin_templates/registration/password_reset_email.html:4
 #, python-format
 msgid "Your new password is: %(new_password)s"
 msgstr "Vaša nova lozinka je: %(new_password)s"
 
-#: conf/admin_templates/registration/password_reset_email.html:4
+#: conf/admin_templates/registration/password_reset_email.html:6
 msgid "Feel free to change this password by going to this page:"
 msgstr "Lozinku možete izmeniti na sledećoj strani:"
 
-#: conf/admin_templates/registration/password_reset_email.html:5
+#: conf/admin_templates/registration/password_reset_email.html:10
 msgid "Your username, in case you've forgotten:"
 msgstr "Vaše korisničko ime, u slučaju da ste zaboravili:"
 
-#: conf/admin_templates/registration/password_reset_email.html:6
+#: conf/admin_templates/registration/password_reset_email.html:12
 msgid "Thanks for using our site!"
 msgstr "Hvala Vam na poseti!"
 
-#: conf/admin_templates/registration/password_reset_email.html:7
+#: conf/admin_templates/registration/password_reset_email.html:14
 #, python-format
 msgid "The %(site_name)s team"
 msgstr "%(site_name)s tim"
 
-#: conf/admin_templates/registration/password_reset_form.html:5
-msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
-msgstr "Zaboravili ste svoju lozinku? Unesite Vašu e-mail adresu i dobićete novu lozinku na dati e-mail."
-
-#: conf/admin_templates/registration/password_reset_form.html:6
-msgid "E-mail address:"
-msgstr "E-mail adresa:"
-
-#: conf/admin_templates/registration/password_reset_form.html:7
-msgid "Reset my password"
-msgstr "Resetuj moju lozinku"
-
-#: core/validators.py:56
+#: core/validators.py:57
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Ovo polje može sadržati samo slova, brojeve i donju crtu (_)"
 
+#: core/validators.py:61
+#, fuzzy
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr "Ovo polje može sadržati samo slova, brojeve i donju crtu (_)"
+
+#: core/validators.py:65
+msgid "Uppercase letters are not allowed here."
+msgstr ""
+
+#: core/validators.py:69
+msgid "Lowercase letters are not allowed here."
+msgstr ""
+
+#: core/validators.py:76
+msgid "Enter only digits separated by commas."
+msgstr ""
+
+#: core/validators.py:88
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr ""
+
+#: core/validators.py:95
+msgid "Please enter a valid IP address."
+msgstr ""
+
+#: core/validators.py:99
+msgid "Empty values are not allowed here."
+msgstr ""
+
+#: core/validators.py:103
+msgid "Non-numeric characters aren't allowed here."
+msgstr ""
+
+#: core/validators.py:107
+msgid "This value can't be comprised solely of digits."
+msgstr ""
+
+#: core/validators.py:112
+msgid "Enter a whole number."
+msgstr ""
+
+#: core/validators.py:116
+msgid "Only alphabetical characters are allowed here."
+msgstr ""
+
+#: core/validators.py:120
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr ""
+
+#: core/validators.py:124
+msgid "Enter a valid time in HH:MM format."
+msgstr ""
+
+#: core/validators.py:128
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr ""
+
+#: core/validators.py:132
+#, fuzzy
+msgid "Enter a valid e-mail address."
+msgstr "E-mail adresa:"
+
+#: core/validators.py:144
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+
+#: core/validators.py:151
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr ""
+
+#: core/validators.py:155
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr ""
+
+#: core/validators.py:163
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr ""
+
+#: core/validators.py:167
+msgid "A valid URL is required."
+msgstr ""
+
+#: core/validators.py:181
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+
+#: core/validators.py:188
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr ""
+
+#: core/validators.py:198
+#, python-format
+msgid "Invalid URL: %s"
+msgstr ""
+
+#: core/validators.py:200
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr ""
+
+#: core/validators.py:206
+msgid "Enter a valid U.S. state abbreviation."
+msgstr ""
+
+#: core/validators.py:221
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: core/validators.py:228
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr ""
+
+#: core/validators.py:247
+msgid "Please enter something for at least one field."
+msgstr ""
+
+#: core/validators.py:256 core/validators.py:267
+msgid "Please enter both fields or leave them both empty."
+msgstr ""
+
+#: core/validators.py:274
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr ""
+
+#: core/validators.py:286
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr ""
+
+#: core/validators.py:305
+msgid "Duplicate values are not allowed."
+msgstr ""
+
+#: core/validators.py:328
+#, python-format
+msgid "This value must be a power of %s."
+msgstr ""
+
+#: core/validators.py:339
+msgid "Please enter a valid decimal number."
+msgstr ""
+
+#: core/validators.py:341
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: core/validators.py:344
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: core/validators.py:354
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr ""
+
+#: core/validators.py:355
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr ""
+
+#: core/validators.py:368
+msgid "The format for this field is wrong."
+msgstr ""
+
+#: core/validators.py:383
+msgid "This field is invalid."
+msgstr ""
+
+#: core/validators.py:418
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr ""
+
+#: core/validators.py:421
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+
+#: core/validators.py:454
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:458
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:463
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:468
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+
+#: core/validators.py:472
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#: core/validators.py:477
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+
+#~ msgid "Click to change"
+#~ msgstr "Kliknite za izmenu"
diff --git a/django/core/validators.py b/django/core/validators.py
index a737f90505..3e674e7b94 100644
--- a/django/core/validators.py
+++ b/django/core/validators.py
@@ -24,7 +24,7 @@ phone_re = re.compile(r'^[A-PR-Y0-9]{3}-[A-PR-Y0-9]{3}-[A-PR-Y0-9]{4}$', re.IGNO
 url_re = re.compile(r'^http://\S+$')
 
 from django.conf.settings import JING_PATH
-from django.utils.translation import gettext_lazy
+from django.utils.translation import gettext_lazy, ngettext
 
 class ValidationError(Exception):
     def __init__(self, message):
@@ -218,10 +218,9 @@ def hasNoProfanities(field_data, all_data):
     if words_seen:
         from django.utils.text import get_text_list
         plural = len(words_seen) > 1
-        raise ValidationError, _("Watch your mouth! The word%s %s %s not allowed here.") % \
-            (plural and 's' or '',
-            get_text_list(['"%s%s%s"' % (i[0], '-'*(len(i)-2), i[-1]) for i in words_seen], 'and'),
-            plural and 'are' or 'is')
+        raise ValidationError, ngettext("Watch your mouth! The word %s is not allowed here.",
+            "Watch your mouth! The words %s are not allowed here.", plural) % \
+            get_text_list(['"%s%s%s"' % (i[0], '-'*(len(i)-2), i[-1]) for i in words_seen], 'and')
 
 class AlwaysMatchesOtherField:
     def __init__(self, other_field_name, error_message=None):
@@ -272,7 +271,8 @@ class RequiredIfOtherFieldEquals:
     def __init__(self, other_field, other_value, error_message=None):
         self.other_field = other_field
         self.other_value = other_value
-        self.error_message = error_message or gettext_lazy("This field must be given if %s is %s") % (other_field, other_value)
+        self.error_message = error_message or gettext_lazy("This field must be given if %(field)s is %(value)s") % {
+            'field': other_field, 'value': other_value}
         self.always_test = True
 
     def __call__(self, field_data, all_data):
@@ -283,7 +283,8 @@ class RequiredIfOtherFieldDoesNotEqual:
     def __init__(self, other_field, other_value, error_message=None):
         self.other_field = other_field
         self.other_value = other_value
-        self.error_message = error_message or gettext_lazy("This field must be given if %s is not %s") % (other_field, other_value)
+        self.error_message = error_message or gettext_lazy("This field must be given if %(field)s is not %(value)s") % {
+            'field': other_field, 'value': other_value}
         self.always_test = True
 
     def __call__(self, field_data, all_data):
@@ -337,11 +338,11 @@ class IsValidFloat:
         except ValueError:
             raise ValidationError, _("Please enter a valid decimal number.")
         if len(data) > (self.max_digits + 1):
-            raise ValidationError, _("Please enter a valid decimal number with at most %s total digit%s.") % \
-                (self.max_digits, self.max_digits > 1 and 's' or '')
+            raise ValidationError, ngettext( "Please enter a valid decimal number with at most %s total digit.",
+                "Please enter a valid decimal number with at most %s total digits.", self.max_digits) % self.max_digits
         if '.' in data and len(data.split('.')[1]) > self.decimal_places:
-            raise ValidationError, _("Please enter a valid decimal number with at most %s decimal place%s.") % \
-                (self.decimal_places, self.decimal_places > 1 and 's' or '')
+            raise ValidationError, ngettext("Please enter a valid decimal number with at most %s decimal place.",
+                "Please enter a valid decimal number with at most %s decimal places.", self.decimal_places) % self.decimal_places
 
 class HasAllowableSize:
     """
@@ -417,7 +418,8 @@ class URLMimeTypeCheck:
             raise URLMimeTypeCheck.CouldNotRetrieve, _("Could not retrieve anything from %s.") % field_data
         content_type = info['content-type']
         if content_type not in self.mime_type_list:
-            raise URLMimeTypeCheck.InvalidContentType, _("The URL %s returned the invalid Content-Type header '%s'.") % (field_data, content_type)
+            raise URLMimeTypeCheck.InvalidContentType, _("The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'.") % {
+                'url': field_data, 'contenttype': content_type}
 
 class RelaxNGCompact:
     "Validate against a Relax NG compact schema"
@@ -449,31 +451,31 @@ class RelaxNGCompact:
             # Scrape the Jing error messages to reword them more nicely.
             m = re.search(r'Expected "(.*?)" to terminate element starting on line (\d+)', message)
             if m:
-                display_errors.append(_('Please close the unclosed %s tag from line %s. (Line starts with "%s".)') % \
-                    (m.group(1).replace('/', ''), m.group(2), lines[int(m.group(2)) - 1][:30]))
+                display_errors.append(_('Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "%(start)s".)') % \
+                    {'tag':m.group(1).replace('/', ''), 'line':m.group(2), 'start':lines[int(m.group(2)) - 1][:30]})
                 continue
             if message.strip() == 'text not allowed here':
-                display_errors.append(_('Some text starting on line %s is not allowed in that context. (Line starts with "%s".)') % \
-                    (line, lines[int(line) - 1][:30]))
+                display_errors.append(_('Some text starting on line %(line)s is not allowed in that context. (Line starts with "%(start)s".)') % \
+                    {'line':line, 'start':lines[int(line) - 1][:30]})
                 continue
             m = re.search(r'\s*attribute "(.*?)" not allowed at this point; ignored', message)
             if m:
-                display_errors.append(_('"%s" on line %s is an invalid attribute. (Line starts with "%s".)') % \
-                    (m.group(1), line, lines[int(line) - 1][:30]))
+                display_errors.append(_('"%(attr)s" on line %(line)s is an invalid attribute. (Line starts with "%(start)s".)') % \
+                    {'attr':m.group(1), 'line':line, 'start':lines[int(line) - 1][:30]})
                 continue
             m = re.search(r'\s*unknown element "(.*?)"', message)
             if m:
-                display_errors.append(_('"<%s>" on line %s is an invalid tag. (Line starts with "%s".)') % \
-                    (m.group(1), line, lines[int(line) - 1][:30]))
+                display_errors.append(_('"<%(tag)s>" on line %(line)s is an invalid tag. (Line starts with "%(start)s".)') % \
+                    {'tag':m.group(1), 'line':line, 'start':lines[int(line) - 1][:30]})
                 continue
             if message.strip() == 'required attributes missing':
-                display_errors.append(_('A tag on line %s is missing one or more required attributes. (Line starts with "%s".)') % \
-                    (line, lines[int(line) - 1][:30]))
+                display_errors.append(_('A tag on line %(line)s is missing one or more required attributes. (Line starts with "%(start)s".)') % \
+                    {'line':line, 'start':lines[int(line) - 1][:30]})
                 continue
             m = re.search(r'\s*bad value for attribute "(.*?)"', message)
             if m:
-                display_errors.append(_('The "%s" attribute on line %s has an invalid value. (Line starts with "%s".)') % \
-                    (m.group(1), line, lines[int(line) - 1][:30]))
+                display_errors.append(_('The "%(attr)s" attribute on line %(line)s has an invalid value. (Line starts with "%(start)s".)') % \
+                    {'attr':m.group(1), 'line':line, 'start':lines[int(line) - 1][:30]})
                 continue
             # Failing all those checks, use the default error message.
             display_error = 'Line %s: %s [%s]' % (line, message, level.strip())
diff --git a/django/models/auth.py b/django/models/auth.py
index 430cad192a..9a10434c94 100644
--- a/django/models/auth.py
+++ b/django/models/auth.py
@@ -1,5 +1,6 @@
 from django.core import meta, validators
 from django.models import core
+from django.utils.translation import gettext_lazy
 
 class Permission(meta.Model):
     name = meta.CharField(maxlength=50)
@@ -29,14 +30,14 @@ class User(meta.Model):
     first_name = meta.CharField(maxlength=30, blank=True)
     last_name = meta.CharField(maxlength=30, blank=True)
     email = meta.EmailField('e-mail address', blank=True)
-    password_md5 = meta.CharField('password', maxlength=32, help_text="Use an MD5 hash -- not the raw password.")
-    is_staff = meta.BooleanField('staff status', help_text="Designates whether the user can log into this admin site.")
+    password_md5 = meta.CharField('password', maxlength=32, help_text=gettext_lazy("Use an MD5 hash -- not the raw password."))
+    is_staff = meta.BooleanField('staff status', help_text=gettext_lazy("Designates whether the user can log into this admin site."))
     is_active = meta.BooleanField('active', default=True)
     is_superuser = meta.BooleanField('superuser status')
     last_login = meta.DateTimeField(default=meta.LazyDate())
     date_joined = meta.DateTimeField(default=meta.LazyDate())
     groups = meta.ManyToManyField(Group, blank=True,
-        help_text="In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in.")
+        help_text=gettext_lazy("In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."))
     user_permissions = meta.ManyToManyField(Permission, blank=True, filter_interface=meta.HORIZONTAL)
     class META:
         module_constants = {
diff --git a/django/models/core.py b/django/models/core.py
index 939373f7ec..d56a4fc64b 100644
--- a/django/models/core.py
+++ b/django/models/core.py
@@ -1,4 +1,5 @@
 from django.core import meta, validators
+from django.utils.translation import gettext_lazy
 
 class Site(meta.Model):
     domain = meta.CharField('domain name', maxlength=100)
@@ -53,9 +54,9 @@ class ContentType(meta.Model):
 class Redirect(meta.Model):
     site = meta.ForeignKey(Site, radio_admin=meta.VERTICAL)
     old_path = meta.CharField('redirect from', maxlength=200, db_index=True,
-        help_text="This should be an absolute path, excluding the domain name. Example: '/events/search/'.")
+        help_text=gettext_lazy("This should be an absolute path, excluding the domain name. Example: '/events/search/'."))
     new_path = meta.CharField('redirect to', maxlength=200, blank=True,
-        help_text="This can be either an absolute path (as above) or a full URL starting with 'http://'.")
+        help_text=gettext_lazy("This can be either an absolute path (as above) or a full URL starting with 'http://'."))
     class META:
         db_table = 'redirects'
         unique_together=(('site', 'old_path'),)
@@ -70,13 +71,13 @@ class Redirect(meta.Model):
 
 class FlatFile(meta.Model):
     url = meta.CharField('URL', maxlength=100, validator_list=[validators.isAlphaNumericURL],
-        help_text="Example: '/about/contact/'. Make sure to have leading and trailing slashes.")
+        help_text=gettext_lazy("Example: '/about/contact/'. Make sure to have leading and trailing slashes."))
     title = meta.CharField(maxlength=200)
     content = meta.TextField()
     enable_comments = meta.BooleanField()
     template_name = meta.CharField(maxlength=70, blank=True,
-        help_text="Example: 'flatfiles/contact_page'. If this isn't provided, the system will use 'flatfiles/default'.")
-    registration_required = meta.BooleanField(help_text="If this is checked, only logged-in users will be able to view the page.")
+        help_text=gettext_lazy("Example: 'flatfiles/contact_page'. If this isn't provided, the system will use 'flatfiles/default'."))
+    registration_required = meta.BooleanField(help_text=gettext_lazy("If this is checked, only logged-in users will be able to view the page."))
     sites = meta.ManyToManyField(Site)
     class META:
         db_table = 'flatfiles'