diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index 4cd7bd75c0..f8d4170995 100644
Binary files a/django/conf/locale/bn/LC_MESSAGES/django.mo and b/django/conf/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po
index ec44ce4ceb..ff756466d9 100644
--- a/django/conf/locale/bn/LC_MESSAGES/django.po
+++ b/django/conf/locale/bn/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-19 10:44+0100\n"
+"POT-Creation-Date: 2005-11-23 00:06+0100\n"
 "PO-Revision-Date: 2005-11-12 20:05+0530\n"
 "Last-Translator: Baishampayan Ghose <b.ghose@gnu.org.in>\n"
 "Language-Team: Ankur Bangla <core@bengalinux.org>\n"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "সোমবার"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "নভে."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "কাজের সময়"
@@ -306,7 +352,7 @@ msgstr "কার্যবিবরণী এন্ট্রি"
 msgid "log entries"
 msgstr "কার্যবিবরণী এন্ট্রি সমুহ"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -341,141 +387,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "জ্যাঙ্গো পরিচালনা"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "সোমবার"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "নভে."
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "যোগ করুন"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "পরিবর্তন"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "পরিবর্তন"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "পাসওয়ার্ড পরিবর্তন করুন"
@@ -556,17 +556,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1400,49 +1389,49 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr "সরলীকৃত চীনা"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 #, fuzzy
 msgid "This field is required."
 msgstr "এই ক্ষেত্রেটি অবৈধ।"
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "ছোটহাতের অক্ষর এখানে ঢোকাতে পারবেন না।"
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "একটি গোটা সংখ্যা ঢোকান।"
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "একটি গোটা সংখ্যা ঢোকান।"
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "একটি গোটা সংখ্যা ঢোকান।"
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "এই মানটি শুধু মাত্র অক্ষর, অংক, এবং আন্ডারস্কোর (_) হতে পারবে।"
 
@@ -1724,12 +1713,12 @@ msgstr ""
 "একের চেয়ে বেশি নির্বাচন করতে \"Control\" অথবা ম্যাক-এ \"Command\" চেপে ধরে "
 "রাখুন।"
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "একটি বৈধ ই-মেল ঠিকানা ঢোকান।"
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index a90db6ee30..42d1fa64cc 100644
Binary files a/django/conf/locale/cs/LC_MESSAGES/django.mo and b/django/conf/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po
index b6bcf467a5..c595316209 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Czech translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-19 10:43+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: 2005-11-18 14:33+0100\n"
 "Last-Translator: Radek Svarz <translate@svarz.cz>\n"
 "Language-Team: Czech\n"
@@ -301,6 +301,55 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "Formulář komentáře neobsahoval buď 'preview' nebo 'post'"
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Od %s:</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr "Vše"
+
+#: contrib/admin/filterspecs.py:100
+#, fuzzy
+msgid "Any date"
+msgstr "Všechna data"
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Pondělí"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "List."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr "Neznámé"
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "čas akce"
@@ -329,7 +378,7 @@ msgstr "log záznam"
 msgid "log entries"
 msgstr "log záznamy"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr "Všechna data"
 
@@ -369,145 +418,96 @@ msgstr ""
 msgid "Site administration"
 msgstr "Django správa"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-"<h3>Od %s:</h3>\n"
-"<ul>\n"
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr "Vše"
-
-#: contrib/admin/views/main.py:152
-#, fuzzy
-msgid "Any date"
-msgstr "Všechna data"
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "Pondělí"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "List."
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr "Neznámé"
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr "Vybrat %s"
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr "Vyberte %s pro změnu"
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně přidán."
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr "Můžete to opět upravit níže."
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr "Můžete přidat další %s níže."
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, python-format
 msgid "Add %s"
 msgstr "%s: přidat"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr "Záznam %s byl přidán."
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr "a"
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, python-format
 msgid "Changed %s."
 msgstr "%s: změněno"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr "Záznam %s byl smazán."
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr "Nebyly změněny žádné pole."
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" byl úspěšně změněn."
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "The %(name)s \"%(obj)s\" byl úspěšně přidán. Můžete to opět upravit níže."
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, python-format
 msgid "Change %s"
 msgstr "%s: změnit"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Jedno nebo více %(fieldname)s z %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Jedno nebo více %(fieldname)s z %(name)s:"
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně smazán."
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr "Jste si jist(á)?"
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, python-format
 msgid "Change history: %s"
 msgstr "Historie změn: %s"
@@ -583,19 +583,6 @@ msgstr "Stát US (2 velké znaky)"
 msgid "XML text"
 msgstr "text XML"
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr "Chyba v šabloně"
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-"\n"
-"V šabloně %(name)s, chyba na řádce %(line)s:\n"
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1449,12 +1436,12 @@ msgstr "Švédsky"
 msgid "Simplified Chinese"
 msgstr "Jednoduchá čínština"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 msgid "This field is required."
 msgstr "Toto pole je povinné."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, fuzzy, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
@@ -1462,32 +1449,32 @@ msgstr[0] "Ujistěte se, že Váš text má méně, než %s znaků."
 msgstr[1] "Ujistěte se, že Váš text má méně, než %s znaků."
 msgstr[2] "Ujistěte se, že Váš text má méně, než %s znaků."
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 msgid "Line breaks are not allowed here."
 msgstr "Zalomení řádky zde nenjsou povolená."
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr "Vyberte platnou volbu. '%(data)s' není mezi %(choices)s."
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr "Odevzdaný soubor je prázdný."
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Vložte celé číslo mezi -32,768 a 32,767."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 msgid "Enter a positive number."
 msgstr "Vložte celé kladné číslo."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Vložte celé číslo mezi 0 a 32,767."
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Tato hodnota musí obsahovat pouze znaky, čísla nebo podtržítka."
 
@@ -1778,11 +1765,11 @@ msgstr ""
 "Podržte  \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné "
 "položky."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 msgid "Enter a valid filename."
 msgstr "Vložte platný název souboru."
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
@@ -1793,6 +1780,16 @@ msgstr[1] ""
 msgstr[2] ""
 "Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
 
+#~ msgid "Error in Template"
+#~ msgstr "Chyba v šabloně"
+
+#~ msgid ""
+#~ "\n"
+#~ "In template %(name)s, error at line %(line)s:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "V šabloně %(name)s, chyba na řádce %(line)s:\n"
+
 #, fuzzy
 #~ msgid "count"
 #~ msgstr "počet"
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index 7a295df1c4..99232e2071 100644
Binary files a/django/conf/locale/cy/LC_MESSAGES/django.mo and b/django/conf/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po
index dc29609d2a..1f0c98b412 100644
--- 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-19 10:44+0100\n"
+"POT-Creation-Date: 2005-11-23 00:06+0100\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"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Dydd Llun"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Tach."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "amser gweithred"
@@ -306,7 +352,7 @@ msgstr "cofnod"
 msgid "log entries"
 msgstr "cofnodion"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -341,141 +387,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "Gweinyddiad Django"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "Dydd Llun"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "Tach."
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Ychwanegu"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Newidio"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Newidio"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Newid cyfrinair"
@@ -556,17 +556,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1403,49 +1392,49 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr "Tsieinëeg Symledig"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 #, fuzzy
 msgid "This field is required."
 msgstr "Mae'r faes yma yn annilydd."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Ni chaniateir lythrennau bach yma."
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Rhowch rhif cyfan."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Rhowch rhif cyfan."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Rhowch rhif cyfan."
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Rhaid i'r werth yma cynnwys lythrennau, rhifau ac tanlinellau yn unig."
 
@@ -1732,12 +1721,12 @@ msgid ""
 msgstr ""
 "Gafaelwch lawr \"Control\", neu \"Command\" ar Fac, i ddewis mwy nag un."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Rhowch cyfeiriad e-bost ddilys."
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo
index 856865794c..222fa4af32 100644
Binary files a/django/conf/locale/da/LC_MESSAGES/django.mo and b/django/conf/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po
index 6c5795cc00..1e3b779873 100644
--- a/django/conf/locale/da/LC_MESSAGES/django.po
+++ b/django/conf/locale/da/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-19 10:44+0100\n"
+"POT-Creation-Date: 2005-11-23 00:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Morten Bagai <m@bagai.com>\n"
 "Language-Team: Danish\n"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Mandag"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "handlingstid"
@@ -306,7 +352,7 @@ msgstr "logmeddelelse"
 msgid "log entries"
 msgstr "logmeddelelser"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -341,141 +387,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "Django administration"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "Mandag"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "Nov."
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Tilføj"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Ændre"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Ændre"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Ændre adgangskode"
@@ -556,17 +556,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1407,49 +1396,49 @@ msgstr "Svensk"
 msgid "Simplified Chinese"
 msgstr "Simpel Kinesisk"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 #, fuzzy
 msgid "This field is required."
 msgstr "Dette felt er ugyldigt."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Små bogstaver er ikke tilladt her"
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Indtast et heltal."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Indtast et heltal."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Indtast et heltal."
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Dette felt må kun indeholde bogstaver, tal og understreger."
 
@@ -1732,12 +1721,12 @@ msgid ""
 msgstr ""
 "Hold \"Kontrol\", eller \"Æbletasten\" på Mac, nede for at vælge mere end en."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Indtast en gyldig email-adresse."
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index 63b09f1df4..9e5635e753 100644
Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index 120073e263..54eceb2e9b 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-19 10:43+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: 2005-10-08 00:03+0200\n"
 "Last-Translator: Georg Bauer <gb@bofh.ms>\n"
 "MIME-Version: 1.0\n"
@@ -288,6 +288,52 @@ msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 "Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt"
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Nach %s:</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr "Alle"
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr "Alle Daten"
+
+#: contrib/admin/filterspecs.py:101
+msgid "Today"
+msgstr "Heute"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr "Letzte 7 Tage"
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr "Diesen Monat"
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr "Dieses Jahr"
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr "Ja"
+
+#: contrib/admin/filterspecs.py:134
+msgid "No"
+msgstr "Nein"
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr "Unbekannt"
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "Zeit der Aktion"
@@ -316,7 +362,7 @@ msgstr "Logeintrag"
 msgid "log entries"
 msgstr "Logeintr�ge"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr "Alle Tage"
 
