Merged to trunk r1221

git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@1223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2025-07-04 01:39:20 +00:00 · 2005-11-14 00:39:04 +00:00 · 2005-11-14 00:39:04 +00:00 · 5ad7d29b67
commit 5ad7d29b67
parent 907feaacc7 6e40d8c29f
46 changed files with 1946 additions and 536 deletions
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@ -42,6 +42,7 @@ LANGUAGES = (
    ('es', _('Spanish')),
    ('fr', _('French')),
    ('gl', _('Galician')),
+    ('is', _('Icelandic')),
    ('it', _('Italian')),
    ('no', _('Norwegian')),
    ('pt-br', _('Brazilian')),
@ -49,6 +50,7 @@ LANGUAGES = (
    ('ru', _('Russian')),
    ('sk', _('Slovak')),
    ('sr', _('Serbian')),
+    ('sv', _('Swedish')),
    ('zh-cn', _('Simplified Chinese')),
 )

--- a/django/conf/locale/bn/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bn/LC_MESSAGES/django.mo
--- a/django/conf/locale/bn/LC_MESSAGES/django.po
+++ b/django/conf/locale/bn/LC_MESSAGES/django.po
@ -1,4 +1,4 @@
-# django.bn.po -- Bengali (bn) translation of Django core
+# django.po -- Bengali (bn) translation of Django core
 # Copyright (C) 2005 Django Authors
 # This file is distributed under the same license as the Django package.
 # Baishampayan Ghose <b.ghose@gnu.org.in>, 2005.
@ -8,17 +8,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-11 16:13-0600\n"
-"PO-Revision-Date: 2005-11-10 06:11+0530\n"
+"POT-Creation-Date: 2005-11-13 13:41-0600\n"
+"PO-Revision-Date: 2005-11-12 20:05+0530\n"
 "Last-Translator: Baishampayan Ghose <b.ghose@gnu.org.in>\n"
-"Language-Team: Bengali <core@bengalinux.org>\n"
+"Language-Team: Ankur Bangla <core@bengalinux.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

 #: contrib/admin/models/admin.py:6
 msgid "action time"
-msgstr "কাজ সময়"
+msgstr "কাজের সময়"

 #: contrib/admin/models/admin.py:9
 msgid "object id"
@ -30,7 +30,7 @@ msgstr "বস্তু repr"

 #: contrib/admin/models/admin.py:11
 msgid "action flag"
-msgstr "কাজ ফ্ল্যাগ"
+msgstr "কাজের ফ্ল্যাগ"

 #: contrib/admin/models/admin.py:12
 msgid "change message"
@ -367,7 +367,6 @@ msgid "template name"
 msgstr "ছাঁদ নাম"

 #: contrib/flatpages/models/flatpages.py:12
-#, fuzzy
 msgid ""
 "Example: 'flatpages/contact_page'. If this isn't provided, the system will "
 "use 'flatpages/default'."
@ -392,6 +391,18 @@ msgstr "চ্যাপ্টা পাতা"
 msgid "flat pages"
 msgstr "চ্যাপ্টা পাতাগুলো"

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "সোমবার"
@ -653,7 +664,7 @@ msgstr "বার্তা"

 #: conf/global_settings.py:36
 msgid "Bengali"
-msgstr ""
+msgstr "বাংলা"

 #: conf/global_settings.py:37
 msgid "Czech"
@ -673,7 +684,7 @@ msgstr "ইংরেজী"

 #: conf/global_settings.py:41
 msgid "Spanish"
-msgstr "স্পেনিয়"
+msgstr "স্প্যানিশ"

 #: conf/global_settings.py:42
 msgid "French"
@ -684,34 +695,42 @@ msgid "Galician"
 msgstr "গ্যালিসিয়"

 #: conf/global_settings.py:44
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:45
 msgid "Italian"
 msgstr "ইতালিয়"

-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Norwegian"
 msgstr "নরওয়েজিয়"

-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Brazilian"
 msgstr "ব্রাজিলীয়"

-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Romanian"
 msgstr "রোমানীয়"

-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Russian"
 msgstr "রুশ"

-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Slovak"
 msgstr "স্লোভাক"

-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Serbian"
 msgstr "সার্বিয়ান"

-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Simplified Chinese"
 msgstr "সরলীকৃত চীনা"

@ -825,105 +844,105 @@ msgstr "খারাপভাবে গঠিত এক্সএমএল: %s"
 msgid "Invalid URL: %s"
 msgstr "অবৈধ ইউ.আর.এল: %s"

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "ইউ.আর.এল %s একটি ভাঙা সংযোগ।"

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "একটি বৈধ U S. রাজ্য abbreviation ঢোকান।"

-#: core/validators.py:224
-#, fuzzy, python-format
+#: core/validators.py:228
+#, 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] "মুখ সামলে! %s এখানে ব্যাবহার করতে পারবেন না।"
 msgstr[1] "মুখ সামলে! %s এখানে ব্যাবহার করতে পারবেন না।"

-#: core/validators.py:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "এই ক্ষেত্রটি '%s' ক্ষেত্রের সঙ্গে অবশ্যই মিলতে হবে।"

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr "দয়া করে অন্তত এক ক্ষেত্রেতে কিছু জিনিষ ঢোকান।"

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "দয়া করে উভয় ক্ষেত্রে ঢোকান অথবা তাদেরকে উভয় ফাঁকা ছেড়ে চলে যান।"

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "এই ক্ষেত্রেটি অবশ্যই দেওয়া হবে যদি %(field)s %(value)s হয়"

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr "এই ক্ষেত্রেটি অবশ্যই দেওয়া হবে যদি %(field)s %(value)s না হয়"

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr "নকল মান অনুমতি দেওয়া হল না।"

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "এই মানটি %sএর একটি গুন অবশ্যই হতে হবে।"

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান।"

-#: core/validators.py:344
-#, fuzzy, python-format
+#: core/validators.py:348
+#, 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] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার অক্ষরের সংখ্যা %s থেকে কম হবে।"
 msgstr[1] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার অক্ষরের সংখ্যা %s থেকে কম হবে।"

-#: core/validators.py:347
-#, fuzzy, python-format
+#: core/validators.py:351
+#, 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] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার দশমিক স্থান %s থেকে কম হবে।"
 msgstr[1] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার দশমিক স্থান %s থেকে কম হবে।"

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "আাপনার আপলোড করা ফাইল যেন অন্তত %s বাইট বড় হয় তা নিশ্চিত করুন।"

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "আাপনার আপলোড করা ফাইল যেন %s বাইটের থেকে বড় না হয় তা নিশ্চিত করুন।"

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr "এই ক্ষেত্রের জন্য ফরম্যাটটি ভূল।"

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr "এই ক্ষেত্রেটি অবৈধ।"

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "%s থেকে কোন কিছু গ্রহন করতে পারলাম না।"

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 "ইউ.আর.এল %(url)s অবৈধ Content-Type শিরোনাম নিয়ে '%(contenttype)s ফিরে আসল।"

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@ -932,7 +951,7 @@ msgstr ""
 "দয়া করে লাইন %(line)s থেকে খোলা %(tag)s বন্ধ করুন। (\"%(start)s\"এর সঙ্গে লাইন "
 "আরম্ভ।)"

-#: core/validators.py:461
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@ -941,7 +960,7 @@ msgstr ""
 "লাইন %(line)s এই প্রসঙ্গে কিছু শব্দ লেখার অনুমতি দেওয়া গেল না। (\"%(start)s\"এর "
 "সঙ্গে লাইন আরম্ভ।)"

-#: core/validators.py:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@ -949,7 +968,7 @@ msgid ""
 msgstr ""
 "লাইন %(line)s\"%(attr)s\"একটি অবৈধ বৈশিষ্ট্য। (\"%(start)s\"এর সঙ্গে লাইন আরম্ভ।)"

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@ -958,7 +977,7 @@ msgstr ""
 " %(line)s লাইনে \"<%(tag)s>\" একটি অবৈধ ট্যাগ। (\"%(start)s\"এর সঙ্গে লাইন "
 "আরম্ভ।)"

-#: core/validators.py:475
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@ -967,7 +986,7 @@ msgstr ""
 "লাইন %(line)s একটি ট্যাগে এক অথবা আরও বেশি প্রয়োজনীয় বিশিষ্ট্যাবলী নেই। (\"%"
 "(start)s\"এর সঙ্গে লাইন আরম্ভ।)"

-#: core/validators.py:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@ -565,6 +565,18 @@ msgstr "log záznamy"
 msgid "All dates"
 msgstr ""

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Pondělí"
@ -938,18 +950,22 @@ msgid "Galician"
 msgstr "Galicijsky"

 #: conf/global_settings.py:44
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:45
 msgid "Italian"
 msgstr "Italsky"

-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Norwegian"
 msgstr "Norsky"

-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Brazilian"
 msgstr "Brazilsky"

-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Russian"
 msgstr "Rusky"

@ -1076,16 +1092,16 @@ msgstr "Špatně formované XML: %s"
 msgid "Invalid URL: %s"
 msgstr "Neplatné URL: %s"

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "Odkaz na URL %s je rozbitý."

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Vložte platnou zkraku U.S. státu."

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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."
@ -1093,43 +1109,43 @@ msgstr[0] "Mluvte slušně! Slovo %s zde není přípustné."
 msgstr[1] "Mluvte slušně! Slova %s zde nejsou přípustná."
 msgstr[2] "Mluvte slušně! Slova %s zde nejsou přípustná."

-#: core/validators.py:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Toto pole se musí shodovat s polem '%s'."

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr "Prosíme, vložte něco alespoň pro jedno pole."

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "Prosíme, vložte obě pole, nebo je nechte obě prázdná."

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "Toto pole musí být vyplněno, když %(field)s má %(value)s"

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr "Toto pole musí být vyplněno, když %(field)s nemá %(value)s"

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr "Duplikátní hodnoty nejsou povolené."

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Tato hodnota musí být mocninou %s."

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr "Prosíme, vložte platné číslo."

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -1138,7 +1154,7 @@ msgstr[0] "Prosíme, vložte platné číslo s nejvíce %s cifrou celkem."
 msgstr[1] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem."
 msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem."

-#: core/validators.py:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -1152,36 +1168,36 @@ msgstr[2] ""
 "Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou "
 "celkem."

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "Ujistěte se, že posílaný soubor je velký nejméně %s bytů."

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "Ujistěte se, že posílaný soubor je velký nejvíce %s bytů."

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr "Formát pro toto pole je špatný."

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr "Toto pole není platné."

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Nemohl jsem získat nic z %s."

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr "URL %(url)s vrátilo neplatnou hlavičku Content-Type '%(contenttype)s'."

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@ -1190,7 +1206,7 @@ msgstr ""
 "Prosíme, zavřete nezavřenou značku %(tag)s z řádky %(line)s. (Řádka začíná s "
 "\"%(start)s\".)"

-#: core/validators.py:461
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@ -1199,7 +1215,7 @@ msgstr ""
 "Nějaký text začínající na řádce %(line)s není povolen v tomto kontextu. "
 "(Řádka začíná s \"%(start)s\".)"

-#: core/validators.py:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@ -1208,7 +1224,7 @@ msgstr ""
 "\"%(attr)s\" na řádce %(line)s je neplatný atribut. (Řádka začíná s \"%"
 "(start)s\".)"

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@ -1217,7 +1233,7 @@ msgstr ""
 "\"<%(tag)s>\" na řádce %(line)s je neplatná značka. (Řádka začíná s \"%"
 "(start)s\".)"

-#: core/validators.py:475
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@ -1226,7 +1242,7 @@ msgstr ""
 "Značce na řádce %(line)s schází jeden nebo více požadovaných atributů. "
 "(Řádka začíná s \"%(start)s\".)"

-#: core/validators.py:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/cy/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cy/LC_MESSAGES/django.mo
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/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-11-11 16:13-0600\n"
+"POT-Creation-Date: 2005-11-13 13:41-0600\n"
 "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
 "Last-Translator: Jason Davies <jason@jasondavies.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@ -393,6 +393,18 @@ msgstr "tudalen fflat"
 msgid "flat pages"
 msgstr "tudalennau fflat"

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Dydd Llun"
@ -686,34 +698,42 @@ msgid "Galician"
 msgstr "Galisieg"

 #: conf/global_settings.py:44
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:45
 msgid "Italian"
 msgstr "Eidaleg"

-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Norwegian"
 msgstr "Norwyeg"

-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Brazilian"
 msgstr "Brasileg"

-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Romanian"
 msgstr ""

-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Russian"
 msgstr "Rwsieg"

-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Slovak"
 msgstr ""

-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Serbian"
 msgstr "Serbeg"

-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Simplified Chinese"
 msgstr "Tsieinëeg Symledig"

@ -830,59 +850,59 @@ msgstr "XML wedi ffurfio'n wael: %s"
 msgid "Invalid URL: %s"
 msgstr "URL annilys: %s"

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "Mae'r URL %s yn gyswllt toredig."

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Rhowch talfyriad dalaith U.S. dilys."

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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] "Gwyliwch eich ceg! Ni chaniateir y gair %s yma."
 msgstr[1] "Gwyliwch eich ceg! Ni chaniateir y geiriau %s yma."

