diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index bf4ac32747..68dcf7c8bc 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -1,6 +1,8 @@
 # Default Django settings. Override these with settings in the module
 # pointed-to by the DJANGO_SETTINGS_MODULE environment variable.
 
+from django.utils.translation import gettext_lazy as _
+
 ####################
 # CORE             #
 ####################
@@ -32,10 +34,15 @@ LANGUAGE_CODE = 'en-us'
 # language name should be the utf-8 encoded local name for the
 # language.
 LANGUAGES = (
-    ('en', 'English'),
-    ('de', 'Deutsch'),
-    ('it', 'Italiano'),
-    ('sr', 'Srpski'),
+    ('de', _('German')),
+    ('en', _('English')),
+    ('es', _('Spanish')),
+    ('fr', _('French')),
+    ('gl', _('Galician')),
+    ('it', _('Itialian')),
+    ('pt_BR', _('Brazilian')),
+    ('ru', _('Russian')),
+    ('sr', _('Serbic')),
 )
 
 # Not-necessarily-technical managers of the site. They get broken link
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index 79b4f0afd6..44ee6899eb 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 d2ba38b0b9..6ea8a752f2 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -7,13 +7,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-19 20:20+0200\n"
+"POT-Creation-Date: 2005-10-23 13:39+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"
 
+#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_reset_form.html:3
+#: contrib/admin/templates/registration/logged_out.html:3
+#: contrib/admin/templates/registration/password_reset_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+msgid "Home"
+msgstr "Start"
+
+#: contrib/admin/templates/admin/object_history.html:4
+msgid "History"
+msgstr "Geschichte"
+
+#: contrib/admin/templates/admin/object_history.html:17
+msgid "Date/time"
+msgstr "Datum/Zeit"
+
+#: contrib/admin/templates/admin/object_history.html:18 models/auth.py:47
+msgid "User"
+msgstr "Benutzer"
+
+#: contrib/admin/templates/admin/object_history.html:19
+msgid "Action"
+msgstr "Aktion"
+
+#: contrib/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 ""
+"Dieses Objekt hat keine Änderungsgeschichte. Es wurde möglicherweise nicht "
+"über diese Verwaltungsseiten angelegt."
+
 #: contrib/admin/templates/admin/base_site.html:3
 msgid "Django site admin"
 msgstr "Django Systemverwaltung"
@@ -73,40 +107,6 @@ msgstr "Meine Aktionen"
 msgid "None available"
 msgstr "Keine vorhanden"
 
-#: contrib/admin/templates/admin/object_history.html:4
-#: contrib/admin/templates/admin/base.html:28
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_reset_form.html:3
-#: contrib/admin/templates/registration/logged_out.html:3
-#: contrib/admin/templates/registration/password_reset_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-msgid "Home"
-msgstr "Start"
-
-#: contrib/admin/templates/admin/object_history.html:4
-msgid "History"
-msgstr "Geschichte"
-
-#: contrib/admin/templates/admin/object_history.html:17
-msgid "Date/time"
-msgstr "Datum/Zeit"
-
-#: contrib/admin/templates/admin/object_history.html:18 models/auth.py:47
-msgid "User"
-msgstr "Benutzer"
-
-#: contrib/admin/templates/admin/object_history.html:19
-msgid "Action"
-msgstr "Aktion"
-
-#: contrib/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 ""
-"Dieses Objekt hat keine Änderungsgeschichte. Es wurde möglicherweise nicht "
-"über diese Verwaltungsseiten angelegt."
-
 #: contrib/admin/templates/admin/login.html:14
 msgid "Username:"
 msgstr "Benutzername:"
@@ -280,10 +280,6 @@ msgstr "Das Team von %(site_name)s"
 msgid "action time"
 msgstr "Zeit der Aktion"
 
-#: contrib/admin/models/admin.py:8 models/core.py:38
-msgid "content type"
-msgstr "Inhaltstyp"
-
 #: contrib/admin/models/admin.py:9
 msgid "object id"
 msgstr "Objekt ID"
@@ -298,7 +294,7 @@ msgstr "Aktionskennzeichen"
 
 #: contrib/admin/models/admin.py:12
 msgid "change message"
-msgstr ""
+msgstr "Änderungsmeldung"
 
 #: contrib/admin/models/admin.py:15
 msgid "log entry"