@@ -356,111 +402,65 @@ msgstr ""
 msgid "Site administration"
 msgstr "Website Verwaltung"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-"<h3>Nach %s:</h3>\n"
-"<ul>\n"
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr "Alle"
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr "Alle Daten"
-
-#: contrib/admin/views/main.py:153
-msgid "Today"
-msgstr "Heute"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr "Letzte 7 Tage"
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr "Diesen Monat"
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr "Dieses Jahr"
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr "Ja"
-
-#: contrib/admin/views/main.py:186
-msgid "No"
-msgstr "Nein"
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr "Unbekannt"
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr "%s ausw�hlen"
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr "%s zur �nderung ausw�hlen"
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugef�gt."
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr "Das Element kann jetzt weiter ge�ndert werden."
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr "Jetzt kann ein weiteres Element vom Typ %s angelegt werden."
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, python-format
 msgid "Add %s"
 msgstr "%s zuf�gen"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr "%s hinzugef�gt."
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr "und"
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, python-format
 msgid "Changed %s."
 msgstr "%s ge�ndert"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr "%s gel�scht."
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr "Keine Felder ge�ndert."
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich ge�ndert."
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -468,31 +468,31 @@ msgstr ""
 "%(name)s \"%(obj)s\" wurde erfolgreich zugef�gt. Das Element kann jetzt "
 "ge�ndert werden."
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, python-format
 msgid "Change %s"
 msgstr "%s �ndern"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Ein oder mehrere %(fieldname)s in %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Ein oder mehrere %(fieldname)s in %(name)s:"
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gel�scht."
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr "Sicher? Ganz sicher?"
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, python-format
 msgid "Change history: %s"
 msgstr "�nderungsgeschichte: %s"
@@ -568,19 +568,6 @@ msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)"
 msgid "XML text"
 msgstr "XML Text"
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr "Fehler in der Vorlage"
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-"\n"
-"Fehler in der Vorlage %(name)s, in Zeile %(line)s:\n"
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1432,45 +1419,45 @@ msgstr "Schwedisch"
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 msgid "This field is required."
 msgstr "Dieses Feld ist zwingend."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] "Bitte sicherstellen, das der Text weniger als %s Zeichen hat."
 msgstr[1] "Bitte sicherstellen, das der Text weniger als %s Zeichen hat."
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 msgid "Line breaks are not allowed here."
 msgstr "Zeilenumbr�che sind hier nicht erlaubt."
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 "Bitte eine g�ltige Auswahl treffen; '%(data)s' ist nicht in %(choices)s."
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr "Die ausgew�hlte Datei ist leer."
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Bitte eine ganze Zahl zwischen -32.768 und 32.767 eingeben."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 msgid "Enter a positive number."
 msgstr "Bitte eine ganze, positive Zahl eingeben."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Bitte eine ganze Zahl zwischen 0 und 32.767 eingeben."
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten."
 
@@ -1764,11 +1751,11 @@ msgstr ""
 " Um mehr als eine Selektion zu treffen, \"Strg\", oder auf dem Mac \"Command"
 "\", beim Klicken gedr�ckt halten."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 msgid "Enter a valid filename."
 msgstr "Bitte einen g�ltigen Dateinamen eingeben"
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
@@ -1777,3 +1764,13 @@ msgstr[0] ""
 "Bitte g�ltige IDs f�r %(self)s eingeben. Der Wert %(value)r ist ung�ltig."
 msgstr[1] ""
 "Bitte g�ltige IDs f�r %(self)s eingeben. Die Werte %(value)r sind ung�ltig."
+
+#~ msgid "Error in Template"
+#~ msgstr "Fehler in der Vorlage"
+
+#~ msgid ""
+#~ "\n"
+#~ "In template %(name)s, error at line %(line)s:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Fehler in der Vorlage %(name)s, in Zeile %(line)s:\n"
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index 452f8ce927..7199e536de 100644
Binary files a/django/conf/locale/en/LC_MESSAGES/django.mo and b/django/conf/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index 990297b6a7..3ba0920f30 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/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-19 10:43+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -263,6 +263,50 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "No"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr ""
@@ -291,7 +335,7 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -325,139 +369,95 @@ msgstr ""
 msgid "Site administration"
 msgstr ""
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-msgid "Today"
-msgstr ""
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "No"
-msgstr ""
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, python-format
 msgid "Add %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, python-format
 msgid "Changed %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, python-format
 msgid "Change %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, python-format
 msgid "Change history: %s"
 msgstr ""
@@ -533,17 +533,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1350,44 +1339,44 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 msgid "This field is required."
 msgstr ""
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 msgid "Line breaks are not allowed here."
 msgstr ""
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr ""
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 msgid "Enter a positive number."
 msgstr ""
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 msgid "Enter a whole number between 0 and 32,767."
 msgstr ""
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr ""
 
@@ -1651,11 +1640,11 @@ msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 msgid "Enter a valid filename."
 msgstr ""
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index 98c34f199a..a3613a1dcb 100644
Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index 64fb7b90cf..6794ab5e12 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-19 10:43+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: 2005-10-04 20:59GMT\n"
 "Last-Translator: Ricardo Javier C�rdenes Medina <ricardo.cardenes@gmail."
 "com>\n"
@@ -268,6 +268,50 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "No"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 #, fuzzy
 msgid "action time"
@@ -297,7 +341,7 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -332,139 +376,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "Administraci�n de Django"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-msgid "Today"
-msgstr ""
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "No"
-msgstr ""
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "Cambie para modificar"
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Agregar"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Cambiar clave"
@@ -543,17 +543,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1382,45 +1371,45 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 msgid "This field is required."
 msgstr ""
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 msgid "Line breaks are not allowed here."
 msgstr ""
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr ""
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Direcci�n de correo:"
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 msgid "Enter a whole number between 0 and 32,767."
 msgstr ""
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Este valor debe contener s�lo letras, n�meros y gui�n bajo."
 
@@ -1686,12 +1675,12 @@ msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Direcci�n de correo:"
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 372fb3d103..0cec8eb688 100644
Binary files a/django/conf/locale/fr/LC_MESSAGES/django.mo and b/django/conf/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index ce4b1f3985..bd32c96654 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-19 10:43+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: 2005-10-18 12:27+0200\n"
 "Last-Translator: Laurent Rahuel <laurent.rahuel@gmail.com>\n"
 "Language-Team: fran�ais <fr@li.org>\n"
@@ -277,6 +277,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Lundi"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "heure de l'action"
@@ -305,7 +351,7 @@ msgstr "entr
 msgid "log entries"
 msgstr "entr�es de log"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -340,141 +386,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "Administration de Django"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "Lundi"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "Nov."
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Ajouter"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Modifier"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Modifier"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Modifier votre mot de passe"
@@ -555,17 +555,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1145,6 +1134,39 @@ msgstr "Nov."
 msgid "Dec."
 msgstr "D�c."
 
+#: utils/timesince.py:12
+msgid "year"
+msgid_plural "years"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:13
+#, fuzzy
+msgid "month"
+msgid_plural "months"
+msgstr[0] "contenu"
+msgstr[1] "contenu"
+
+#: utils/timesince.py:14
+#, fuzzy
+msgid "day"
+msgid_plural "days"
+msgstr[0] "Lundi"
+msgstr[1] "Lundi"
+
+#: utils/timesince.py:15
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: utils/timesince.py:16
+#, fuzzy
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "site"
+msgstr[1] "site"
+
 #: models/core.py:7
 msgid "domain name"
 msgstr "nom de domaine"
@@ -1298,14 +1320,10 @@ msgstr "Information personnelle"
 msgid "Important dates"
 msgstr "Dates importantes"
 
-#: models/auth.py:195
+#: models/auth.py:216
 msgid "Message"
 msgstr "Message"
 
-#: conf/global_settings.py:36
-msgid "Bengali"
-msgstr ""
-
 #: conf/global_settings.py:37
 msgid "Bengali"
 msgstr ""
@@ -1324,15 +1342,6 @@ msgid "Danish"
 msgstr "Espagnol"
 
 #: conf/global_settings.py:41
-msgid "Welsh"
-msgstr ""
-
-#: conf/global_settings.py:39
-#, fuzzy
-msgid "Danish"
-msgstr "Espagnol"
-
-#: conf/global_settings.py:40
 msgid "German"
 msgstr "Allemand"
 
@@ -1394,116 +1403,116 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 #, fuzzy
 msgid "This field is required."
 msgstr "Ce champ est invalide."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Les lettres minuscules ne sont pas autoris�es ici."
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Entrez un nombre entier."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Entrez un nombre entier."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Entrez un nombre entier."
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr ""
 "Ce champ ne doit contenir que des lettres, des nombres et des sous-tirets."
 
-#: core/validators.py:63
+#: core/validators.py:66
 msgid "This value must contain only letters, numbers, underscores and slashes."
 msgstr ""
 "Ce champ ne doit contenir que des lettres, des nombres, des sous-tirets et "
 "des '/'."
 
-#: core/validators.py:71
+#: core/validators.py:74
 msgid "Uppercase letters are not allowed here."
 msgstr "Les lettres majuscules ne sont pas autoris�es ici."
 
-#: core/validators.py:75
+#: core/validators.py:78
 msgid "Lowercase letters are not allowed here."
 msgstr "Les lettres minuscules ne sont pas autoris�es ici."
 
-#: core/validators.py:82
+#: core/validators.py:85
 msgid "Enter only digits separated by commas."
 msgstr "Seulement des chiffres ([0-9]), s�par�s par des virgules."
 
-#: core/validators.py:94
+#: core/validators.py:97
 msgid "Enter valid e-mail addresses separated by commas."
 msgstr "Entrez des adresses de courriel valides s�par�es par des virgules."
 
-#: core/validators.py:98
+#: core/validators.py:101
 msgid "Please enter a valid IP address."
 msgstr "Entrez une adresse IP valide."
 
-#: core/validators.py:102
+#: core/validators.py:105
 msgid "Empty values are not allowed here."
 msgstr "Vous ne pouvez pas laisser ce champ vide."
 