-#: core/validators.py:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Rhaid i'r faes yma cydweddu'r faes '%s'."

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr "Rhowch rhywbeth am un maes o leiaf, os gwelwch yn dda."

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "Llenwch y ddwy faes, neu gadewch nhw'n wag, os gwelwch yn dda."

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "Rhaid roi'r faes yma os mae %(field)s yn %(value)s"

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr "Rhaid roi'r faes yma os mae %(field)s dim yn %(value)s"

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr "Ni chaniateir gwerthau ddyblyg."

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr "Rhowch rhif degol dilys, os gwelwch yn dda."

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -890,7 +910,7 @@ msgid_plural ""
 msgstr[0] "Rhowch rhif degol dilys gyda cyfanswm %s digidau o fwyaf."
 msgstr[1] "Rhowch rhif degol dilys gyda cyfanswm %s digid o fwyaf."

-#: core/validators.py:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -900,37 +920,37 @@ msgstr[0] ""
 msgstr[1] ""
 "Rhowch rif degol dilydd gyda o fwyaf %s lleoedd degol, os gwelwch yn dda."

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "Sicrhewch bod yr ffeil a llwythwyd yn o leiaf %s beit."

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "Sicrhewch bod yr ffeil a llwythwyd yn %s beit o fwyaf."

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr "Mae'r fformat i'r faes yma yn anghywir."

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr "Mae'r faes yma yn annilydd."

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Ni gellir adalw unrhywbeth o %s."

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 "Dychwelodd yr URL %(url)s y pennawd Content-Type annilys '%(contenttype)s'."

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@ -939,7 +959,7 @@ msgstr ""
 "Caewch y tag anghaedig %(tag)s o linell %(line)s. (Linell yn ddechrau â \"%"
 "(start)s\".)"

-#: core/validators.py:461
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@ -948,7 +968,7 @@ msgstr ""
 "Ni chaniateir rhai o'r destun ar linell %(line)s yn y gyd-destun yna. "
 "(Linell yn ddechrau â \"%(start)s\".)"

-#: core/validators.py:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@ -957,7 +977,7 @@ msgstr ""
 "Mae \"%(attr)s\" ar lein %(line)s yn priodoledd annilydd. (Linell yn "
 "ddechrau â \"%(start)s\".)"

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@ -966,7 +986,7 @@ msgstr ""
 "Mae \"<%(tag)s>\" ar lein %(line)s yn tag annilydd. (Linell yn ddechrau â \"%"
 "(start)s\".)"

-#: core/validators.py:475
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@ -975,7 +995,7 @@ msgstr ""
 "Mae tag ar lein %(line)s yn eisiau un new fwy priodoleddau gofynnol. (Linell "
 "yn ddechrau â \"%(start)s\".)"

-#: core/validators.py:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/de/LC_MESSAGES/django.mo
+++ b/django/conf/locale/de/LC_MESSAGES/django.mo
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@ -569,6 +569,18 @@ msgstr "Logeintr
 msgid "All dates"
 msgstr "Alle Tage"

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr "j. N Y"
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr "j. N Y, H:i"
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr "H:i"
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Montag"
@ -942,18 +954,22 @@ msgid "Galician"
 msgstr "Galicisch"

 #: conf/global_settings.py:44
+msgid "Icelandic"
+msgstr "Isländisch"
+
+#: conf/global_settings.py:45
 msgid "Italian"
 msgstr "Italienisch"

-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Norwegian"
 msgstr "Norwegisch"

-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Brazilian"
 msgstr "Brasilianisch"

-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Russian"
 msgstr "Russisch"

@ -1084,61 +1100,61 @@ msgstr "Ung
 msgid "Invalid URL: %s"
 msgstr "Ungültige URL: %s"

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "Die URL %s funktioniert nicht."

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Bitte eine gültige Abkürzung für einen US-Staat eingeben."

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Dieses Feld muss zum Feld '%s' passen."

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr "Bitte mindestens eines der Felder ausfüllen."

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "Bitte entweder beide Felder ausfüllen, oder beide leer lassen."

-#: core/validators.py:277
+#: core/validators.py:281
 #, 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:289
+#: core/validators.py:293
 #, 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:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr "Doppelte Werte sind hier nicht erlaubt."

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Dieser Wert muss eine Potenz von %s sein."

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr "Bitte eine gültige Dezimalzahl eingeben."

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -1146,7 +1162,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:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -1156,39 +1172,39 @@ msgstr[0] ""
 msgstr[1] ""
 "Bitte eine gültige Dezimalzahl mit maximal %s Dezimalstellen eingeben."

-#: core/validators.py:357
+#: core/validators.py:361
 #, 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:358
+#: core/validators.py:362
 #, 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:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr "Das Format für dieses Feld ist falsch."

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr "Dieses Feld ist ungültig."

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Konnte nichts von %s empfangen."

-#: core/validators.py:424
+#: core/validators.py:428
 #, 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:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@ -1197,7 +1213,7 @@ msgstr ""
 "Bitte das ungeschlossene %(tag)s Tag in Zeile %(line)s schließen. Die Zeile "
 "beginnt mit \"%(start)s\"."

-#: core/validators.py:461
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@ -1206,7 +1222,7 @@ msgstr ""
 "In Zeile %(line)s ist Text, der nicht in dem Kontext erlaubt ist. Die Zeile "
 "beginnt mit \"%(start)s\"."

-#: core/validators.py:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@ -1215,7 +1231,7 @@ msgstr ""
 "Das Attribute %(attr)s in Zeile %(line)s ist ungültig. Die Zeile beginnt mit "
 "\"%(start)s\"."

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@ -1224,7 +1240,7 @@ msgstr ""
 "<%(tag)s> in Zeile %(line)s ist ungültig. Die Zeile beginnt mit \"%(start)s"
 "\"."

-#: core/validators.py:475
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@ -1233,7 +1249,7 @@ msgstr ""
 "Ein Tag in Zeile %(line)s hat eines oder mehrere Pflichtattribute nicht. Die "
 "Zeile beginnt mit \"%(start)s\"."

-#: core/validators.py:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/en/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en/LC_MESSAGES/django.mo
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@ -539,6 +539,18 @@ msgstr ""
 msgid "All dates"
 msgstr ""

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr "N j, Y"
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr "N j, Y, P"
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr "P"
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr ""
@ -901,34 +913,42 @@ msgid "Galician"
 msgstr ""

 #: conf/global_settings.py:44