@@ -308,6 +304,110 @@ msgstr "Logeintrag"
 msgid "log entries"
 msgstr "Logeinträge"
 
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Montag"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Dienstag"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Donnerstag"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Freitag"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Samstag"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Sonntag"
+
+#: utils/dates.py:14
+msgid "January"
+msgstr "Januar"
+
+#: utils/dates.py:14
+msgid "February"
+msgstr "Februa"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "March"
+msgstr "März"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "April"
+msgstr "April"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "May"
+msgstr "Mai"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "June"
+msgstr "Juni"
+
+#: utils/dates.py:15 utils/dates.py:27
+msgid "July"
+msgstr "Juli"
+
+#: utils/dates.py:15
+msgid "August"
+msgstr "August"
+
+#: utils/dates.py:15
+msgid "September"
+msgstr "September"
+
+#: utils/dates.py:15
+msgid "October"
+msgstr "Oktober"
+
+#: utils/dates.py:15
+msgid "November"
+msgstr "November"
+
+#: utils/dates.py:16
+msgid "December"
+msgstr "Dezember"
+
+#: utils/dates.py:27
+msgid "Jan."
+msgstr "Jan."
+
+#: utils/dates.py:27
+msgid "Feb."
+msgstr "Feb."
+
+#: utils/dates.py:28
+msgid "Aug."
+msgstr "Aug."
+
+#: utils/dates.py:28
+msgid "Sept."
+msgstr "Sept."
+
+#: utils/dates.py:28
+msgid "Oct."
+msgstr "Okt."
+
+#: utils/dates.py:28
+msgid "Nov."
+msgstr "Nov."
+
+#: utils/dates.py:28
+msgid "Dec."
+msgstr "Dez."
+
 #: models/core.py:5
 msgid "domain name"
 msgstr "Domainname"
@@ -344,6 +444,10 @@ msgstr "Pakete"
 msgid "python module name"
 msgstr "Python Modulname"
 
+#: models/core.py:38
+msgid "content type"
+msgstr "Inhaltstyp"
+
 #: models/core.py:39
 msgid "content types"
 msgstr "Inhaltstypen"
@@ -544,74 +648,110 @@ msgstr "Wichtige Daten"
 msgid "Message"
 msgstr "Mitteilung"
 
-#: core/validators.py:57
+#: conf/global_settings.py:37
+msgid "German"
+msgstr "Deutsch"
+
+#: conf/global_settings.py:38
+msgid "English"
+msgstr "Englisch"
+
+#: conf/global_settings.py:39
+msgid "Spanish"
+msgstr "Spanisch"
+
+#: conf/global_settings.py:40
+msgid "French"
+msgstr "Französisch"
+
+#: conf/global_settings.py:41
+msgid "Galician"
+msgstr "Galicisch"
+
+#: conf/global_settings.py:42
+msgid "Itialian"
+msgstr "Italienisch"
+
+#: conf/global_settings.py:43
+msgid "Brazilian"
+msgstr "Brasilianisch"
+
+#: conf/global_settings.py:44
+msgid "Russian"
+msgstr "Russisch"
+
+#: conf/global_settings.py:45
+msgid "Serbic"
+msgstr "Serbisch"
+
+#: core/validators.py:58
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Der Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten."
 
-#: core/validators.py:61
+#: core/validators.py:62
 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
+#: core/validators.py:70
 msgid "Uppercase letters are not allowed here."
 msgstr "Großbuchstaben sind hier nicht erlaubt."
 
-#: core/validators.py:69
+#: core/validators.py:74
 msgid "Lowercase letters are not allowed here."
 msgstr "Kleinbuchstaben sind hier nicht erlaubt."
 
-#: core/validators.py:76
+#: core/validators.py:81
 msgid "Enter only digits separated by commas."
 msgstr "Hier sind nur durch Komma getrennte Ziffern erlaubt."
 
-#: core/validators.py:88
+#: core/validators.py:93
 msgid "Enter valid e-mail addresses separated by commas."
 msgstr "Bitte mit Komma getrennte, gültige eMail-Adressen eingeben."
 
-#: core/validators.py:95
+#: core/validators.py:100
 msgid "Please enter a valid IP address."
 msgstr "Bitte eine gültige IP-Adresse eingeben."
 