-#: core/validators.py:106
+#: core/validators.py:109
 msgid "Non-numeric characters aren't allowed here."
 msgstr "Les caract�res non num�riques ne sont pas autoris�s ici."
 
-#: core/validators.py:110
+#: core/validators.py:113
 msgid "This value can't be comprised solely of digits."
 msgstr "Cette valeur ne peut contenir que des chiffres [0-9]."
 
-#: core/validators.py:115
+#: core/validators.py:118
 msgid "Enter a whole number."
 msgstr "Entrez un nombre entier."
 
-#: core/validators.py:119
+#: core/validators.py:122
 msgid "Only alphabetical characters are allowed here."
 msgstr "Seules les lettres de l'alphabet sont autoris�es ici."
 
-#: core/validators.py:123
+#: core/validators.py:126
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "Entrez une date valide au format AAAA-MM-JJ."
 
-#: core/validators.py:127
+#: core/validators.py:130
 msgid "Enter a valid time in HH:MM format."
 msgstr "Entrez une heure valide au format HH:MM."
 
-#: core/validators.py:131
+#: core/validators.py:134
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
 msgstr "Entrez une date et une heure valide au format AAAA-MM-JJ HH:MM."
 
-#: core/validators.py:135
+#: core/validators.py:138
 msgid "Enter a valid e-mail address."
 msgstr "Entrez une adresse de courriel valide."
 
-#: core/validators.py:147
+#: core/validators.py:150
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -1511,28 +1520,28 @@ msgstr ""
 "Envoyez une image valide. Le fichier que vous avez transfer� n'est pas une "
 "image ou bien est une image corrompue."
 
-#: core/validators.py:154
+#: core/validators.py:157
 #, python-format
 msgid "The URL %s does not point to a valid image."
 msgstr "L'URL %s ne pointe pas vers une image valide."
 
-#: core/validators.py:158
+#: core/validators.py:161
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr ""
 "Les num�ros de t�l�phone doivent �tre au format XX XX XX XX XX. \"%s\" est "
 "incorrect."
 
-#: core/validators.py:166
+#: core/validators.py:169
 #, python-format
 msgid "The URL %s does not point to a valid QuickTime video."
 msgstr "L'URL %s ne pointe pas vers une vid�o QuickTime valide."
 
-#: core/validators.py:170
+#: core/validators.py:173
 msgid "A valid URL is required."
 msgstr "Une URL valide est requise."
 
-#: core/validators.py:184
+#: core/validators.py:187
 #, python-format
 msgid ""
 "Valid HTML is required. Specific errors are:\n"
@@ -1541,69 +1550,69 @@ msgstr ""
 "Du HTML valide est requis. Les erreurs sp�cifiques sont:\n"
 "%s"
 
-#: core/validators.py:191
+#: core/validators.py:194
 #, python-format
 msgid "Badly formed XML: %s"
 msgstr "XML mal form�: %s"
 
-#: core/validators.py:201
+#: core/validators.py:204
 #, python-format
 msgid "Invalid URL: %s"
 msgstr "URL invalide: %s"
 
-#: core/validators.py:205 core/validators.py:207
+#: core/validators.py:208 core/validators.py:210
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "L'URL %s est un lien cass�."
 
-#: core/validators.py:213
+#: core/validators.py:216
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Entrez une abr�viation d'�tat am�ricain valide."
 
-#: core/validators.py:228
+#: core/validators.py:231
 #, 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:235
+#: core/validators.py:238
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Ce champ doit correspondre au champ '%s'."
 
-#: core/validators.py:254
+#: core/validators.py:257
 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:263 core/validators.py:274
+#: core/validators.py:266 core/validators.py:277
 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:281
+#: core/validators.py:284
 #, 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:293
+#: core/validators.py:296
 #, 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:312
+#: core/validators.py:315
 msgid "Duplicate values are not allowed."
 msgstr "Des valeurs identiques ne sont pas autoris�es."
 
-#: core/validators.py:335
+#: core/validators.py:338
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Cette valeur doit �tre une puissance de %s."
 
-#: core/validators.py:346
+#: core/validators.py:349
 msgid "Please enter a valid decimal number."
 msgstr "S'il vous pla�t, saisissez un nombre d�cimal valide."
 
-#: core/validators.py:348
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@@ -1613,7 +1622,7 @@ msgstr[0] ""
 msgstr[1] ""
 "S'il vous pla�t, saisissez un nombre d�cimal valide avec au plus %s chiffres."
 
-#: core/validators.py:351
+#: core/validators.py:354
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@@ -1623,32 +1632,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:361
+#: core/validators.py:364
 #, 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:362
+#: core/validators.py:365
 #, 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:375
+#: core/validators.py:378
 msgid "The format for this field is wrong."
 msgstr "Le format de ce champ est mauvais."
 
-#: core/validators.py:390
+#: core/validators.py:393
 msgid "This field is invalid."
 msgstr "Ce champ est invalide."
 
-#: core/validators.py:425
+#: core/validators.py:428
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Impossible de r�cup�rer quoi que ce soit depuis %s."
 
-#: core/validators.py:428
+#: core/validators.py:431
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
@@ -1656,7 +1665,7 @@ msgstr ""
 "L'ent�te Content-Type '%(contenttype)s', renvoy�e par l'url %(url)s n'est "
 "pas valide."
 
-#: core/validators.py:461
+#: core/validators.py:464
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -1665,7 +1674,7 @@ msgstr ""
 "Veuillez fermer le tag %(tag)s de la ligne %(line)s. (La ligne d�butant par "
 "\"%(start)s\".)"
 
-#: core/validators.py:465
+#: core/validators.py:468
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -1674,7 +1683,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:470
+#: core/validators.py:473
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -1683,7 +1692,7 @@ msgstr ""
 "\"%(attr)s\" ligne %(line)s n'est pas un attribut valide. (Ligne d�butant "
 "par \"%(start)s\".)"
 
-#: core/validators.py:475
+#: core/validators.py:478
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -1692,7 +1701,7 @@ msgstr ""
 "\"<%(tag)s>\" ligne %(line)s n'est pas un tag valide. (Ligne d�butant par \"%"
 "(start)s\".)"
 
-#: core/validators.py:479
+#: core/validators.py:482
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -1701,7 +1710,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:484
+#: core/validators.py:487
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -1731,12 +1740,12 @@ msgstr ""
 "Maintenez \"Control\", or \"Command\" sur un Mac, pour en s�lectionner plus "
 "d'une."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Entrez une adresse de courriel valide."
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
@@ -1744,10 +1753,6 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#, fuzzy
-#~ msgid "count"
-#~ msgstr "contenu"
-
 #~ msgid "Traditional Chinese"
 #~ msgstr "Chinois traditionnel"
 
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index 937a3c4600..3ad4bbae2c 100644
Binary files a/django/conf/locale/gl/LC_MESSAGES/django.mo and b/django/conf/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index 7743b3040b..194e1d167f 100644
--- a/django/conf/locale/gl/LC_MESSAGES/django.po
+++ b/django/conf/locale/gl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-19 10:43+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: 2005-10-16 14:29+0100\n"
 "Last-Translator: Afonso Fernández Nogueira <fonzzo.django@gmail.com>\n"
 "Language-Team: Galego\n"
@@ -268,6 +268,50 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "No"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 #, fuzzy
 msgid "action time"
@@ -297,7 +341,7 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -332,139 +376,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "Administración de Django"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-msgid "Today"
-msgstr ""
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "No"
-msgstr ""
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "Faga clic para modificar"
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Engadir"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Cambiar contrasinal"
@@ -543,17 +543,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1381,45 +1370,45 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 msgid "This field is required."
 msgstr ""
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 msgid "Line breaks are not allowed here."
 msgstr ""
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr ""
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Enderezo de correo electrónico:"
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 msgid "Enter a whole number between 0 and 32,767."
 msgstr ""
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Este valor soamente pode conter letras, números e guións baixos (_)."
 
@@ -1685,12 +1674,12 @@ msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Enderezo de correo electrónico:"
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index 2cd24ca98b..5f9e335d9c 100644
Binary files a/django/conf/locale/is/LC_MESSAGES/django.mo and b/django/conf/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po
index 3de67dbce5..641999b2f9 100644
--- a/django/conf/locale/is/LC_MESSAGES/django.po
+++ b/django/conf/locale/is/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-19 10:44+0100\n"
+"POT-Creation-Date: 2005-11-23 00:06+0100\n"
 "PO-Revision-Date: 2005-11-13 18:08-0000\n"
 "Last-Translator: Dagur Páll Ammendrup <dagurp@gmail.com>\n"
 "Language-Team:  <dagurp@gmail.com>\n"
@@ -280,6 +280,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "mánudagur"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "nóv."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "tími aðgerðar"
@@ -308,7 +354,7 @@ msgstr "kladdafærsla"
 msgid "log entries"
 msgstr "kladdafærslur"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -343,141 +389,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "Django vefstjórn"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "mánudagur"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "nóv."
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Bæta við"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Breyta"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Breyta"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Breyta lykilorði"
@@ -558,17 +558,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1405,49 +1394,49 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr "Einfölduð Kínverska "
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 #, fuzzy
 msgid "This field is required."
 msgstr "Þessi reitur er ótækur."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Lágstafir eru ekki leyfðir hér."
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Settu inn heila tölu."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Settu inn heila tölu."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Settu inn heila tölu."
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Þetta gildi má einungis innihalda stafi, tölur og undirstrik."
 
@@ -1730,12 +1719,12 @@ msgstr ""
 "Haltu niðri \"Control\", eða \"Command\" á Mac til þess að velja fleira en "
 "eitt."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Skrifaðu gilt tölvupóstfang."
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 993e388374..4cec17c1d4 100644
Binary files a/django/conf/locale/it/LC_MESSAGES/django.mo and b/django/conf/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index fa7852f787..1ccbf82105 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-19 10:43+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Luned�"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "data azione"
@@ -306,7 +352,7 @@ msgstr "voce di log"
 msgid "log entries"
 msgstr "voci di log"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -341,141 +387,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "Amministrazione Django"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "Luned�"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "Nov."
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "Clicca per cambiare"
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Aggiungi"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Cambia"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Cambia"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Cambia la password"
@@ -556,17 +556,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1405,49 +1394,49 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 #, fuzzy
 msgid "This field is required."
 msgstr "Il campo non � valido."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Non sono ammesse lettere minuscole."
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Inserire un numero."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Inserire un numero."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Inserire un numero."
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Sono ammesse solo lettere, numeri e sottolineature ('_')."
 