-msgid "Italian"
+msgid "Icelandic"
 msgstr ""

 #: conf/global_settings.py:45
-msgid "Norwegian"
+msgid "Italian"
 msgstr ""

 #: conf/global_settings.py:46
-msgid "Brazilian"
+msgid "Norwegian"
 msgstr ""

 #: conf/global_settings.py:47
-msgid "Romanian"
+msgid "Brazilian"
 msgstr ""

 #: conf/global_settings.py:48
-msgid "Russian"
+msgid "Romanian"
 msgstr ""

 #: conf/global_settings.py:49
-msgid "Slovak"
+msgid "Russian"
 msgstr ""

 #: conf/global_settings.py:50
-msgid "Serbian"
+msgid "Slovak"
 msgstr ""

 #: conf/global_settings.py:51
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:52
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Simplified Chinese"
 msgstr ""

@ -1038,59 +1058,59 @@ msgstr ""
 msgid "Invalid URL: %s"
 msgstr ""

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr ""

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr ""

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr ""

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr ""

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr ""

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr ""

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr ""

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr ""

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr ""

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -1098,7 +1118,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""

-#: core/validators.py:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -1106,71 +1126,71 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr ""

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr ""

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr ""

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr ""

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr ""

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
 "\"%(start)s\".)"
 msgstr ""

-#: core/validators.py:461
+#: core/validators.py:465
 #, 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:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""

-#: core/validators.py:475
+#: core/validators.py:479
 #, 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:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@ -564,6 +564,18 @@ msgstr ""
 msgid "All dates"
 msgstr ""

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr ""
@ -931,34 +943,42 @@ msgid "Galician"
 msgstr ""

 #: conf/global_settings.py:44
-msgid "Italian"
+msgid "Icelandic"
 msgstr ""

 #: conf/global_settings.py:45
-msgid "Norwegian"
+msgid "Italian"
 msgstr ""

 #: conf/global_settings.py:46
-msgid "Brazilian"
+msgid "Norwegian"
 msgstr ""

 #: conf/global_settings.py:47
-msgid "Romanian"
+msgid "Brazilian"
 msgstr ""

 #: conf/global_settings.py:48
-msgid "Russian"
+msgid "Romanian"
 msgstr ""

 #: conf/global_settings.py:49
-msgid "Slovak"
+msgid "Russian"
 msgstr ""

 #: conf/global_settings.py:50
-msgid "Serbian"
+msgid "Slovak"
 msgstr ""

 #: conf/global_settings.py:51
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:52
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Simplified Chinese"
 msgstr ""

@ -1070,59 +1090,59 @@ msgstr ""
 msgid "Invalid URL: %s"
 msgstr ""

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr ""

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr ""

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr ""

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr ""

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr ""

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr ""

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr ""

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr ""

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr ""

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -1130,7 +1150,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""

-#: core/validators.py:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -1138,71 +1158,71 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr ""

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr ""

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr ""

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr ""

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr ""

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
 "\"%(start)s\".)"
 msgstr ""

-#: core/validators.py:461
+#: core/validators.py:465
 #, 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:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""

-#: core/validators.py:475
+#: core/validators.py:479
 #, 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:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@ -567,6 +567,18 @@ msgstr "entr
 msgid "All dates"
 msgstr ""

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Lundi"
@ -942,19 +954,23 @@ msgid "Galician"
 msgstr "Galicien"

 #: conf/global_settings.py:44
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:45
 #, fuzzy
 msgid "Italian"
 msgstr "Italien"

-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Norwegian"
 msgstr ""

-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Brazilian"
 msgstr "Brésilien"

-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Russian"
 msgstr "Russe"

@ -1086,59 +1102,59 @@ msgstr "XML mal form
 msgid "Invalid URL: %s"
 msgstr "URL invalide: %s"

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "L'URL %s est un lien cassé."

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Entrez une abréviation d'état américain valide."

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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] "Attention à votre langage,! Le mot %s n'est pas autorisé ici."
 msgstr[1] "Attention à votre langage,! Les mots %s ne sont pas autorisés ici."

-#: core/validators.py:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Ce champ doit correspondre au champ '%s'."

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr "S'il vous plaît, saisissez au moins une valeur dans un des champs."

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "S'il vous plaît, renseignez chaque champ ou laissez les deux vides."

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "Ce champ doit être renseigné si %(field)s vaut %(value)s"

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr "Ce champ doit être renseigné si %(field)s ne vaut pas %(value)s"

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr "Des valeurs identiques ne sont pas autorisées."

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Cette valeur doit être une puissance de %s."

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr "S'il vous plaît, saisissez un nombre décimal valide."

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -1148,7 +1164,7 @@ msgstr[0] ""
 msgstr[1] ""
 "S'il vous plaît, saisissez un nombre décimal valide avec au plus %s chiffres."

-#: core/validators.py:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -1158,32 +1174,32 @@ msgstr[0] ""
 msgstr[1] ""
 "S'il vous plaît, saisissez un nombre décimal valide avec au plus %s décimales"

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr ""
 "Vérifiez que le fichier transféré fait au moins une taille de %s octets."

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr ""
 "Vérifiez que le fichier transféré fait au plus une taille de %s octets."

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr "Le format de ce champ est mauvais."

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr "Ce champ est invalide."

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Impossible de récupérer quoi que ce soit depuis %s."

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
@ -1191,7 +1207,7 @@ msgstr ""
 "L'entête Content-Type '%(contenttype)s', renvoyée par l'url %(url)s n'est "
 "pas valide."

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@ -1200,7 +1216,7 @@ msgstr ""
 "Veuillez fermer le tag %(tag)s de la ligne %(line)s. (La ligne débutant par "
 "\"%(start)s\".)"

-#: core/validators.py:461
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@ -1209,7 +1225,7 @@ msgstr ""
 "Du texte commençant à la ligne %(line)s n'est pas autorisé dans ce contexte. "
 "(Ligne débutant par \"%(start)s\".)"

-#: core/validators.py:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@ -1218,7 +1234,7 @@ msgstr ""
 "\"%(attr)s\" ligne %(line)s n'est pas un attribut valide. (Ligne débutant "
 "par \"%(start)s\".)"

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@ -1227,7 +1243,7 @@ msgstr ""
 "\"<%(tag)s>\" ligne %(line)s n'est pas un tag valide. (Ligne débutant par \"%"
 "(start)s\".)"

-#: core/validators.py:475
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@ -1236,7 +1252,7 @@ msgstr ""
 "Un tag, ou un ou plusieurs attributs, de la ligne %(line)s est manquant. "
 "(Ligne débutant par \"%(start)s\".)"

-#: core/validators.py:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/gl/LC_MESSAGES/django.po
+++ b/django/conf/locale/gl/LC_MESSAGES/django.po
@ -635,6 +635,18 @@ msgstr ""
 msgid "flat pages"
 msgstr ""

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr ""
@ -937,22 +949,26 @@ msgid "Galician"
 msgstr ""

 #: conf/global_settings.py:44
-msgid "Italian"
+msgid "Icelandic"
 msgstr ""

 #: conf/global_settings.py:45
-msgid "Norwegian"
+msgid "Italian"
 msgstr ""

 #: conf/global_settings.py:46
-msgid "Brazilian"
+msgid "Norwegian"
 msgstr ""

 #: conf/global_settings.py:47
-msgid "Romanian"
+msgid "Brazilian"
 msgstr ""

 #: conf/global_settings.py:48
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:49
 msgid "Russian"
 msgstr ""

--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@ -565,6 +565,18 @@ msgstr "voci di log"
 msgid "All dates"
 msgstr ""

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Lunedì"
@ -935,18 +947,22 @@ msgid "Galician"
 msgstr "Galiziano"

 #: conf/global_settings.py:44
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:45
 msgid "Italian"
 msgstr "Italiano"

-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Norwegian"
 msgstr ""

-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Brazilian"
 msgstr "Brasiliano"

-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Russian"
 msgstr "Russo"

@ -1074,59 +1090,59 @@ msgstr "XML malformato: %s"
 msgid "Invalid URL: %s"
 msgstr "URL non valida: %s"

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "L'URL %s è un link rotto."

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Inserire un nome di stato americano abbreviato valido."

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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] "Attenzione! La parola %s non è ammessa qui."
 msgstr[1] "Attenzione! Le parole %s non sono ammesse qui."

-#: core/validators.py:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Questo campo deve corrispondere al campo '%s'."

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr "Inserire almeno un campo."

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "Inserire entrambi i campi o lasciarli entrambi vuoti."

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "Il campo è obbligatorio se %(field)s è %(value)s"

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr "Il campo non può essere valorizzato se %(field)s non è %(value)s"

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr "Non sono ammessi valori duplicati."

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Il valore deve essere una potenza di %s."

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr "Inserire un numero decimale valido."

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -1134,7 +1150,7 @@ msgid_plural ""
 msgstr[0] "Inserire un numero decimale con non più di %s cifre totali."
 msgstr[1] ""

-#: core/validators.py:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -1142,30 +1158,30 @@ msgid_plural ""
 msgstr[0] "Inserire un decimale con non più di %s cifre decimali."
 msgstr[1] ""

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "Verifica che il file inserito sia almeno di %s byte."

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "Verifica che il file inserito sia al massimo %d byte."

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr "Formato del file non valido."

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr "Il campo non è valido."

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Impossibile recuperare alcunchè da %s."

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
@ -1173,7 +1189,7 @@ msgstr ""
 "L'URL %(url)s restituisce un Content-Type header non valido '%(contenttype)"
 "s'."

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@ -1182,7 +1198,7 @@ msgstr ""
 "Il tag %(tag)s alla linea %(line)s non è chiuso. (La linea comincia con \"%"
 "(start)s\".)"