-#: core/validators.py:99
+#: core/validators.py:104
 msgid "Empty values are not allowed here."
 msgstr "Dieses Feld darf nicht leer sein."
 
-#: core/validators.py:103
+#: core/validators.py:108
 msgid "Non-numeric characters aren't allowed here."
 msgstr "Nichtnumerische Zeichen sind hier nicht erlaubt."
 
-#: core/validators.py:107
+#: core/validators.py:112
 msgid "This value can't be comprised solely of digits."
 msgstr "Dieser Wert darf nicht nur aus Ziffern bestehen."
 
-#: core/validators.py:112
+#: core/validators.py:117
 msgid "Enter a whole number."
 msgstr "Bitte eine ganze Zahl eingeben."
 
-#: core/validators.py:116
+#: core/validators.py:121
 msgid "Only alphabetical characters are allowed here."
 msgstr "Nur alphabetische Zeichen sind hier erlaubt."
 
-#: core/validators.py:120
+#: core/validators.py:125
 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
+#: core/validators.py:129
 msgid "Enter a valid time in HH:MM format."
 msgstr "Bitte eine gültige Zeit im Format SS:MM eingeben."
 
-#: core/validators.py:128
+#: core/validators.py:133
 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
+#: core/validators.py:137
 msgid "Enter a valid e-mail address."
 msgstr "Bitte eine gültige eMail-Adresse eingeben"
 
-#: core/validators.py:144
+#: core/validators.py:149
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -619,27 +759,27 @@ msgstr ""
 "Bitte ein Bild hochladen. Die Datei, die hochgeladen wurde, ist kein Bild "
 "oder ist defekt."
 
-#: core/validators.py:151
+#: core/validators.py:156
 #, 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
+#: core/validators.py:160
 #, 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
+#: core/validators.py:168
 #, 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
+#: core/validators.py:172
 msgid "A valid URL is required."
 msgstr "Eine gültige URL ist hier verlangt."
 
-#: core/validators.py:181
+#: core/validators.py:186
 #, python-format
 msgid ""
 "Valid HTML is required. Specific errors are:\n"
@@ -648,71 +788,71 @@ msgstr ""
 "Bitte gültiges HTML eingeben. Fehler sind:\n"
 "%s"
 
-#: core/validators.py:188
+#: core/validators.py:193
 #, python-format
 msgid "Badly formed XML: %s"
 msgstr "Ungültiges XML: %s"
 
-#: core/validators.py:198
+#: core/validators.py:203
 #, python-format
 msgid "Invalid URL: %s"
 msgstr "Ungültige URL: %s"
 
-#: core/validators.py:200
+#: core/validators.py:205
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "Die URL %s funktioniert nicht."
 
-#: core/validators.py:206
+#: core/validators.py:211
 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
+#: core/validators.py:226
 #, 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
+#: core/validators.py:233
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Dieses Feld muss zum Feld '%s' passen."
 
-#: core/validators.py:247
+#: core/validators.py:252
 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
+#: core/validators.py:261 core/validators.py:272
 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
+#: core/validators.py:279
 #, 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
+#: core/validators.py:291
 #, 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
+#: core/validators.py:310
 msgid "Duplicate values are not allowed."
 msgstr "Doppelte Werte sind hier nicht erlaubt."
 
-#: core/validators.py:328
+#: core/validators.py:333
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Dieser Wert muss eine Potenz von %s sein."
 
-#: core/validators.py:339
+#: core/validators.py:344
 msgid "Please enter a valid decimal number."
 msgstr "Bitte eine gültige Dezimalzahl eingeben."
 
-#: core/validators.py:341
+#: core/validators.py:346
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@@ -720,7 +860,7 @@ msgid_plural ""
 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
+#: core/validators.py:349
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@@ -730,39 +870,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Bitte eine gültige Dezimalzahl mit maximal %s Dezimalstellen eingeben."
 
-#: core/validators.py:354
+#: core/validators.py:359
 #, 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
+#: core/validators.py:360
 #, 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
+#: core/validators.py:373
 msgid "The format for this field is wrong."
 msgstr "Das Format für dieses Feld ist falsch."
 