@@ -1730,12 +1719,12 @@ msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr " Premi \"Control\", o \"Command\" su Mac, per selezionarne pi� di uno."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Inserire un indirizzo e-mail valido."
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index b0c214b147..efb1b10e5c 100644
Binary files a/django/conf/locale/no/LC_MESSAGES/django.mo and b/django/conf/locale/no/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index a575178891..77f7f71719 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.po
+++ b/django/conf/locale/no/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-19 10:43+0100\n"
+"POT-Creation-Date: 2005-11-23 00:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n"
 "Language-Team: Norwegian\n"
@@ -292,6 +292,55 @@ msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 "Kommentar skjemaet returnerte ikke et 'forhåndsvisning' eller 'post' objekt"
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Av %s:</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr "Alle"
+
+#: contrib/admin/filterspecs.py:100
+#, fuzzy
+msgid "Any date"
+msgstr "Alle datoer"
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Mondag"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr "Ukjent"
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "tid for handling"
@@ -320,7 +369,7 @@ msgstr "logg notis"
 msgid "log entries"
 msgstr "logg innlegg"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr "Alle datoer"
 
@@ -360,144 +409,95 @@ msgstr "Epost adressen din er ikke brukernavnet ditt, prøv '%s' i stede."
 msgid "Site administration"
 msgstr "Django administrasjon"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-"<h3>Av %s:</h3>\n"
-"<ul>\n"
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr "Alle"
-
-#: contrib/admin/views/main.py:152
-#, fuzzy
-msgid "Any date"
-msgstr "Alle datoer"
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "Mondag"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "Nov."
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr "Ukjent"
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr "Velg %s"
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr "Velg %s for å endre"
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" ble lagt inn i databasen."
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr "Du kan endre under"
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr "Du kan legge til en ny %s under."
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, python-format
 msgid "Add %s"
 msgstr "Ny %s"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr "La til %s"
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr "og"
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, python-format
 msgid "Changed %s."
 msgstr "Endret %s."
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr "Slettet %s."
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr "Ingen felt endret."
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" ble endret."
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" ble endret. Du kan endre det igjen under."
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, python-format
 msgid "Change %s"
 msgstr "Endre %s"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "En eller flere %(fieldname)s i %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "En eller flere %(fieldname)s i %(name)s:"
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" ble slettet."
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Endre historien: %s"
@@ -575,19 +575,6 @@ msgstr "Stat (i USA, to store bokstaver)"
 msgid "XML text"
 msgstr "XML tekst"
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr "Feil i mal"
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-"\n"
-"I mal %(name)s, var det en feil på linje %(line)s:\n"
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1428,44 +1415,44 @@ msgstr "Svensk"
 msgid "Simplified Chinese"
 msgstr "Simplifisert Kinesisk"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 msgid "This field is required."
 msgstr "Dette feltet er påkrevd."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, fuzzy, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] "Sjekk at teksten er kortere enn %s bokstaver"
 msgstr[1] "Sjekk at teksten er kortere enn %s bokstaver"
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 msgid "Line breaks are not allowed here."
 msgstr "Det er ikke tillatt med flere linjer her."
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr "Velg et av valga; '%(data)s' er ikke i %(choices)s."
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr "Filen er tom."
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Skriv inn et heltall mellom -31768 og 32767."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 msgid "Enter a positive number."
 msgstr "Skriv inn et positivt heltall."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Skriv inn et heltall mellom 0 og 32767."
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Dette feltet må bare inneholde bokstaver, nummer og understreker."
 
@@ -1753,15 +1740,25 @@ msgid ""
 msgstr ""
 "Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mere enn en."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Skriv inn en godkjent e-post adresse."
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
 "Please enter valid %(self)s IDs. The values %(value)r are invalid"
 msgstr[0] ""
 msgstr[1] ""
+
+#~ msgid "Error in Template"
+#~ msgstr "Feil i mal"
+
+#~ msgid ""
+#~ "\n"
+#~ "In template %(name)s, error at line %(line)s:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "I mal %(name)s, var det en feil på linje %(line)s:\n"
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index 81164685ab..4655e7be3f 100644
Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index 3f595e71d7..a1c44ead54 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/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-19 10:43+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: 2005-10-11 09:12GMT-3\n"
 "Last-Translator: João Paulo Farias <jpaulofarias@gmail.com>\n"
 "Language-Team: Português do Brasil <pt-br@li.org>\n"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Segunda Feira"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "hora da ação"
@@ -306,7 +352,7 @@ msgstr "entrada de log"
 msgid "log entries"
 msgstr "entradas de log"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -341,141 +387,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "Administração do Django"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "Segunda Feira"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "Nov."
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "Clique para alterar"
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Adicionar"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Alterar senha"
@@ -556,17 +556,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1409,49 +1398,49 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 #, fuzzy
 msgid "This field is required."
 msgstr "Este campo é inválido."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Letras em minúsculo não são permitidas aqui."
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Informe um número inteiro."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Informe um número inteiro."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Informe um número inteiro."
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Deve conter apenas letras, números e sublinhados (_)."
 
@@ -1736,12 +1725,12 @@ msgstr ""
 " Mantenha pressionado \"Control\", ou \"Command\" num Mac para selecionar "
 "mais de uma opção."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Informe um endereço de email válido."
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index 2181b138e4..01c98da1a7 100644
Binary files a/django/conf/locale/ro/LC_MESSAGES/django.mo and b/django/conf/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po
index 097cb0c4b2..bf0ca36809 100644
--- 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-19 10:44+0100\n"
+"POT-Creation-Date: 2005-11-23 00:06+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"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "Luni"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "Noi."
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "timp acţiune"
@@ -306,7 +352,7 @@ msgstr "intrare log"
 msgid "log entries"
 msgstr "intrări log"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -341,141 +387,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "Administrare Django"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "Luni"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "Noi."
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Adaugă"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Schimbă"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Schimbă"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Schimbă parola"
@@ -556,17 +556,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1405,49 +1394,49 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr "Chineză simplificată"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 #, fuzzy
 msgid "This field is required."
 msgstr "Cîmpul este invalid."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Literele mici nu sînt permise aici."
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Introduceţi un număr întreg."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Introduceţi un număr întreg."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Introduceţi un număr întreg."
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr ""
 "Această valoare trebuie să conţină numai litere, numere şi liniuţe de "
@@ -1736,12 +1725,12 @@ msgstr ""
 " Ţine apăsat \"Control\", sau \"Command\" pe un Mac, pentru a selecta mai "
 "multe."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Introduceţi o adresă de email validă."
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 7b5a7d1422..2a59acdee8 100644
Binary files a/django/conf/locale/ru/LC_MESSAGES/django.mo and b/django/conf/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index 2eb0adf32f..921557eddf 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-19 10:43+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: 2005-10-05 00:00\n"
 "Last-Translator: Dmitry Sorokin <ds@@dial.com.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -266,6 +266,50 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+msgid "Today"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "No"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 #, fuzzy
 msgid "action time"
@@ -295,7 +339,7 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -330,139 +374,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "����������������� Django"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-msgid "Today"
-msgstr ""
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "No"
-msgstr ""
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "�������� ��� ���������"
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "��������"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "��������"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "��������"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "��������� ������"
@@ -541,17 +541,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1308,7 +1297,7 @@ msgstr "
 msgid "Important dates"
 msgstr "������ ����"
 
-#: models/auth.py:195
+#: models/auth.py:216
 msgid "Message"
 msgstr "���������"
 
@@ -1329,10 +1318,6 @@ msgid "Danish"
 msgstr ""
 
 #: conf/global_settings.py:41
-msgid "Danish"
-msgstr ""
-
-#: conf/global_settings.py:40
 msgid "German"
 msgstr ""
 
@@ -1392,45 +1377,45 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 msgid "This field is required."
 msgstr ""
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 msgid "Line breaks are not allowed here."
 msgstr ""
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr ""
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "E-mail �����:"
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 msgid "Enter a whole number between 0 and 32,767."
 msgstr ""
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "�������� ����� ��������� ������ �����, ����� � �������������."
 
@@ -1542,59 +1527,59 @@ msgstr "
 msgid "Invalid URL: %s"
 msgstr "�������� URL: %s"
 
-#: core/validators.py:205 core/validators.py:207
+#: core/validators.py:208 core/validators.py:210
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL %s ��������� �������."
 
-#: core/validators.py:213
+#: core/validators.py:216
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "������� �������� ����������� ������ ���."
 
-#: core/validators.py:228
+#: core/validators.py:231
 #, 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:235
+#: core/validators.py:238
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "��� ���� ������ ��������� � '%s' �����."
 
-#: core/validators.py:254
+#: core/validators.py:257
 msgid "Please enter something for at least one field."
 msgstr "����������, ���������� ���� �� ���� ����."
 
-#: core/validators.py:263 core/validators.py:274
+#: core/validators.py:266 core/validators.py:277
 msgid "Please enter both fields or leave them both empty."
 msgstr "����������, ��������� ��� ���� ���� ������� �� �������."
 
-#: core/validators.py:281
+#: core/validators.py:284
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr ""
 
-#: core/validators.py:293
+#: core/validators.py:296
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""
 
-#: core/validators.py:312
+#: core/validators.py:315
 msgid "Duplicate values are not allowed."
 msgstr "������� �������� ����������."
 
-#: core/validators.py:335
+#: core/validators.py:338
 #, python-format
 msgid "This value must be a power of %s."
 msgstr ""
 
-#: core/validators.py:346
+#: core/validators.py:349
 msgid "Please enter a valid decimal number."
 msgstr "����������, ������� ���������� ���������� �����."
 