-#: core/validators.py:461
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@ -1191,7 +1207,7 @@ msgstr ""
 "Il testo che comincia a linea %(line)s non e' ammesso in questo contesto. "
 "(La linea comincia con \"%(start)s\".)"

-#: core/validators.py:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@ -1200,7 +1216,7 @@ msgstr ""
 "\"%(attr)s\" alla linea %(line)s è un attributo invalido. (La linea comincia "
 "con \"%(start)s\".)"

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@ -1209,7 +1225,7 @@ msgstr ""
 "\"<%(tag)s>\" alla linea %(line)s tag non valido. (La linea comincia con \"%"
 "(start)s\".)"

-#: core/validators.py:475
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@ -1218,7 +1234,7 @@ msgstr ""
 "Un tag alla linea %(line)s manca di uno o più attributi richiesti. (La linea "
 "comincia con \"%(start)s\".)"

-#: core/validators.py:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/no/LC_MESSAGES/django.po
+++ b/django/conf/locale/no/LC_MESSAGES/django.po
@ -563,6 +563,18 @@ msgstr "logg innlegg"
 msgid "All dates"
 msgstr ""

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Mondag"
@ -936,18 +948,22 @@ msgid "Galician"
 msgstr "Galisisk"

 #: conf/global_settings.py:44
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:45
 msgid "Italian"
 msgstr "Italiensk"

-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Norwegian"
 msgstr "Norsk"

-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Brazilian"
 msgstr "Brasiliansk"

-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Russian"
 msgstr "Russisk"

@ -1076,59 +1092,59 @@ msgstr "Ikke godkjent XML: %s"
 msgid "Invalid URL: %s"
 msgstr "Ikke godkjent internettadresse: %s"

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "Internettadresse fører til en side som ikke virker."

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Skriv inn en godkjent amerikansk stats forkortelse."

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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] "Pass munnen din! Ordet %s er ikke tillatt her."
 msgstr[1] "Pass munnen din! Ordene %s er ikke tillatt her."

-#: core/validators.py:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Dette felte må være det samme som i '%s' feltet."

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr "Vennligst skriv inn noe i minst et felt."

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "Vennligst skriv inn noe i begge felta, eller la dem stå blanke."

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "Dette feltet må bare brukes vist %(field)s er lik %(value)s"

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr "Dette feltet må bare brukes vist %(field)s ikke er lik %(value)s"

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr "Like verdier er ikke tillatt."

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Denne verdien må være 'power' av %s."

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr "Vennligst skriv inn et godkjent desimal tall."

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -1136,7 +1152,7 @@ msgid_plural ""
 msgstr[0] "Skriv inn et desimal tall med maksimum %s total antall tall."
 msgstr[1] "Skriv inn et desimal tall med maksimum %s total antall tall."

-#: core/validators.py:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -1144,32 +1160,32 @@ msgid_plural ""
 msgstr[0] "Skriv inn et desimal tall med maksimum %s tall bak komma. "
 msgstr[1] "Skriv inn et desimal tall med maksimum %s tall bak komma. "

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr ""
 "Er du sikker på at fila du prøver å laste opp er minimum %s bytes stor?"

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr ""
 "Er du sikker på at fila du prøver å laste opp er maksimum %s bytes stor?"

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr "Formatet i dette feltet er feil."

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr "Dette feltet er feil."

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Klarte ikke å motta noe fra %s."

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
@ -1177,7 +1193,7 @@ msgstr ""
 "Tnternettadressen %(url)s returnerte en ikke godkjent Content-Type '%"
 "(contenttype)s'."

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@ -1186,7 +1202,7 @@ msgstr ""
 "Vennligst lukk taggen %(tag)s på linje %(line)s. (Linja starer med \"%(start)"
 "s\".)"

-#: core/validators.py:461
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@ -1195,7 +1211,7 @@ msgstr ""
 "Noe av teksten som starter på linje %(line)s er ikke tillatt. (Linja starter "
 "med \"%(start)s\".)"

-#: core/validators.py:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@ -1204,7 +1220,7 @@ msgstr ""
 "\"%(attr)s\" på linje %(line)s er ikke en godkjent tillegg. (Linja starter "
 "med \"%(start)s\".)"

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@ -1213,7 +1229,7 @@ msgstr ""
 "\"<%(tag)s>\" på linje %(line)s er ikke en godkjent tag. (linja starter med "
 "\"%(start)s\".)"

-#: core/validators.py:475
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@ -1222,7 +1238,7 @@ msgstr ""
 "En tag på linje %(line)s mangler en av de påbydte tillegga. (linja starter "
 "med \"%(start)s\".)"

-#: core/validators.py:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
@ -564,6 +564,18 @@ msgstr "entradas de log"
 msgid "All dates"
 msgstr ""

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Segunda Feira"
@ -939,18 +951,22 @@ msgid "Galician"
 msgstr "Galiciano"

 #: conf/global_settings.py:44
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:45
 msgid "Italian"
 msgstr "Italiano"

-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Norwegian"
 msgstr ""

-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Brazilian"
 msgstr "Brazileiro"

-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Russian"
 msgstr "Russo"

@ -1078,59 +1094,59 @@ msgstr "XML mal formado: %s"
 msgid "Invalid URL: %s"
 msgstr "URL inválida: %s"

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "A URL %s é um link quebrado."

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Informe uma abreviação válida de nome de um estado dos EUA."

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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] "Lave sua boca! A palavra %s não é permitida aqui."
 msgstr[1] "Lave sua boca! As palavras %s não são permitidas aqui."

-#: core/validators.py:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Este campo deve ser igual ao campo '%s'."

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr "Informe algo em pelo menos um campo."

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "Informe ambos os campos ou deixe ambos vazios."

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "Este campo deve ser informado se o campo %(field)s for %(value)s."

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr "Este campo deve ser dado se o campo %(field)s não for %(value)s."

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr "Valores duplicados não são permitidos."

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Este valor deve ser uma potência de %s."

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr "Informe um número decimal."

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -1138,7 +1154,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""

-#: core/validators.py:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -1146,30 +1162,30 @@ msgid_plural ""
 msgstr[0] "Informe um número decimal com no máximo %s casa decimal."
 msgstr[1] "Informe um número decimal com no máximo %s casas decimais."

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "Verifique se o arquivo enviado tem pelo menos %s bytes."

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "Verifique se o arquivo enviado tem no máximo %s bytes."

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr "O formato deste campo está errado."

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr "Este campo é inválido."

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Não foi possível receber dados de %s."

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
@ -1177,7 +1193,7 @@ msgstr ""
 "A URL %(url)s retornou um cabeçalho '%(contenttype)s' de Content-Type "
 "inválido."

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@ -1186,7 +1202,7 @@ msgstr ""
 "Por favor, feche a tag %(tag)s na linha %(line)s. (A linha começa com \"%"
 "(start)s\".)"

-#: core/validators.py:461
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@ -1195,7 +1211,7 @@ msgstr ""
 "Algum texto começando na linha %(line)s não é permitido no contexto. (Linha "
 "começa com \"%(start)s\".)"

-#: core/validators.py:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@ -1204,7 +1220,7 @@ msgstr ""
 "\"%(attr)s\" na linha %(line)s não é um atributo válido. (Linha começa com "
 "\"%(start)s\".)"

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@ -1213,7 +1229,7 @@ msgstr ""
 "\"<%(tag)s>\" na linha %(line)s é uma tag inválida. (Linha começa com \"%"
 "(start)s\".)"

-#: core/validators.py:475
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@ -1222,7 +1238,7 @@ msgstr ""
 "Uma tag na linha %(line)s está não apresenta um ou mais atributos exigidos."
 "(Linha começa com \"%(start)s\".)"

-#: core/validators.py:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/ro/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ro/LC_MESSAGES/django.mo
--- a/django/conf/locale/ro/LC_MESSAGES/django.po
+++ b/django/conf/locale/ro/LC_MESSAGES/django.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-11 23:12+0100\n"
+"POT-Creation-Date: 2005-11-13 20:40+0100\n"
 "PO-Revision-Date: 2005-11-08 19:06+GMT+2\n"
 "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@ -395,6 +395,18 @@ msgstr "pagina plată"
 msgid "flat pages"
 msgstr "pagini plate"

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Luni"
@ -688,34 +700,42 @@ msgid "Galician"
 msgstr "Galiciană"

 #: conf/global_settings.py:44
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:45
 msgid "Italian"
 msgstr "Italiană"

-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Norwegian"
 msgstr "Norvegiană"

-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Brazilian"
 msgstr "Braziliană"

-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Romanian"
 msgstr ""

-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Russian"
 msgstr "Rusă"

-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Slovak"
 msgstr ""

-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Serbian"
 msgstr "Sîrbă"

-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Simplified Chinese"
 msgstr "Chineză simplificată"

@ -834,60 +854,60 @@ msgstr "Format XML invalid: %s"
 msgid "Invalid URL: %s"
 msgstr "URL invalid: %s"

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL-ul %s e invalid."

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Introduceţi o abreviere validă în U.S."

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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] "Îngrijiţi-vă limbajul! Cuvîntul %s nu este permis aici."
 msgstr[1] "Îngrijiţi-vă limbajul! Cuvintele %s nu sînt permise aici."

-#: core/validators.py:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr ""