-#: core/validators.py:383
+#: core/validators.py:388
 msgid "This field is invalid."
 msgstr "Dieses Feld ist ungültig."
 
-#: core/validators.py:418
+#: core/validators.py:423
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Konnte nichts von %s empfangen."
 
-#: core/validators.py:421
+#: core/validators.py:426
 #, 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
+#: core/validators.py:459
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -771,7 +911,7 @@ msgstr ""
 "Bitte das ungeschlossene %(tag)s Tag in Zeile %(line)s schließen. Die Zeile "
 "beginnt mit \"%(start)s\"."
 
-#: core/validators.py:458
+#: core/validators.py:463
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -780,7 +920,7 @@ msgstr ""
 "In Zeile %(line)s ist Text, der nicht in dem Kontext erlaubt ist. Die Zeile "
 "beginnt mit \"%(start)s\"."
 
-#: core/validators.py:463
+#: core/validators.py:468
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -789,7 +929,7 @@ msgstr ""
 "Das Attribute %(attr)s in Zeile %(line)s ist ungültig. Die Zeile beginnt mit "
 "\"%(start)s\"."
 
-#: core/validators.py:468
+#: core/validators.py:473
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -798,7 +938,7 @@ msgstr ""
 "<%(tag)s> in Zeile %(line)s ist ungültig. Die Zeile beginnt mit \"%(start)s"
 "\"."
 
-#: core/validators.py:472
+#: core/validators.py:477
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -807,7 +947,7 @@ msgstr ""
 "Ein Tag in Zeile %(line)s hat eines oder mehrere Pflichtattribute nicht. Die "
 "Zeile beginnt mit \"%(start)s\"."
 
-#: core/validators.py:477
+#: core/validators.py:482
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -826,4 +966,3 @@ msgid ""
 msgstr ""
 " Um mehr als eine Selektion zu treffen, \"Control\" oder auf dem Mac "
 "\"Command\" beim Klicken gedrückt halten."
-
diff --git a/django/utils/dates.py b/django/utils/dates.py
index 2ae0cc1a6e..12fb7b2b76 100644
--- a/django/utils/dates.py
+++ b/django/utils/dates.py
@@ -1,17 +1,19 @@
 "Commonly-used date structures"
 
+from django.utils.translation import gettext_lazy as _
+
 WEEKDAYS = {
-    0:'Monday', 1:'Tuesday', 2:'Wednesday', 3:'Thursday', 4:'Friday',
-    5:'Saturday', 6:'Sunday'
+    0:_('Monday'), 1:_('Tuesday'), 2:_('Wednesday'), 3:_('Thursday'), 4:_('Friday'),
+    5:_('Saturday'), 6:_('Sunday')
 }
 WEEKDAYS_REV = {
     'monday':0, 'tuesday':1, 'wednesday':2, 'thursday':3, 'friday':4,
     'saturday':5, 'sunday':6
 }
 MONTHS = {
-    1:'January', 2:'February', 3:'March', 4:'April', 5:'May', 6:'June',
-    7:'July', 8:'August', 9:'September', 10:'October', 11:'November',
-    12:'December'
+    1:_('January'), 2:_('February'), 3:_('March'), 4:_('April'), 5:_('May'), 6:_('June'),
+    7:_('July'), 8:_('August'), 9:_('September'), 10:_('October'), 11:_('November'),
+    12:_('December')
 }
 MONTHS_3 = {
     1:'jan', 2:'feb', 3:'mar', 4:'apr', 5:'may', 6:'jun', 7:'jul', 8:'aug',
@@ -22,6 +24,6 @@ MONTHS_3_REV = {
     'sep':9, 'oct':10, 'nov':11, 'dec':12
 }
 MONTHS_AP = { # month names in Associated Press style
-    1:'Jan.', 2:'Feb.', 3:'March', 4:'April', 5:'May', 6:'June', 7:'July',
-    8:'Aug.', 9:'Sept.', 10:'Oct.', 11:'Nov.', 12:'Dec.'
+    1:_('Jan.'), 2:_('Feb.'), 3:_('March'), 4:_('April'), 5:_('May'), 6:_('June'), 7:_('July'),
+    8:_('Aug.'), 9:_('Sept.'), 10:_('Oct.'), 11:_('Nov.'), 12:_('Dec.')
 }