-#: core/validators.py:348
+#: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@@ -1606,7 +1591,7 @@ msgstr[1] ""
 "����������, ������� ���������� ���������� ����� � ������������ ����������� "
 "������ %s."
 
-#: core/validators.py:351
+#: core/validators.py:354
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@@ -1618,71 +1603,71 @@ msgstr[1] ""
 "����������, ������� ���������� ���������� ����� � ������������ ����������� "
 "������ ����� ������� %s."
 
-#: core/validators.py:361
+#: core/validators.py:364
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr "����� �������, ��� ����������� ���� �� ������� ���� �� ������ %s ����."
 
-#: core/validators.py:362
+#: core/validators.py:365
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr "����� �������, ��� ����������� ���� ������ ��� %s ����."
 
-#: core/validators.py:375
+#: core/validators.py:378
 msgid "The format for this field is wrong."
 msgstr "������ ����� ���� �������"
 
-#: core/validators.py:390
+#: core/validators.py:393
 msgid "This field is invalid."
 msgstr "��� ���� �������."
 
-#: core/validators.py:425
+#: core/validators.py:428
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "���������� �������� ��� ���� � %s."
 
-#: core/validators.py:428
+#: core/validators.py:431
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr "URL %(url) ������ ������� ��������� Content-Type '%(contenttype)'."
 
-#: core/validators.py:461
+#: core/validators.py:464
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
 "\"%(start)s\".)"
 msgstr ""
 
-#: core/validators.py:465
+#: core/validators.py:468
 #, 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:470
+#: core/validators.py:473
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""
 
-#: core/validators.py:475
+#: core/validators.py:478
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""
 
-#: core/validators.py:479
+#: core/validators.py:482
 #, 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:484
+#: core/validators.py:487
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -1710,12 +1695,12 @@ msgstr ""
 " ����������� \"Control\", ��� \"Command\" �� ��������, ��� ������ ������ ��� "
 "������."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "E-mail �����:"
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 660aebd795..d7a59b6de2 100644
Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index bb6a9a6fb8..0b36314088 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/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-20 17:02-0500\n"
+"POT-Creation-Date: 2005-11-23 00:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Vladimir Labath <vlado@labath.org>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,37 +16,6 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/redirects/models/redirects.py:7
-msgid "redirect from"
-msgstr "presmerovaný z"
-
-#: contrib/redirects/models/redirects.py:8
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'."
-
-#: contrib/redirects/models/redirects.py:9
-msgid "redirect to"
-msgstr "presmerovaný na "
-
-#: contrib/redirects/models/redirects.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Tu môže byť buď absolútna cesta (ako hore) alebo plné  URL začínajúce s "
-"'http://'."
-
-#: contrib/redirects/models/redirects.py:12
-msgid "redirect"
-msgstr "presmerovanie"
-
-#: contrib/redirects/models/redirects.py:13
-msgid "redirects"
-msgstr "presmerovania"
-
 #: contrib/comments/models/comments.py:8
 #: contrib/comments/models/comments.py:161
 #, fuzzy
@@ -331,59 +300,6 @@ msgstr "Formulár kometára má chybný výstupný parameter -- objectID bol chy
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "Neprišla ani jedna z možných volieb 'preview' alebo 'post'"
 
-#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:284
-msgid "URL"
-msgstr "URL"
-
-#: contrib/flatpages/models/flatpages.py:7
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj "
-"záverečné lomítka."
-
-#: contrib/flatpages/models/flatpages.py:8
-msgid "title"
-msgstr "názov"
-
-#: contrib/flatpages/models/flatpages.py:9
-msgid "content"
-msgstr "obsah"
-
-#: contrib/flatpages/models/flatpages.py:10
-msgid "enable comments"
-msgstr "povolené komentáre"
-
-#: contrib/flatpages/models/flatpages.py:11
-msgid "template name"
-msgstr "meno predlohy"
-
-#: contrib/flatpages/models/flatpages.py:12
-#, fuzzy
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-"Príklad: 'flatfiles/contact_page'. Ak sa toto nevykonalo,  systém použije  "
-"'flatfiles/default'."
-
-#: contrib/flatpages/models/flatpages.py:13
-msgid "registration required"
-msgstr "musíte byť zaregistrovaný"
-
-#: contrib/flatpages/models/flatpages.py:13
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku."
-
-#: contrib/flatpages/models/flatpages.py:17
-msgid "flat page"
-msgstr "plochá stránka"
-
-#: contrib/flatpages/models/flatpages.py:18
-msgid "flat pages"
-msgstr "ploché stránky"
-
 #: contrib/admin/filterspecs.py:32
 #, python-format
 msgid ""
@@ -512,86 +428,86 @@ msgstr "Vyber %s"
 msgid "Select %s to change"
 msgstr "Vyber %s na zmenu"
 
-#: contrib/admin/views/main.py:428
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr " %(name)s \"%(obj)s\" bol úspešne pridaný."
 
-#: contrib/admin/views/main.py:433 contrib/admin/views/main.py:509
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr "Môžete to zmeniť znovu nižšie."
 
-#: contrib/admin/views/main.py:441 contrib/admin/views/main.py:518
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr "Môžete pridať ďalší %s nižšie."
 
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Pridaj"
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr "Pridal %s"
 
-#: contrib/admin/views/main.py:474 contrib/admin/views/main.py:476
-#: contrib/admin/views/main.py:478
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr "a"
 
-#: contrib/admin/views/main.py:476
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Zmenený"
 
-#: contrib/admin/views/main.py:478
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr "Vymazaný"
 
-#: contrib/admin/views/main.py:481
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr "Polia neboli zmenené."
 
-#: contrib/admin/views/main.py:506
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr " %(name)s \"%(obj)s\" bol úspešne zmenený."
 
-#: contrib/admin/views/main.py:515
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 " %(name)s \"%(obj)s\" bol úspešne pridaný. Môžete ho zmeniť zase nižšie."
 
-#: contrib/admin/views/main.py:553
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Zmeň"
 
-#: contrib/admin/views/main.py:633
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Jeden alebo viac %(fieldname)s v %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:638
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "jeden alebo viac %(fieldname)s v %(name)s:"
 
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr " %(name)s \"%(obj)s\" bol úspešne vymazaný."
 
-#: contrib/admin/views/main.py:670
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr "Ste si istý/á?"
 
-#: contrib/admin/views/main.py:685
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Zmena histórie:"
@@ -660,6 +576,10 @@ msgstr "Text"
 msgid "Time"
 msgstr "Čas"
 
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "URL"
+
 #: contrib/admin/views/doc.py:285
 msgid "U.S. state (two uppercase letters)"
 msgstr "U.S. štát (dve veľké písmená)"
@@ -668,11 +588,11 @@ msgstr "U.S. štát (dve veľké písmená)"
 msgid "XML text"
 msgstr "XML text"
 
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/base.html:29
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/logged_out.html:4
@@ -682,6 +602,56 @@ msgstr "XML text"
 msgid "Home"
 msgstr "Začiatok"
 
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Pridaj %(name)s"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Pridaj"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Zmeň"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Nemáte povolenie na zmeny ."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Posledné udalosti"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Moje udalosti"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nepovolené"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Chyba servera"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Chyba servera (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Chyba servera <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Vznikla chyba. Prostredníctvom e-mailu  bol o nej informovaný správca a "
+"chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť."
+
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -719,25 +689,17 @@ msgstr "Django web admin"
 msgid "Django administration"
 msgstr "Spravované Djangom"
 
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Chyba servera"
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Meno užívateľa:"
 
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Chyba servera (500)"
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Heslo:"
 
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Chyba servera <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-"Vznikla chyba. Prostredníctvom e-mailu  bol o nej informovaný správca a "
-"chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť."
+#: contrib/admin/templates/admin/login.html:20
+msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
+msgstr "Zabudli ste<a href=\"/password_reset/\"> vaše heslo</a>?"
 
 #: contrib/admin/templates/admin/404.html:4
 #: contrib/admin/templates/admin/404.html:8
@@ -753,54 +715,23 @@ msgstr ""
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Ľutujeme, ale požadovaná stránka nebola nájdená."
 
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Pridaj"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Pozri tu"
 
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Zmeň"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Prosím opravte chybu, je nižšie"
+msgstr[1] "Prosím opravte chyby, sú nižšie"
 
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Nemáte povolenie na zmeny ."
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Objednávanie"
 
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Posledné udalosti"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Moje udalosti"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nepovolené"
-
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Meno užívateľa:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Heslo:"
-
-#: contrib/admin/templates/admin/login.html:20
-msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
-msgstr "Zabudli ste<a href=\"/password_reset/\"> vaše heslo</a>?"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Vítajte,"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Zmena hesla"
-
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odhlásenie"
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Objednávka:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -826,33 +757,17 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ano, som si istý"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Pridaj %(name)s"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Vítajte,"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr "Podľa %(title)s "
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Zmena hesla"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr "Pozri tu"
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Prosím opravte chybu, je nižšie"
-msgstr[1] "Prosím opravte chyby, sú nižšie"
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr "Objednávanie"
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr "Objednávka:"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odhlásenie"
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -875,6 +790,11 @@ msgstr "Uložiť a pokračovať editovať"
 msgid "Save"
 msgstr "Uložiť"
 
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr "Podľa %(title)s "
+
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
 #: contrib/admin/templates/registration/password_change_form.html:6
@@ -1060,17 +980,85 @@ msgstr "Edituj tento objekt (nové okno)"
 msgid "As above, but opens the admin page in a new window."
 msgstr "Ako hore, ale otvorí admin stránku v novom okne"
 
-#: utils/translation.py:335
-msgid "DATE_FORMAT"
-msgstr "DATUM_FORMAT"
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "presmerovaný z"
 
-#: utils/translation.py:336
-msgid "DATETIME_FORMAT"
-msgstr "DATUMCAS_FORMAT"
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'."
 
-#: utils/translation.py:337
-msgid "TIME_FORMAT"
-msgstr "CAS_FORMAT"
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "presmerovaný na "
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Tu môže byť buď absolútna cesta (ako hore) alebo plné  URL začínajúce s "
+"'http://'."
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "presmerovanie"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "presmerovania"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj "
+"záverečné lomítka."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "názov"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "obsah"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "povolené komentáre"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "meno predlohy"
+
+#: contrib/flatpages/models/flatpages.py:12
+#, fuzzy
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Príklad: 'flatfiles/contact_page'. Ak sa toto nevykonalo,  systém použije  "
+"'flatfiles/default'."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "musíte byť zaregistrovaný"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "plochá stránka"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "ploché stránky"
 
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
@@ -1188,6 +1176,27 @@ msgstr "Nov."
 msgid "Dec."
 msgstr "Dec."
 
+#: utils/timesince.py:12
+#, fuzzy
+msgid "year"
+msgid_plural "years"
+msgstr[0] "Tento rok"
+msgstr[1] "Tento rok"
+
+#: utils/timesince.py:13
+#, fuzzy
+msgid "month"
+msgid_plural "months"
+msgstr[0] "Tento mesiac"
+msgstr[1] "Tento mesiac"
+
+#: utils/timesince.py:14
+#, fuzzy
+msgid "day"
+msgid_plural "days"
+msgstr[0] "Dnes"
+msgstr[1] "Dnes"
+
 #: utils/timesince.py:15
 msgid "hour"
 msgid_plural "hours"
@@ -1306,9 +1315,8 @@ msgid "password"
 msgstr "heslo"
 
 #: models/auth.py:37
-msgid "Use an MD5 hash -- not the raw password."
+msgid "Use '[algo]$[salt]$[hexdigest]"
 msgstr ""
-"Vložte takú hodnotu hesla , ako vám ju vráti MD5, nevkladajte ho priamo. "
 
 #: models/auth.py:38
 msgid "staff status"
@@ -1435,49 +1443,49 @@ msgstr "Švédsky"
 msgid "Simplified Chinese"
 msgstr "Zjednodušená činština "
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 #, fuzzy
 msgid "This field is required."
 msgstr "Toto pole nie je platné."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, fuzzy, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] "Uistite sa, že text je kratší ako %s znakov."
 msgstr[1] "Uistite sa, že text je kratší ako %s znakov."
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Malé písmena tu nie sú povolené."
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr "Určená platná voľba; '%(data)s' sa nenachádza v %(choices)s."
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr "Poslaný súbor je prázdny."
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Vložte celé číslo s hodnotou medzi -32,768 a 32,767."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Vložte celé kladné číslo."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Vložte celé číslo s hodnotou medzi 0 a 32,767."
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Toto môže obsahovať len písmená, číslice a podčiarkovníky."
 