-#: core/validators.py:250
+#: core/validators.py:254
 #, fuzzy
 msgid "Please enter something for at least one field."
 msgstr "Vă rog comletaţi ambele cîmpuri sau lăsaţi-le goale pe ambele."

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "Vă rog comletaţi ambele cîmpuri sau lăsaţi-le goale pe ambele."

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "Acest cîmp e necesar dacă %(field)s este %(value)s"

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr "Acest cîmp e necesar dacă %(field)s nu este %(value)s"

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr "Valorile duplicate nu sînt permise."

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Această valoare trebuie să fie o putere a lui %s."

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr "Vă rog introduceţi un număr zecimal valid."

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -895,7 +915,7 @@ msgid_plural ""
 msgstr[0] "Vă rog introduceţi un număr zecimal valid cu cel mult %s cifră."
 msgstr[1] "Vă rog introduceţi un număr zecimal valid cu cel mult %s cifre."

-#: core/validators.py:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -903,37 +923,37 @@ msgid_plural ""
 msgstr[0] "Vă rog introduceţi un număr zecimal valid cu cel mult %s zecimală."
 msgstr[1] "Vă rog introduceţi un număr zecimal valid cu cel mult %s zecimale."

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "Asigură-te că fişierul încărcact are cel puţin %s octeţi."

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "Asigură-te că fişierul încărcact are cel mult %s octeţi."

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr "Formatul acestui cîmp este invalid."

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr "Cîmpul este invalid."

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Nu pot prelua nimic de la %s."

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 "URL-ul %(url)s a returnat un header Content-Type invalid '%(contenttype)s'."

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@ -942,7 +962,7 @@ msgstr ""
 "Te rog închide tagurile %(tag)s din linia %(line)s. ( Linia începe cu \"%"
 "(start)s\".)"

-#: core/validators.py:461
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@ -951,7 +971,7 @@ msgstr ""
 "Textul începînd cu linia %(line)s nu e permis în acest context. (Linia "
 "începînd cu \"%(start)s\".)"

-#: core/validators.py:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@ -960,7 +980,7 @@ msgstr ""
 "\"%(attr)s\" în linia %(line)s e un atribut invalid. (Linia începînd cu \"%"
 "(start)s\".)"

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@ -969,7 +989,7 @@ msgstr ""
 "\"<%(tag)s>\" în linia %(line)s este un tag invalid. (Linia începe cu \"%"
 "(start)s\"."

-#: core/validators.py:475
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@ -978,7 +998,7 @@ msgstr ""
 "Unui tag din linia %(line)s îi lipseşte unul sau mai multe atribute. (Linia "
 "începe cu \"%(start)s\".)"

-#: core/validators.py:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@ -561,6 +561,18 @@ msgstr ""
 msgid "All dates"
 msgstr ""

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr ""
@ -928,34 +940,42 @@ msgid "Galician"
 msgstr ""

 #: conf/global_settings.py:44
-msgid "Italian"
+msgid "Icelandic"
 msgstr ""

 #: conf/global_settings.py:45
-msgid "Norwegian"
+msgid "Italian"
 msgstr ""

 #: conf/global_settings.py:46
-msgid "Brazilian"
+msgid "Norwegian"
 msgstr ""

 #: conf/global_settings.py:47
-msgid "Romanian"
+msgid "Brazilian"
 msgstr ""

 #: conf/global_settings.py:48
-msgid "Russian"
+msgid "Romanian"
 msgstr ""

 #: conf/global_settings.py:49
-msgid "Slovak"
+msgid "Russian"
 msgstr ""

 #: conf/global_settings.py:50
-msgid "Serbian"
+msgid "Slovak"
 msgstr ""

 #: conf/global_settings.py:51
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:52
+msgid "Swedish"
+msgstr ""
+
+#: conf/global_settings.py:53
 msgid "Simplified Chinese"
 msgstr ""

@ -1067,59 +1087,59 @@ msgstr ""
 msgid "Invalid URL: %s"
 msgstr ""

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr ""

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr ""

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr ""

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr ""

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr ""

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr ""

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr ""

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr ""

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr ""

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -1127,7 +1147,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""

-#: core/validators.py:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -1135,71 +1155,71 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr ""

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr ""

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr ""

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr ""

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr ""

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
 "\"%(start)s\".)"
 msgstr ""

-#: core/validators.py:461
+#: core/validators.py:465
 #, 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:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""

-#: core/validators.py:475
+#: core/validators.py:479
 #, 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:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@ -568,6 +568,18 @@ msgstr "záznamy priebehu"
 msgid "All dates"
 msgstr ""

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Pondelok"
@ -941,18 +953,22 @@ msgid "Galician"
 msgstr "Galicijský"

 #: conf/global_settings.py:44
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:45
 msgid "Italian"
 msgstr "Taliansky"

-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Norwegian"
 msgstr "Nórsky"

-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Brazilian"
 msgstr "Brazílsky"

-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Russian"
 msgstr "Ruský"

@ -1078,60 +1094,60 @@ msgstr "Zle formované XML: %s"
 msgid "Invalid URL: %s"
 msgstr "Neplatný URL %s"

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "Odkaz na URL %s je neplatný."

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Vložte platnú skratku U.S. štátu."

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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] "Vyjadrujte sa slušne! Slovo %s tu nie je dovolené použivať."
 msgstr[1] "Vyjadrujte sa slušne! Slová %s tu nie je dovolené použivať."

-#: core/validators.py:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Toto pole sa musí zhodovať s poľom '%s'. "

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr "Prosím vložte niečo aspoň pre jedno pole."

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "Prosím vložte obidve polia, alebo nechajte ich obe prázdne. "

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "Toto pole musí byť vyplnené tak, že %(field)s obsahuje %(value)s"

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""
 "Toto pole musí byť vyplnené tak, že %(field)s nesmie obsahovať %(value)s"

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr "Duplicitné hodnoty nie sú povolené."

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Táto hodnota musí byť mocninou  %s."

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr "Prosím vložte platné desiatkové číslo. "

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -1139,7 +1155,7 @@ msgid_plural ""
 msgstr[0] "Prosím vložte platné desiatkové číslo s najviac %s číslicou."
 msgstr[1] "Prosím vložte platné desiatkové číslo s najviac %s číslicami."

-#: core/validators.py:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -1149,37 +1165,37 @@ msgstr[0] ""
 msgstr[1] ""
 "Prosím vložte platné desatinné číslo s najviac %s desatinnými miestami."

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "Presvedčte sa, že posielaný súbor nemá menej ako %s bytov."

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "Presvedčte sa, že posielaný súbor nemá viac ako %s bytov."

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr "Formát pre toto pole je chybný."

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr "Toto pole nie je platné."

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Nič som nemohol získať z %s."

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 " URL %(url)s vrátilo neplatnú hlavičku  Content-Type  '%(contenttype)s'."

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@ -1188,7 +1204,7 @@ msgstr ""
 "Prosím zavrite nezavretý  %(tag)s popisovač v riadku %(line)s. (Riadok "
 "začína s  \"%(start)s\".)"

-#: core/validators.py:461
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@ -1197,7 +1213,7 @@ msgstr ""
 "Nejaký text začínajúci na riadku %(line)s nie je povolený v tomto kontexte. "
 "(Riadok začína s \"%(start)s\".)"

-#: core/validators.py:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@ -1206,7 +1222,7 @@ msgstr ""
 "\"%(attr)s\" na riadku %(line)s je neplatný atribút. (Riadok začína s \"%"
 "(start)s\".)"

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@ -1215,7 +1231,7 @@ msgstr ""
 "\"<%(tag)s>\" na riadku %(line)s je neplatný popisovač. (Riadok začína s \"%"
 "(start)s\".)"

-#: core/validators.py:475
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@ -1224,7 +1240,7 @@ msgstr ""
 "Popisovaču na riadku %(line)s chýba jeden alebo viac atribútov. (Riadok "
 "začína s \"%(start)s\".)"

-#: core/validators.py:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/sr/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sr/LC_MESSAGES/django.mo
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@ -251,9 +251,8 @@ msgid "Home"
 msgstr "Početna strana"

 #: contrib/admin/templates/admin/500.html:4
-#, fuzzy
 msgid "Server error"
-msgstr "Greška na serveru (500)"
+msgstr "Greška na serveru"

 #: contrib/admin/templates/admin/500.html:6
 msgid "Server error (500)"
@ -359,7 +358,7 @@ msgid "Log out"
 msgstr "Odjavi se"

 #: contrib/admin/templates/admin/delete_confirmation.html:7
-#, fuzzy, python-format
+#, 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 "
@ -567,6 +566,18 @@ msgstr "unosi u dnevnik izmena"
 msgid "All dates"
 msgstr ""

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr "D, d.m.Y."
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr "d.m.Y. H:i:s"
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr "H:i:s"
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Ponedeljak"
@ -909,7 +920,7 @@ msgstr "Poruka"

 #: conf/global_settings.py:37
 msgid "Bengali"
-msgstr ""
+msgstr "Bengalski"

 #: conf/global_settings.py:37
 msgid "Czech"
@ -917,7 +928,7 @@ msgstr "Češki"

 #: conf/global_settings.py:38
 msgid "Welsh"
-msgstr ""
+msgstr "Welšski"

 #: conf/global_settings.py:39
 msgid "German"
@ -940,18 +951,22 @@ msgid "Galician"
 msgstr ""

 #: conf/global_settings.py:44
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:45
 msgid "Italian"
 msgstr "Italijanski"

-#: conf/global_settings.py:45
-msgid "Norwegian"
-msgstr ""
-
 #: conf/global_settings.py:46
+msgid "Norwegian"
+msgstr "Norveški"
+
+#: conf/global_settings.py:47
 msgid "Brazilian"
 msgstr "Brazilski"

-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Russian"
 msgstr "Ruski"

@ -961,7 +976,7 @@ msgstr "Srpski"

 #: conf/global_settings.py:48
 msgid "Simplified Chinese"
-msgstr ""
+msgstr "Kineski (pojednostavljen)"

 #: conf/global_settings.py:49
 msgid "Slovak"
@ -1080,17 +1095,17 @@ msgstr "Neispravan XML: %s"
 msgid "Invalid URL: %s"
 msgstr "Neispravan URL: %s"

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL %s je neispravan link."

 # nesh: Ni ovo nije interesantno za i18n
-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr ""

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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."
@ -1098,43 +1113,43 @@ msgstr[0] "Pripazi na jezik! %s reč nije ovde dozvoljena."
 msgstr[1] "Pripazi na jezik! %s reči nisu ovde dozvoljene."
 msgstr[2] "Pripazi na jezik! %s reči nisu ovde dozvoljene."

-#: core/validators.py:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Ovo polje mora biti jednako sa poljem '%s'."

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr "Morate popuniti barem jedno polje."

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "Popunite oba polja ili oba ostavite prazna."

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "Ovo polje mora biti uneto ako polje %(field)s ima vrednost %(value)s"

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr "Ovo polje mora biti uneto ako polje %(field)s nema vrednost %(value)s"

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr "Duple vrednosti nisu dozvoljene."

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Vrednost mora biti stepena %s."

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr "Unesite ispravan decimalni broj."

-#: core/validators.py:344
+#: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@ -1143,7 +1158,7 @@ msgstr[0] "Unesite ispravan decimalni broj sa %s cifrom."
 msgstr[1] "Unesite ispravan decimalni broj sa %s cifre."
 msgstr[2] "Unesite ispravan decimalni broj sa %s cifara."

-#: core/validators.py:347
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@ -1152,37 +1167,37 @@ msgstr[0] "Unesite decimalni broj sa najviše %s decimalnim mestom."
 msgstr[1] "Unesite decimalni broj sa najviše %s decimalna mesta."
 msgstr[2] "Unesite decimalni broj sa najviše %s decimalnih mesta."

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "Veličina fajla mora biti najmanje %s bajtova."

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "Veličina fajla mora biti najviše %s bajtova."

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr "Pogrešan format polja."

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr "Neispravno polje."

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Ništa nije moglo da se skine sa URL-a %s."

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 "Sa URL-a %(url)s se vratio pogrešan Content-Type header '%(contenttype)s'."

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@ -1191,7 +1206,7 @@ msgstr ""
 "Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%"
 "(start)s\".)"

-#: core/validators.py:461
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@ -1200,7 +1215,7 @@ msgstr ""
 "Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red "
 "počinje sa \"%(start)s\".)"

-#: core/validators.py:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@ -1209,7 +1224,7 @@ msgstr ""
 "Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(start)"
 "s\".)"

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@ -1217,7 +1232,7 @@ msgid ""
 msgstr ""
 "Tag \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(start)s\".)"

-#: core/validators.py:475
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@ -1226,7 +1241,7 @@ msgstr ""
 "Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%"
 "(start)s\".)"

-#: core/validators.py:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/conf/locale/sv/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sv/LC_MESSAGES/django.mo
--- a/django/conf/locale/sv/LC_MESSAGES/django.po
+++ b/django/conf/locale/sv/LC_MESSAGES/django.po
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@ -561,6 +561,18 @@ msgstr "日志记录"
 msgid "All dates"
 msgstr ""

+#: utils/translation.py:335
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:336
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:337
+msgid "TIME_FORMAT"
+msgstr ""
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "星期一"
@ -925,18 +937,22 @@ msgid "Galician"
 msgstr "加利西亚语"

 #: conf/global_settings.py:44
+msgid "Icelandic"
+msgstr ""
+
+#: conf/global_settings.py:45
 msgid "Italian"
 msgstr "意大利语"

-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Norwegian"
 msgstr "挪威语"

-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Brazilian"
 msgstr "巴西语"

-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Russian"
 msgstr "俄语"

@ -1060,101 +1076,101 @@ msgstr "格式错误的 XML: %s"
 msgid "Invalid URL: %s"
 msgstr "无效 URL: %s"

-#: core/validators.py:203
+#: core/validators.py:205 core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL %s 是一个断开的链接。"

-#: core/validators.py:209
+#: core/validators.py:213
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "输入一个有效的 U.S. 州缩写。"

-#: core/validators.py:224
+#: core/validators.py:228
 #, 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] "看住你的嘴！%s 不允许在这里出现。"

-#: core/validators.py:231
+#: core/validators.py:235
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "这个字段必须与 '%s' 字段相匹配。"

-#: core/validators.py:250
+#: core/validators.py:254
 msgid "Please enter something for at least one field."
 msgstr "请至少在一个字段上输入些什么。"

-#: core/validators.py:259 core/validators.py:270
+#: core/validators.py:263 core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "请要么两个字段都输入或者两个字段都空着。"

-#: core/validators.py:277
+#: core/validators.py:281
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "如果 %(field)s 是 %(value)s 时这个字段必须给出"

-#: core/validators.py:289
+#: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr "如果 %(field)s 不是 %(value)s 时这个字段必须给出"

-#: core/validators.py:308
+#: core/validators.py:312
 msgid "Duplicate values are not allowed."
 msgstr "重复值不允许。"

-#: core/validators.py:331
+#: core/validators.py:335
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "这个值必须是 %s 的乘方。"

-#: core/validators.py:342
+#: core/validators.py:346
 msgid "Please enter a valid decimal number."
 msgstr "请输入一个有效的小数。"

-#: core/validators.py:344
+#: core/validators.py:348
 #, 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] "请输入一个有效的小数，最多 %s 个数字。 "

-#: core/validators.py:347
+#: core/validators.py:351
 #, 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] "请输入一个有效的小数，最多 %s 个小数位。 "

-#: core/validators.py:357
+#: core/validators.py:361
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "请确保你上传的文件至少 %s 字节大。"

-#: core/validators.py:358
+#: core/validators.py:362
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "请确保你上传的文件至多 %s 字节大。"

-#: core/validators.py:371
+#: core/validators.py:375
 msgid "The format for this field is wrong."
 msgstr "这个字段的格式不正确。"

-#: core/validators.py:386
+#: core/validators.py:390
 msgid "This field is invalid."
 msgstr "这个字段无效。"

-#: core/validators.py:421
+#: core/validators.py:425
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "不能从 %s 得到任何东西。"

-#: core/validators.py:424
+#: core/validators.py:428
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr "URL %(url)s 返回了无效的 Content-Type 头 '%(contenttype)s'。"

-#: core/validators.py:457
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@ -1162,7 +1178,7 @@ msgid ""
 msgstr ""
 "请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)"

-#: core/validators.py:461
+#: core/validators.py:465
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@ -1170,7 +1186,7 @@ msgid ""
 msgstr ""
 "在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)"

-#: core/validators.py:466
+#: core/validators.py:470
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@ -1178,7 +1194,7 @@ msgid ""
 msgstr ""
 "在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)"

-#: core/validators.py:471
+#: core/validators.py:475
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@ -1186,7 +1202,7 @@ msgid ""
 msgstr ""
 "在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)"

-#: core/validators.py:475
+#: core/validators.py:479
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@ -1194,7 +1210,7 @@ msgid ""
 msgstr ""
 "在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)"

-#: core/validators.py:480
+#: core/validators.py:484
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
--- a/django/contrib/admin/templatetags/admin_list.py
+++ b/django/contrib/admin/templatetags/admin_list.py
@ -3,8 +3,8 @@ from django.core.template.decorators import simple_tag, inclusion_tag
 from django.contrib.admin.views.main import MAX_SHOW_ALL_ALLOWED, DEFAULT_RESULTS_PER_PAGE, ALL_VAR, \
 ORDER_VAR, ORDER_TYPE_VAR, PAGE_VAR , SEARCH_VAR , IS_POPUP_VAR, EMPTY_CHANGELIST_VALUE, \
 MONTHS
+from django.utils.translation import get_date_formats 

-from django.conf.settings import DATE_FORMAT, TIME_FORMAT, DATETIME_FORMAT

 from django.core import meta
 from django.utils.text import capfirst
@ -175,12 +175,13 @@ def items_for_result(cl, result):
            # Dates and times are special: They're formatted in a certain way.
            elif isinstance(f, meta.DateField) or isinstance(f, meta.TimeField):
                if field_val:
+                    (date_format, datetime_format, time_format) = get_date_formats() 
                    if isinstance(f, meta.DateTimeField):
-                        result_repr = capfirst(dateformat.format(field_val, DATETIME_FORMAT))
+                        result_repr = capfirst(dateformat.format(field_val, datetime_format))
                    elif isinstance(f, meta.TimeField):
-                        result_repr = capfirst(dateformat.time_format(field_val, TIME_FORMAT))
+                        result_repr = capfirst(dateformat.time_format(field_val, time_format))
                    else:
-                        result_repr = capfirst(dateformat.format(field_val, DATE_FORMAT))
+                        result_repr = capfirst(dateformat.format(field_val, date_format))
                else:
                    result_repr = EMPTY_CHANGELIST_VALUE
                row_class = ' class="nowrap"'
--- a/django/contrib/syndication/views.py
+++ b/django/contrib/syndication/views.py
@ -21,6 +21,6 @@ def feed(request, url, feed_dict=None):
    except feeds.FeedDoesNotExist:
        raise Http404, "Invalid feed parameters. Slug %r is valid, but other parameters, or lack thereof, are not." % slug

-    response = HttpResponse(mimetype='application/xml')
+    response = HttpResponse(mimetype=feedgen.mime_type)
    feedgen.write(response, 'utf-8')
    return response
--- a/django/core/db/init.py
+++ b/django/core/db/init.py
@ -36,7 +36,6 @@ get_limit_offset_sql = dbmod.get_limit_offset_sql
 get_random_function_sql = dbmod.get_random_function_sql
 get_table_list = dbmod.get_table_list
 get_relations = dbmod.get_relations