@@ -1763,15 +1771,19 @@ msgstr ""
 " Podržte \"Control\", alebo \"Command\" na  Mac_u, na výber viac ako jednej "
 "položky."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Vložte platné meno súboru."
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
 "Please enter valid %(self)s IDs. The values %(value)r are invalid"
 msgstr[0] "Prosím vložte platné %(self)s IDs. Hodnota %(value)r je chybná"
 msgstr[1] "Prosím vložte platné %(self)s IDs. Hodnoty %(value)r sú chybné"
+
+#~ msgid "Use an MD5 hash -- not the raw password."
+#~ msgstr ""
+#~ "Vložte takú hodnotu hesla , ako vám ju vráti MD5, nevkladajte ho priamo. "
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index 89599854f9..c577f4918a 100644
Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index 868729acfb..1d9cb0a81e 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -2,14 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Serbian (latin) translation v1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-19 10:43+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: 2005-11-20 19:07+0100\n"
 "Last-Translator: Nebojša Đorđević <nesh@studioquattro.co.yu>\n"
-"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail.com>\n"
+"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail."
+"com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Poedit-Language: Serbian\n"
 "X-Poedit-Country: YUGOSLAVIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -75,8 +77,7 @@ msgstr "datum/vreme slanja"
 msgid "is public"
 msgstr "da li je javni"
 
-#: contrib/comments/models/comments.py:26
-#: contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
 msgid "IP address"
 msgstr "IP adresa"
 
@@ -85,8 +86,12 @@ msgid "is removed"
 msgstr "obrisan je"
 
 #: contrib/comments/models/comments.py:27
-msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
-msgstr "Selektujte ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je obrisan\" umesto teksta komentara."
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Selektujte ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je "
+"obrisan\" umesto teksta komentara."
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
@@ -216,29 +221,35 @@ msgstr "Ne možete da glasate sami za sebe"
 
 # nesh: grrrrr, ala je rogobatno
 #: contrib/comments/views/comments.py:25
-msgid "This rating is required because you've entered at least one other rating."
+msgid ""
+"This rating is required because you've entered at least one other rating."
 msgstr "Ovaj rejting je obavezan pošto ste uneli još najmanje jedan rejting."
 
 #: contrib/comments/views/comments.py:109
 #, python-format
 msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
 "\n"
 "%(text)s"
 msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
 "\n"
 "%(text)s"
 msgstr[0] ""
-"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s "
+"komentara:\n"
 "\n"
 "%(text)s"
 msgstr[1] ""
-"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s "
+"komentara:\n"
 "\n"
 "%(text)s"
 msgstr[2] ""
-"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s "
+"komentara:\n"
 "\n"
 "%(text)s"
 
@@ -271,14 +282,63 @@ msgstr "Neko je menjao form za komentare (povreda sigurnosti)"
 
 #: contrib/comments/views/comments.py:204
 #: contrib/comments/views/comments.py:289
-msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
-msgstr "Form komentara ima neispravni 'target' parametar -- ID objekta nije ispravan"
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+"Form komentara ima neispravni 'target' parametar -- ID objekta nije ispravan"
 
 #: contrib/comments/views/comments.py:254
 #: contrib/comments/views/comments.py:318
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "Ovaj komentar nije koristio 'preview' ili 'post'"
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Od %s:</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr "Sve"
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr "Bilo koji datum"
+
+#: contrib/admin/filterspecs.py:101
+msgid "Today"
+msgstr "Danas"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr "Zadnjih sedam dana"
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr "Ovaj mesec"
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr "Ova godina"
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr "Da"
+
+#: contrib/admin/filterspecs.py:134
+msgid "No"
+msgstr "Ne"
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr "Nepoznato"
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "vreme akcije"
@@ -307,7 +367,7 @@ msgstr "unos u dnevnik izmena"
 msgid "log entries"
 msgstr "unosi u dnevnik izmena"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr "Svi datumi"
 
@@ -317,12 +377,20 @@ msgid "Log in"
 msgstr "Prijavi se"
 
 #: contrib/admin/views/decorators.py:56
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
-msgstr "Ponovo se prijavite pošto je vaša sesija istekla. Ne brinite, vaši podaci su sačuvani."
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Ponovo se prijavite pošto je vaša sesija istekla. Ne brinite, vaši podaci su "
+"sačuvani."
 
 #: contrib/admin/views/decorators.py:63
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "Izgleda da vaš browser ne podržava \"cookie\". Uključite ih, ponovo učitajte stranu i pokušajte ponovo."
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Izgleda da vaš browser ne podržava \"cookie\". Uključite ih, ponovo učitajte "
+"stranu i pokušajte ponovo."
 
 #: contrib/admin/views/decorators.py:77
 msgid "Usernames cannot contain the '@' character."
@@ -337,154 +405,102 @@ msgstr "Vaša e-mail adresa nije koriničko ime. Probajte sa '%s'."
 msgid "Site administration"
 msgstr "Administracija sajta"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-"<h3>Od %s:</h3>\n"
-"<ul>\n"
-
-#: contrib/admin/views/main.py:114
-#: contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr "Sve"
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr "Bilo koji datum"
-
-#: contrib/admin/views/main.py:153
-msgid "Today"
-msgstr "Danas"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr "Zadnjih sedam dana"
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr "Ovaj mesec"
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr "Ova godina"
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr "Da"
-
-#: contrib/admin/views/main.py:186
-msgid "No"
-msgstr "Ne"
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr "Nepoznato"
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr "Izaberi %s"
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr "Izaberi %s za izmenu"
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "Uspešno dodat %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:577
-#: contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr "Ispod ga možete ponovo izmeniti."
 
-#: contrib/admin/views/main.py:585
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr "Ispod možete dodati još jedan %s."
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, python-format
 msgid "Add %s"
 msgstr "Dodaj %s"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr "Dodat %s"
 
-#: contrib/admin/views/main.py:618
-#: contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr "i"
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, python-format
 msgid "Changed %s."
 msgstr "Izmenjen %s."
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr "Obrisan %s"
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr "Nijedno polje nije promenjeno."
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "Uspešno izmenjen: %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" je uspešno dodat. Ispod ga možete ponovo menjati."
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, python-format
 msgid "Change %s"
 msgstr "Izmeni %s"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Jedno ili više %(fieldname)s u %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Jedan ili više %(fieldname)s u %(name)s:"
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Uspešno obrisan: %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr "Da li ste sigurni?"
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, python-format
 msgid "Change history: %s"
 msgstr "Istorija izmena: %s"
 
-#: contrib/admin/views/doc.py:262
-#: contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273
-#: contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279
-#: contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
+#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
+#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
 msgid "Integer"
 msgstr "Ceo broj"
 
@@ -513,8 +529,7 @@ msgstr "Datum (sa vremenom)"
 msgid "E-mail address"
 msgstr "E-mail adresa"
 
-#: contrib/admin/views/doc.py:269
-#: contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
 msgid "File path"
 msgstr "Putanja do fajla"
 
@@ -544,8 +559,7 @@ msgstr "Vreme"
 
 # nesh: ovo se valjda ne prevodi
 # petar: ne prevodi se
-#: contrib/admin/views/doc.py:284
-#: contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "URL"
 
@@ -557,19 +571,6 @@ msgstr "U.S. država (dva VELIKA slova)"
 msgid "XML text"
 msgstr "XML tekst"
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr "Greška u templejtu"
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-"\n"
-"U templejtu %(name)s, greška u redu %(line)s:\n"
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -627,8 +628,12 @@ msgid "Server Error <em>(500)</em>"
 msgstr "Greška na serveru <em>(500)</em>"
 
 #: contrib/admin/templates/admin/500.html:10
-msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
-msgstr "Dogodila se greška koja je prijavljena administratorima i biće popravljena uskoro. Hvala Vam na strpljenju."
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Dogodila se greška koja je prijavljena administratorima i biće popravljena "
+"uskoro. Hvala Vam na strpljenju."
 
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
@@ -639,8 +644,7 @@ msgstr "Istorija"
 msgid "Date/time"
 msgstr "Datum/vreme"
 
-#: contrib/admin/templates/admin/object_history.html:19
-#: models/auth.py:47
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
 msgid "User"
 msgstr "Korisnik"
 
@@ -653,8 +657,12 @@ msgid "DATE_WITH_TIME_FULL"
 msgstr "j. N Y, H:i"
 
 #: contrib/admin/templates/admin/object_history.html:36
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
-msgstr "Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem administracije sajta."
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem "
+"administracije sajta."
 
 #: contrib/admin/templates/admin/base_site.html:4
 msgid "Django site admin"
@@ -706,13 +714,22 @@ msgstr "Red:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
-msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "Brisanjem %(object_name)s  '%(object)s' došlo bi do brisanja dodatnih podataka, ali nemate prava da brišete sledeće tipove podataka:"
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Brisanjem %(object_name)s  '%(object)s' došlo bi do brisanja dodatnih "
+"podataka, ali nemate prava da brišete sledeće tipove podataka:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:14
 #, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
-msgstr "Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće obrisani i sledeći pridruženi objekti:"
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće "
+"obrisani i sledeći pridruženi objekti:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:18
 msgid "Yes, I'm sure"
@@ -778,8 +795,12 @@ msgid "Password reset"
 msgstr "Resetovanje lozinke"
 
 #: contrib/admin/templates/registration/password_reset_form.html:12
-msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
-msgstr "Zaboravili ste svoju lozinku? Unesite vašu e-mail adresu i dobićete novu lozinku na dati e-mail."
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"Zaboravili ste svoju lozinku? Unesite vašu e-mail adresu i dobićete novu "
+"lozinku na dati e-mail."
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
@@ -803,12 +824,20 @@ msgid "Password reset successful"
 msgstr "Vaša lozinka je uspešno resetovana"
 
 #: contrib/admin/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "Nova lozinka poslata vam je na zadatu e-mail adresu. E-mail bi trebao da stigne u narednih nekoliko minuta."
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Nova lozinka poslata vam je na zadatu e-mail adresu. E-mail bi trebao da "
+"stigne u narednih nekoliko minuta."
 
 #: contrib/admin/templates/registration/password_change_form.html:12
-msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
-msgstr "Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi provere ispravnosti unosa."
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi "
+"provere ispravnosti unosa."
 
 #: contrib/admin/templates/registration/password_change_form.html:17
 msgid "Old password:"
@@ -880,23 +909,36 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 "\n"
-"<p class=\"help\">Da bi ste instalirali \"bookmarklet\", odvučite link u vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup nekima od strana mora biti sa kompjutera čija je IP adresa označena kao \"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je vaš IP označen kao \"internal\").</p>\n"
+"<p class=\"help\">Da bi ste instalirali \"bookmarklet\", odvučite link u "
+"vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete "
+"da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup "
+"nekima od strana mora biti sa kompjutera čija je IP adresa označena kao "
+"\"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je "
+"vaš IP označen kao \"internal\").</p>\n"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:19
 msgid "Documentation for this page"
 msgstr "Dokumentacija za ovu stranu"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid "Jumps you from any page to the documentation for the view that generates that page."
-msgstr "Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji generiše tu stranu."
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji "
+"generiše tu stranu."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:22
 msgid "Show object ID"
 msgstr "Prikaži ID objekta"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan objekt."
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan "
+"objekt."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:25
 msgid "Edit this object (current window)"
@@ -919,16 +961,24 @@ msgid "redirect from"
 msgstr "redirekcija od"
 
 #: contrib/redirects/models/redirects.py:8
-msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
-msgstr "Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/search/'."
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/"
+"search/'."
 
 #: contrib/redirects/models/redirects.py:9
 msgid "redirect to"
 msgstr "redirekcija na"
 
 #: contrib/redirects/models/redirects.py:10
-msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
-msgstr "Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa 'http://'."
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa "
+"'http://'."
 
 #: contrib/redirects/models/redirects.py:12
 msgid "redirect"
@@ -939,8 +989,11 @@ msgid "redirects"
 msgstr "redirekcije"
 
 #: contrib/flatpages/models/flatpages.py:7
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu crtu."
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu "
+"crtu."
 
 #: contrib/flatpages/models/flatpages.py:8
 msgid "title"
@@ -959,8 +1012,12 @@ msgid "template name"
 msgstr "ime templejta"
 
 #: contrib/flatpages/models/flatpages.py:12
-msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'."
-msgstr "Primer: 'flatpages/contact-page'. Ako nije dato sistem će koristiti flatpages/default'."
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Primer: 'flatpages/contact-page'. Ako nije dato sistem će koristiti "
+"flatpages/default'."
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "registration required"
@@ -968,7 +1025,9 @@ msgstr "samo za registrovane korisnike"
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj strani."
+msgstr ""
+"Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj "
+"strani."
 
 #: contrib/flatpages/models/flatpages.py:17
 msgid "flat page"
@@ -1026,28 +1085,23 @@ msgstr "Januar"
 msgid "February"
 msgstr "Februar"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "March"
 msgstr "Mart"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "April"
 msgstr "April"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "May"
 msgstr "Maj"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "June"
 msgstr "Jun"
 
-#: utils/dates.py:15
-#: utils/dates.py:27
+#: utils/dates.py:15 utils/dates.py:27
 msgid "July"
 msgstr "Jul"
 
@@ -1156,10 +1210,7 @@ msgstr "sajtovi"
 msgid "label"
 msgstr "labela"
 
-#: models/core.py:29
-#: models/core.py:40
-#: models/auth.py:6
-#: models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
 msgid "name"
 msgstr "ime"
 
@@ -1211,8 +1262,7 @@ msgstr "kodno ime"
 msgid "Permission"
 msgstr "Pravo"
 
-#: models/auth.py:11
-#: models/auth.py:58
+#: models/auth.py:11 models/auth.py:58
 msgid "Permissions"
 msgstr "Prava"
 
@@ -1220,8 +1270,7 @@ msgstr "Prava"
 msgid "Group"
 msgstr "Grupa"
 
-#: models/auth.py:23
-#: models/auth.py:60
+#: models/auth.py:23 models/auth.py:60
 msgid "Groups"
 msgstr "Grupe"
 
@@ -1274,8 +1323,11 @@ msgid "date joined"
 msgstr "datum otvaranja naloga"
 
 #: models/auth.py:44
-msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
-msgstr "Uz ručno dodata prava, korisnik će dobiti sva prava iz grupa kojima pripada."
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Uz ručno dodata prava, korisnik će dobiti sva prava iz grupa kojima pripada."
 
 #: models/auth.py:48
 msgid "Users"
@@ -1369,14 +1421,12 @@ msgstr "Švedski"
 msgid "Simplified Chinese"
 msgstr "Kineski (pojednostavljen)"
 
-#: core/formfields.py:59
-#: core/meta/fields.py:287
-#: core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 msgid "This field is required."
 msgstr "Obavezno polje."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
@@ -1384,30 +1434,28 @@ msgstr[0] "Tekst mora imati manje od %s karaktera."
 msgstr[1] "Tekst mora imati manje od %s karaktera."
 msgstr[2] "Tekst mora imati manje od %s karaktera."
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 msgid "Line breaks are not allowed here."
 msgstr "Novi redovi ovde nisu dozvoljeni."
 
-#: core/formfields.py:439
-#: core/formfields.py:510
-#: core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr "Izaberite validnu opciju: '%(data)s' nije u %(choices)s."
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr "Poslati fajl je prazan."
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Unesite celi broj između -32,768 i 32,767."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 msgid "Enter a positive number."
 msgstr "Unesite pozitivan broj."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Unesite celi broj između 0 i 32,767."
 
@@ -1418,7 +1466,8 @@ msgstr "Ovo polje može sadržati samo slova, brojeve i donju crtu (_)."
 
 #: core/validators.py:66
 msgid "This value must contain only letters, numbers, underscores and slashes."
-msgstr "Ovo polje može sadržati samo slova, brojeve, donju crtu (_) i kose crte."
+msgstr ""
+"Ovo polje može sadržati samo slova, brojeve, donju crtu (_) i kose crte."
 
 #: core/validators.py:74
 msgid "Uppercase letters are not allowed here."
@@ -1477,8 +1526,12 @@ msgid "Enter a valid e-mail address."
 msgstr "Unesite ispravnu e-mail adresu."
 
 #: core/validators.py:150
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Pošaljite ispravnu sliku. Fajl koji ste poslali ili nije slika ili je sam fajl oštećen."
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Pošaljite ispravnu sliku. Fajl koji ste poslali ili nije slika ili je sam "
+"fajl oštećen."
 
 #: core/validators.py:157
 #, python-format
@@ -1489,7 +1542,8 @@ msgstr "URL %s ne pokazuje na ispravnu sliku"
 #: core/validators.py:161
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan."
+msgstr ""
+"Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan."
 
 #: core/validators.py:169
 #, python-format
@@ -1519,8 +1573,7 @@ msgstr "Neispravan XML: %s"
 msgid "Invalid URL: %s"
 msgstr "Neispravan URL: %s"
 
-#: core/validators.py:205
-#: core/validators.py:207
+#: core/validators.py:208 core/validators.py:210
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL %s je neispravan link."
@@ -1547,8 +1600,7 @@ msgstr "Ovo polje mora biti jednako sa poljem '%s'."
 msgid "Please enter something for at least one field."
 msgstr "Morate popuniti barem jedno polje."
 
-#: core/validators.py:263
-#: core/validators.py:274
+#: core/validators.py:266 core/validators.py:277
 msgid "Please enter both fields or leave them both empty."
 msgstr "Popunite oba polja ili oba ostavite prazna."
 