-quote_name = dbmod.quote_name
 OPERATOR_MAPPING = dbmod.OPERATOR_MAPPING
 DATA_TYPES = dbmod.DATA_TYPES
 DATA_TYPES_REVERSE = dbmod.DATA_TYPES_REVERSE
--- a/django/core/db/backends/ado_mssql.py
+++ b/django/core/db/backends/ado_mssql.py
@ -77,6 +77,11 @@ class DatabaseWrapper:
            self.connection.close()
            self.connection = None

+    def quote_name(self, name):
+        if name.startswith('[') and name.endswith(']'):
+            return name # Quoting once is enough.
+        return '[%s]' % name
+
 def get_last_insert_id(cursor, table_name, pk_name):
    cursor.execute("SELECT %s FROM %s WHERE %s = @@IDENTITY" % (pk_name, table_name, pk_name))
    return cursor.fetchone()[0]
@ -110,11 +115,6 @@ def get_table_list(cursor):
 def get_relations(cursor, table_name):
    raise NotImplementedError

-def quote_name(name):
-    if name.startswith('[') and name.endswith(']'):
-        return name # Quoting once is enough.
-    return '[%s]' % name
-
 OPERATOR_MAPPING = {
    'exact': '=',
    'iexact': 'LIKE',
--- a/django/core/db/backends/mysql.py
+++ b/django/core/db/backends/mysql.py
@ -84,6 +84,11 @@ class DatabaseWrapper:
            self.connection.close()
            self.connection = None

+    def quote_name(self, name):
+        if name.startswith("`") and name.endswith("`"):
+            return name # Quoting once is enough.
+        return "`%s`" % name
+
 def get_last_insert_id(cursor, table_name, pk_name):
    cursor.execute("SELECT LAST_INSERT_ID()")
    return cursor.fetchone()[0]
@ -122,11 +127,6 @@ def get_table_list(cursor):
 def get_relations(cursor, table_name):
    raise NotImplementedError

-def quote_name(name):
-    if name.startswith("`") and name.endswith("`"):
-        return name # Quoting once is enough.
-    return "`%s`" % name
-
 OPERATOR_MAPPING = {
    'exact': '=',
    'iexact': 'LIKE',
--- a/django/core/db/backends/postgresql.py
+++ b/django/core/db/backends/postgresql.py
@ -49,6 +49,11 @@ class DatabaseWrapper:
            self.connection.close()
            self.connection = None

+    def quote_name(self, name):
+        if name.startswith('"') and name.endswith('"'):
+            return name # Quoting once is enough.
+        return '"%s"' % name
+
 def dictfetchone(cursor):
    "Returns a row from the cursor as a dict"
    return cursor.dictfetchone()
@ -116,11 +121,6 @@ def get_relations(cursor, table_name):
            continue
    return relations

-def quote_name(name):
-    if name.startswith('"') and name.endswith('"'):
-        return name # Quoting once is enough.
-    return '"%s"' % name
-
 # Register these custom typecasts, because Django expects dates/times to be
 # in Python's native (standard-library) datetime/time format, whereas psycopg
 # use mx.DateTime by default.
--- a/django/core/db/backends/sqlite3.py
+++ b/django/core/db/backends/sqlite3.py
@ -55,6 +55,11 @@ class DatabaseWrapper:
            self.connection.close()
            self.connection = None

+    def quote_name(self, name):
+        if name.startswith('"') and name.endswith('"'):
+            return name # Quoting once is enough.
+        return '"%s"' % name
+
 class SQLiteCursorWrapper(Database.Cursor):
    """
    Django uses "format" style placeholders, but pysqlite2 uses "qmark" style.
@ -124,11 +129,6 @@ def get_table_list(cursor):
 def get_relations(cursor, table_name):
    raise NotImplementedError

-def quote_name(name):
-    if name.startswith('"') and name.endswith('"'):
-        return name # Quoting once is enough.
-    return '"%s"' % name
-
 # Operators and fields ########################################################

 OPERATOR_MAPPING = {
--- a/django/core/template/init.py
+++ b/django/core/template/init.py
@ -455,6 +455,13 @@ class TokenParser:
        else:
            p = i
            while i < len(subject) and subject[i] not in (' ', '\t'):
+                if subject[i] in ('"', "'"):
+                    c = subject[i]
+                    i += 1
+                    while i < len(subject) and subject[i] != c:
+                        i += 1
+                    if i >= len(subject):
+                        raise TemplateSyntaxError, "Searching for value. Unexpected end of string in column %d: %s" % subject
                i += 1
            s = subject[p:i]
            while i < len(subject) and subject[i] in (' ', '\t'):
--- a/django/core/validators.py
+++ b/django/core/validators.py
@ -199,7 +199,11 @@ def isExistingURL(field_data, all_data):
        u = urllib2.urlopen(field_data)
    except ValueError:
        raise ValidationError, _("Invalid URL: %s") % field_data
-    except: # urllib2.HTTPError, urllib2.URLError, httplib.InvalidURL, etc.
+    except urllib2.HTTPError, e:
+        # 401s are valid; they just mean authorization is required.
+        if e.code not in ('401',):
+            raise ValidationError, _("The URL %s is a broken link.") % field_data
+    except: # urllib2.URLError, httplib.InvalidURL, etc.
        raise ValidationError, _("The URL %s is a broken link.") % field_data

 def isValidUSState(field_data, all_data):
--- a/django/parts/auth/anonymoususers.py
+++ b/django/parts/auth/anonymoususers.py
@ -1,4 +1,6 @@
 class AnonymousUser:
+    id = None
+
    def __init__(self):
        pass

--- a/django/utils/feedgenerator.py
+++ b/django/utils/feedgenerator.py
@ -111,6 +111,7 @@ class Enclosure:
        self.url, self.length, self.mime_type = url, length, mime_type

 class RssFeed(SyndicationFeed):
+    mime_type = 'application/rss+xml'
    def write(self, outfile, encoding):
        handler = SimplerXMLGenerator(outfile, encoding)
        handler.startDocument()
@ -176,6 +177,7 @@ class Rss201rev2Feed(RssFeed):

 class Atom1Feed(SyndicationFeed):
    # Spec: http://atompub.org/2005/07/11/draft-ietf-atompub-format-10.html
+    mime_type = 'application/atom+xml'
    ns = u"http://www.w3.org/2005/Atom"
    def write(self, outfile, encoding):
        handler = SimplerXMLGenerator(outfile, encoding)
--- a/django/utils/translation.py
+++ b/django/utils/translation.py
@ -256,7 +256,8 @@ ngettext_lazy = lazy(ngettext, str)
 def check_for_language(lang_code):
    """
    Checks whether there is a global language file for the given language code.
-    This is used to decide whether a user-provided language is available.
+    This is used to decide whether a user-provided language is available. This is
+    only used for language codes from either the cookies or session.
    """
    from django.conf import settings
    globalpath = os.path.join(os.path.dirname(settings.__file__), 'locale')
@ -268,18 +269,21 @@ def check_for_language(lang_code):
 def get_language_from_request(request):
    """
    Analyzes the request to find what language the user wants the system to show.
+    Only languages listed in settings.LANGUAGES are taken into account. If the user
+    requests a sublanguage where we have a main language, we send out the main language.
    """
    global _accepted
    from django.conf import settings
    globalpath = os.path.join(os.path.dirname(settings.__file__), 'locale')
+    supported = dict(settings.LANGUAGES)

    if hasattr(request, 'session'):
        lang_code = request.session.get('django_language', None)
-        if lang_code is not None and check_for_language(lang_code):
+        if lang_code in supported and lang_code is not None and check_for_language(lang_code):
            return lang_code

    lang_code = request.COOKIES.get('django_language', None)
-    if lang_code is not None and check_for_language(lang_code):
+    if lang_code in supported and lang_code is not None and check_for_language(lang_code):
        return lang_code

    accept = request.META.get('HTTP_ACCEPT_LANGUAGE', None)
@ -297,27 +301,48 @@ def get_language_from_request(request):
            else:
                lang = el
                order = 100
-            if lang.find('-') >= 0:
-                (lang, sublang) = lang.split('-')
-                lang = lang.lower() + '_' + sublang.upper()
-            return (lang, order)
+            p = lang.find('-')
+            if p >= 0:
+                mainlang = lang[:p]
+            else:
+                mainlang = lang
+            return (lang, mainlang, order)

        langs = [_parsed(el) for el in accept.split(',')]
-        langs.sort(lambda a,b: -1*cmp(a[1], b[1]))
+        langs.sort(lambda a,b: -1*cmp(a[2], b[2]))

-        for lang, order in langs:
-            langfile = gettext_module.find('django', globalpath, [to_locale(lang)])
-            if langfile:
-                # reconstruct the actual language from the language
-                # filename, because otherwise we might incorrectly
-                # report de_DE if we only have de available, but
-                # did find de_DE because of language normalization
-                lang = langfile[len(globalpath):].split(os.path.sep)[1]
-                _accepted[accept] = lang
-                return lang
+        for lang, mainlang, order in langs:
+            if lang in supported or mainlang in supported:
+                langfile = gettext_module.find('django', globalpath, [to_locale(lang)])
+                if langfile:
+                    # reconstruct the actual language from the language
+                    # filename, because otherwise we might incorrectly
+                    # report de_DE if we only have de available, but
+                    # did find de_DE because of language normalization
+                    lang = langfile[len(globalpath):].split(os.path.sep)[1]
+                    _accepted[accept] = lang
+                    return lang

    return settings.LANGUAGE_CODE

+def get_date_formats():
+    """
+    This function checks whether translation files provide a translation for some
+    technical message ID to store date and time formats. If it doesn't contain
+    one, the formats provided in the settings will be used.
+    """
+    from django.conf.settings import DATE_FORMAT, DATETIME_FORMAT, TIME_FORMAT
+    date_format = _('DATE_FORMAT')
+    datetime_format = _('DATETIME_FORMAT')
+    time_format = _('TIME_FORMAT')
+    if date_format == 'DATE_FORMAT':
+        date_format = DATE_FORMAT
+    if datetime_format == 'DATETIME_FORMAT':
+        datetime_format = DATETIME_FORMAT
+    if time_format == 'TIME_FORMAT':
+        time_format = TIME_FORMAT
+    return (date_format, datetime_format, time_format)
+
 def install():
    """
    Installs the gettext function as the default translation function under
--- a/docs/authentication.txt
+++ b/docs/authentication.txt
@ -172,6 +172,7 @@ Anonymous users
 ``django.parts.auth.anonymoususers.AnonymousUser`` is a class that implements
 the ``django.models.auth.users.User`` interface, with these differences:

+    * ``id`` is always ``None``.
    * ``is_anonymous()`` returns ``True`` instead of ``False``.
    * ``has_perm()`` always returns ``False``.
    * ``set_password()``, ``check_password()``, ``set_groups()`` and
@ -282,6 +283,21 @@ As a shortcut, you can use the convenient ``user_passes_test`` decorator::
 Note that ``user_passes_test`` does not automatically check that the ``User``
 is not anonymous.

+Limiting access to generic views
+--------------------------------
+
+To limit access to a `generic view`_, write a thin wrapper around the view,
+and point your URLconf to your wrapper instead of the generic view itself.
+For example::
+
+    from django.views.generic.date_based import object_detail
+
+    @login_required
+    def limited_object_detail(*args, **kwargs):
+        return object_detail(*args, **kwargs)
+
+.. _generic view: http://www.djangoproject.com/documentation/generic_views/
+
 Permissions
 ===========

@ -415,7 +431,7 @@ Thus, you can check permissions in template ``{% if %}`` statements::
        <p>You don't have permission to do anything in the foo app.</p>
    {% endif %}

-.. _template context: http://www.djangoproject.com/documentation/models/templates_python/
+.. _template context: http://www.djangoproject.com/documentation/templates_python/

 Groups
 ======
@ -458,7 +474,7 @@ a playlist::
        # Create the playlist with the given songs.
        # ...
        request.user.add_message("Your playlist was added successfully.")
-        return render_to_response("playlists/create", context_instance=DjangoContext)
+        return render_to_response("playlists/create", context_instance=DjangoContext(request))

 When you use ``DjangoContext``, the currently logged-in user and his/her
 messages are made available in the `template context`_ as the template variable
--- a/docs/cache.txt
+++ b/docs/cache.txt
@ -101,12 +101,6 @@ Then, add the following three required settings to your Django settings file:
  sites using the same Django installation, set this to the name of the site,
  or some other string that is unique to this Django instance, to prevent key
  collisions. Use an empty string if you don't care.
-* ``CACHE_MIDDLEWARE_GZIP`` -- Either ``True`` or ``False``. If this is
-  enabled, Django will gzip all content for users whose browsers support gzip
-  encoding. Using gzip adds a level of overhead to page requests, but the
-  overhead generally is cancelled out by the fact that gzipped pages are stored
-  in the cache. That means subsequent requests won't have the overhead of
-  zipping, and the cache will hold more pages because each one is smaller.

 The cache middleware caches every page that doesn't have GET or POST
 parameters. Additionally, ``CacheMiddleware`` automatically sets a few headers
--- a/docs/design_philosophies.txt
+++ b/docs/design_philosophies.txt
@ -175,7 +175,9 @@ a common header, footer, navigation bar, etc. The Django template system should
 make it easy to store those elements in a single place, eliminating duplicate
 code.

-This is the philosophy behind template inheritance.
+This is the philosophy behind `template inheritance`_.
+
+.. _template inheritance: http://www.djangoproject.com/documentation/templates/#template-inheritance

 Be decoupled from HTML
 ----------------------
@ -197,7 +199,8 @@ Treat whitespace obviously

 The template system shouldn't do magic things with whitespace. If a template
 includes whitespace, the system should treat the whitespace as it treats text
-- just display it.
+-- just display it. Any whitespace that's not in a template tag should be
+displayed.

 Don't invent a programming language
 -----------------------------------
@ -211,6 +214,18 @@ The goal is not to invent a programming language. The goal is to offer just
 enough programming-esque functionality, such as branching and looping, that is
 essential for making presentation-related decisions.

+The Django template system recognizes that templates are most often written by
+*designers*, not *programmers*, and therefore should not assume Python
+knowledge.
+
+Safety and security
+-------------------
+
+The template system, out of the box, should forbid the inclusion of malicious
+code -- such as commands that delete database records.
+
+This is another reason the template system doesn't allow arbitrary Python code.
+
 Extensibility
 -------------

--- a/docs/i18n.txt
+++ b/docs/i18n.txt
@ -426,6 +426,21 @@ Notes:
      Django uses the base language. For example, if a user specifies ``de-at``
      (Austrian German) but Django only has ``de`` available, Django uses
      ``de``.
+    * Only languages listed in the `LANGUAGES setting`_ can be selected. If
+      you want to restrict the language selection to a subset of provided
+      languages (because your appliaction doesn't provide all those languages),
+      set ``LANGUAGES`` to a list of languages. For example::
+
+          LANGUAGES = (
+            ('de', _('German')),
+            ('en', _('English')),
+          )
+
+      This example restricts languages that are available for automatic
+      selection to German and English (and any sublanguage, like de-ch or
+      en-us).
+
+      .. _LANGUAGES setting: http://www.djangoproject.com/documentation/settings/#languages

 Once ``LocaleMiddleware`` determines the user's preference, it makes this
 preference available as ``request.LANGUAGE_CODE`` for each `request object`_.
--- a/docs/modpython.txt
+++ b/docs/modpython.txt
@ -149,7 +149,7 @@ the ``media`` subdirectory and any URL that ends with ``.jpg``, ``.gif`` or

    <LocationMatch "\.(jpg|gif|png)$">
        SetHandler None
-    </Location>
+    </LocationMatch>


 .. _lighttpd: http://www.lighttpd.net/
--- a/docs/overview.txt
+++ b/docs/overview.txt
@ -288,6 +288,6 @@ features:
 The next obvious steps are for you to `download Django`_, read `the tutorial`_
 and join `the community`_. Thanks for your interest!

-.. _download Django: http://www.djangoproject.com/documentation/
+.. _download Django: http://www.djangoproject.com/download/
 .. _the tutorial: http://www.djangoproject.com/documentation/tutorial1/
 .. _the community: http://www.djangoproject.com/community/
--- a/docs/sessions.txt
+++ b/docs/sessions.txt
@ -92,21 +92,21 @@ posts a comment. It doesn't let a user post a comment more than once::
        request.session['has_commented'] = True
        return HttpResponse('Thanks for your comment!')

-This simplistic view logs a user in::
+This simplistic view logs in a "member" of the site::

    def login(request):
-        u = users.get_object(username__exact=request.POST['username'])
-        if u.check_password(request.POST['password']):
-            request.session['user_id'] = u.id
+        m = members.get_object(username__exact=request.POST['username'])
+        if m.password == request.POST['password']:
+            request.session['member_id'] = m.id
            return HttpResponse("You're logged in.")
        else:
            return HttpResponse("Your username and password didn't match.")

-...And this one logs a user out, according to ``login()`` above::
+...And this one logs a member out, according to ``login()`` above::

    def logout(request):
        try:
-            del request.session['user_id']
+            del request.session['member_id']
        except KeyError:
            pass
        return HttpResponse("You're logged out.")
--- a/docs/settings.txt
+++ b/docs/settings.txt
@ -400,6 +400,39 @@ in standard language format. For example, U.S. English is ``"en-us"``. See the

 .. _internationalization docs: http://www.djangoproject.com/documentation/i18n/

+LANGUAGES
+---------
+
+Default: A tuple of all available languages. Currently, this is::
+
+    LANGUAGES = (
+        ('bn', _('Bengali')),
+        ('cs', _('Czech')),
+        ('cy', _('Welsh')),
+        ('de', _('German')),
+        ('en', _('English')),
+        ('es', _('Spanish')),
+        ('fr', _('French')),
+        ('gl', _('Galician')),
+        ('is', _('Icelandic')),
+        ('it', _('Italian')),
+        ('no', _('Norwegian')),
+        ('pt-br', _('Brazilian')),
+        ('ro', _('Romanian')),
+        ('ru', _('Russian')),
+        ('sk', _('Slovak')),
+        ('sr', _('Serbian')),
+        ('sv', _('Swedish')),
+        ('zh-cn', _('Simplified Chinese')),
+    )
+
+A tuple of two-tuples in the format (language code, language name). This
+specifies which languages are available for language selection. See the
+`internationalization docs`_ for details.
+
+Generally, the default value should suffice. Only set this setting if you want
+to restrict language selection to a subset of the Django-provided languages.
+
 MANAGERS
 --------

--- a/docs/tutorial03.txt
+++ b/docs/tutorial03.txt
@ -211,9 +211,9 @@ filesystem, whose contents Django can access. (Django runs as whatever user
 your server runs.) Don't put them under your document root, though. You
 probably shouldn't make them public, just for security's sake.

-Then edit ``TEMPLATE_DIRS`` in your ``main.py`` settings file to tell Django
-where it can find templates -- just as you did in the "Customize the admin look
-and feel" section of Tutorial 2.
+Then edit ``TEMPLATE_DIRS`` in your settings file (``settings.py``) to tell
+Django where it can find templates -- just as you did in the "Customize the
+admin look and feel" section of Tutorial 2.

 When you've done that, create a directory ``polls`` in your template directory.
 Within that, create a file called ``index.html``. Django requires that