@@ -1578,7 +1630,8 @@ msgstr "Unesite ispravan decimalni broj."
 #: core/validators.py:351
 #, 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."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
 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."
@@ -1586,7 +1639,8 @@ msgstr[2] "Unesite ispravan decimalni broj sa %s cifara."
 #: core/validators.py:354
 #, 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."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
 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."
@@ -1616,38 +1670,63 @@ msgstr "Ništa nije moglo da se skine sa URL-a %s."
 
 #: core/validators.py:431
 #, 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'."
+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:464
 #, python-format
-msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
-msgstr "Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%"
+"(start)s\".)"
 
 #: core/validators.py:468
 #, python-format
-msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
-msgstr "Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red "
+"počinje sa \"%(start)s\".)"
 
 #: core/validators.py:473
 #, python-format
-msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
-msgstr "Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(start)"
+"s\".)"
 
 #: core/validators.py:478
 #, python-format
-msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
-msgstr "Tag \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(start)s\".)"
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"Tag \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(start)s\".)"
 
 #: core/validators.py:482
 #, python-format
-msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
-msgstr "Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%"
+"(start)s\".)"
 
 #: core/validators.py:487
 #, python-format
-msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
-msgstr "Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje "
+"sa \"%(start)s\".)"
 
 #: core/meta/fields.py:46
 #, python-format
@@ -1664,22 +1743,35 @@ msgid " Separate multiple IDs with commas."
 msgstr " Odvojite višestruke ID-ove zarezima."
 
 #: core/meta/fields.py:134
-msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr " Koristite \"Ctrl\" (PC) ili \"Jabuku\" (Mek) da bi ste selektovali više stavki."
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+" Koristite \"Ctrl\" (PC) ili \"Jabuku\" (Mek) da bi ste selektovali više "
+"stavki."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 msgid "Enter a valid filename."
 msgstr "Unesite ispravno ime fajla."
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid"
 msgstr[0] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
 msgstr[1] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
 msgstr[2] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
 
+#~ msgid "Error in Template"
+#~ msgstr "Greška u templejtu"
+
+#~ msgid ""
+#~ "\n"
+#~ "In template %(name)s, error at line %(line)s:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "U templejtu %(name)s, greška u redu %(line)s:\n"
+
 #, fuzzy
 #~ msgid "count"
 #~ msgstr "sadržaj"
-
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo
index ca8c526929..3a9be99f22 100644
Binary files a/django/conf/locale/sv/LC_MESSAGES/django.mo and b/django/conf/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po
index 5b4851849b..ae3c42826b 100644
--- a/django/conf/locale/sv/LC_MESSAGES/django.po
+++ b/django/conf/locale/sv/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-19 10:44+0100\n"
+"POT-Creation-Date: 2005-11-23 00:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -278,6 +278,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "måndag"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "nov"
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "tid för händelse"
@@ -306,7 +352,7 @@ msgstr "loggpost"
 msgid "log entries"
 msgstr "loggpost"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -341,141 +387,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "Administration för Django"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "måndag"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "nov"
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Lägg till"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Ändra"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Ändra"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Ändra lösenord"
@@ -556,17 +556,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1406,49 +1395,49 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr "Förenklad kinesiska"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 #, fuzzy
 msgid "This field is required."
 msgstr "Det här fältet är ogiltigt."
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Små bokstäver är inte tillåtna här."
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Fyll i ett heltal."
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Fyll i ett heltal."
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Fyll i ett heltal."
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "Det här värdet får bara innehålla bokstäver, tal och understräck."
 
@@ -1734,12 +1723,12 @@ msgid ""
 msgstr ""
 " Håll ner \"Control\", eller \"Command\" på en Mac, för att välja mer än en."
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Fyll i en giltig e-postadress."
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index aecf32eb69..669bc72cea 100644
Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index 287ba7251e..fd108e2492 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django v1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-19 10:42+0100\n"
+"POT-Creation-Date: 2005-11-23 00:05+0100\n"
 "PO-Revision-Date: 2005-11-16 12:55+0800\n"
 "Last-Translator: limodou <limodou@gmail.com>\n"
 "Language-Team: Simplified Chinese <limodou@gmail.com>\n"
@@ -280,6 +280,52 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
+#: contrib/admin/filterspecs.py:32
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
+#: contrib/admin/filterspecs.py:134
+msgid "All"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:100
+msgid "Any date"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:101
+#, fuzzy
+msgid "Today"
+msgstr "星期一"
+
+#: contrib/admin/filterspecs.py:104
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:106
+msgid "This month"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:108
+msgid "This year"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:134
+#, fuzzy
+msgid "No"
+msgstr "十一月"
+
+#: contrib/admin/filterspecs.py:142
+msgid "Unknown"
+msgstr ""
+
 #: contrib/admin/models/admin.py:6
 msgid "action time"
 msgstr "动作时间"
@@ -308,7 +354,7 @@ msgstr "日志记录"
 msgid "log entries"
 msgstr "日志记录"
 
-#: contrib/admin/templatetags/admin_list.py:283
+#: contrib/admin/templatetags/admin_list.py:244
 msgid "All dates"
 msgstr ""
 
@@ -343,141 +389,95 @@ msgstr ""
 msgid "Site administration"
 msgstr "Django管理员"
 
-#: contrib/admin/views/main.py:84
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-
-#: contrib/admin/views/main.py:114 contrib/admin/views/main.py:131
-#: contrib/admin/views/main.py:186
-msgid "All"
-msgstr ""
-
-#: contrib/admin/views/main.py:152
-msgid "Any date"
-msgstr ""
-
-#: contrib/admin/views/main.py:153
-#, fuzzy
-msgid "Today"
-msgstr "星期一"
-
-#: contrib/admin/views/main.py:156
-msgid "Past 7 days"
-msgstr ""
-
-#: contrib/admin/views/main.py:158
-msgid "This month"
-msgstr ""
-
-#: contrib/admin/views/main.py:160
-msgid "This year"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-msgid "Yes"
-msgstr ""
-
-#: contrib/admin/views/main.py:186
-#, fuzzy
-msgid "No"
-msgstr "十一月"
-
-#: contrib/admin/views/main.py:194
-msgid "Unknown"
-msgstr ""
-
-#: contrib/admin/views/main.py:208
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:209
+#: contrib/admin/views/main.py:66
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:572
+#: contrib/admin/views/main.py:421
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:577 contrib/admin/views/main.py:653
+#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:585 contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:602
+#: contrib/admin/views/main.py:451
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "增加"
 
-#: contrib/admin/views/main.py:618
+#: contrib/admin/views/main.py:467
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:618 contrib/admin/views/main.py:620
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:471
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:469
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "修改"
 
-#: contrib/admin/views/main.py:622
+#: contrib/admin/views/main.py:471
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:625
+#: contrib/admin/views/main.py:474
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:650
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:659
+#: contrib/admin/views/main.py:508
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:697
+#: contrib/admin/views/main.py:546
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "修改"
 
-#: contrib/admin/views/main.py:777
+#: contrib/admin/views/main.py:626
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:782
+#: contrib/admin/views/main.py:631
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:811
+#: contrib/admin/views/main.py:660
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:814
+#: contrib/admin/views/main.py:663
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:829
+#: contrib/admin/views/main.py:678
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "修改口令"
@@ -558,17 +558,6 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: contrib/admin/templates/admin/template_debug.html:6
-msgid "Error in Template"
-msgstr ""
-
-#: contrib/admin/templates/admin/template_debug.html:8
-#, python-format
-msgid ""
-"\n"
-"In template %(name)s, error at line %(line)s:\n"
-msgstr ""
-
 #: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/object_history.html:5
@@ -1386,48 +1375,48 @@ msgstr "瑞典语"
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:484
-#: core/meta/fields.py:495
+#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
+#: core/meta/fields.py:502
 #, fuzzy
 msgid "This field is required."
 msgstr "这个字段无效。"
 
-#: core/formfields.py:338
+#: core/formfields.py:339
 #, python-format
 msgid "Ensure your text is less than %s character"
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 
-#: core/formfields.py:343
+#: core/formfields.py:344
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "这里不允许小写字母。"
 
-#: core/formfields.py:439 core/formfields.py:510 core/formfields.py:548
+#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:604
+#: core/formfields.py:605
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:658
+#: core/formfields.py:659
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "输入整数。"
 
-#: core/formfields.py:667
+#: core/formfields.py:668
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "输入整数。"
 
-#: core/formfields.py:676
+#: core/formfields.py:677
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "输入整数。"
 
-#: core/validators.py:59
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers and underscores."
 msgstr "此值只能包含字母、数字和下划线。"
 
@@ -1491,7 +1480,7 @@ msgstr "输入一个 YYYY-MM-DD HH:MM 格式的有效日期/时间。"
 msgid "Enter a valid e-mail address."
 msgstr "输入一个有效的邮件地址。"
 
-#: core/validators.py:147
+#: core/validators.py:150
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -1535,7 +1524,7 @@ msgstr "格式错误的 XML: %s"
 msgid "Invalid URL: %s"
 msgstr "无效 URL: %s"
 
-#: core/validators.py:205 core/validators.py:207
+#: core/validators.py:208 core/validators.py:210
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL %s 是一个断开的链接。"
@@ -1559,7 +1548,7 @@ msgstr "这个字段必须与 '%s' 字段相匹配。"
 msgid "Please enter something for at least one field."
 msgstr "请至少在一个字段上输入些什么。"
 
-#: core/validators.py:263 core/validators.py:274
+#: core/validators.py:266 core/validators.py:277
 msgid "Please enter both fields or leave them both empty."
 msgstr "请要么两个字段都输入或者两个字段都空着。"
 
@@ -1696,12 +1685,12 @@ msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr " 按下 \"Control\"，或者在Mac上按 \"Command\" 来选择一个或多个值。"
 
-#: core/meta/fields.py:504
+#: core/meta/fields.py:511
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "输入一个有效的邮件地址。"
 
-#: core/meta/fields.py:773
+#: core/meta/fields.py:780
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""