diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index f8d4170995..d7e8ce269e 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 ff756466d9..dcf121d928 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-23 00:06+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\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,49 +278,49 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "সোমবার"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "নভে."
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -352,7 +352,7 @@ msgstr "কার্যবিবরণী এন্ট্রি"
 msgid "log entries"
 msgstr "কার্যবিবরণী এন্ট্রি সমুহ"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -382,100 +382,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "জ্যাঙ্গো পরিচালনা"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "যোগ করুন"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "পরিবর্তন"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "পরিবর্তন"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "পাসওয়ার্ড পরিবর্তন করুন"
@@ -556,11 +556,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -570,56 +570,6 @@ msgstr ""
 msgid "Home"
 msgstr "বাড়ি"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "যোগ করুন"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "যোগ করুন"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "পরিবর্তন"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "আপনার কোন কিছু সম্পাদনা করতে অনুমতি নেই।"
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "সাম্প্রতিক কাজ"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "আমার কাজ"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "কিছুই পাওয়া যাচ্ছে না"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "সার্ভার ত্রুটি"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "সার্ভার ত্রুটি (৫০০)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "সার্ভার ত্রুটি<em>(৫০০)</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 ""
-"একটি ত্রুটি আছে। এইটি স্থান পরিচালককে ই-মেল দ্বারা প্রতিবেদন করা হয়েছে এবং খুব "
-"তাড়াতাড়ি মেরামত করা হবে। আপনার ধৈর্য্যের জন্য ধন্যবাদ।"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -657,6 +607,65 @@ msgstr "জ্যাঙ্গো স্থান অ্যাডমিন"
 msgid "Django administration"
 msgstr "জ্যাঙ্গো পরিচালনা"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "সার্ভার ত্রুটি"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "সার্ভার ত্রুটি (৫০০)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "সার্ভার ত্রুটি<em>(৫০০)</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 ""
+"একটি ত্রুটি আছে। এইটি স্থান পরিচালককে ই-মেল দ্বারা প্রতিবেদন করা হয়েছে এবং খুব "
+"তাড়াতাড়ি মেরামত করা হবে। আপনার ধৈর্য্যের জন্য ধন্যবাদ।"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "পাতা খুঁজে পাওয়া গেল না"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "আমরা দুঃখিত, কিন্তু আবেদনকৃত পাতা খুঁজে পাওয়া গেল না।"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "যোগ করুন"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "পরিবর্তন"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "আপনার কোন কিছু সম্পাদনা করতে অনুমতি নেই।"
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "সাম্প্রতিক কাজ"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "আমার কাজ"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "কিছুই পাওয়া যাচ্ছে না"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "যোগ করুন"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "ব্যবহারকারীর নাম:"
@@ -669,32 +678,17 @@ msgstr "পাসওয়ার্ড:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "আপনি কি <a href=\"/password_reset/\">আপনার পাসওয়ার্ড ভুলে গেছেন</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "পাতা খুঁজে পাওয়া গেল না"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "স্বাগত,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "আমরা দুঃখিত, কিন্তু আবেদনকৃত পাতা খুঁজে পাওয়া গেল না।"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "পাসওয়ার্ড পরিবর্তন করুন"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "বাইরে যান"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -719,17 +713,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "হ্যাঁ, আমি নিশ্চিত"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "স্বাগত,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "পাসওয়ার্ড পরিবর্তন করুন"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "বাইরে যান"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -752,11 +757,6 @@ msgstr ""
 msgid "Save"
 msgstr "সক্রিয়"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -775,6 +775,7 @@ msgstr "আপনার পাসওয়ার্ড পরিবর্তন ক
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "পাসওয়ার্ড রিসেট"
@@ -1262,7 +1263,7 @@ msgid "password"
 msgstr "পাসওয়ার্ড"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1389,44 +1390,44 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr "সরলীকৃত চীনা"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 #, fuzzy
 msgid "This field is required."
 msgstr "এই ক্ষেত্রেটি অবৈধ।"
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "ছোটহাতের অক্ষর এখানে ঢোকাতে পারবেন না।"
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "একটি গোটা সংখ্যা ঢোকান।"
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "একটি গোটা সংখ্যা ঢোকান।"
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "একটি গোটা সংখ্যা ঢোকান।"
@@ -1702,27 +1703,27 @@ msgstr "দয়া করে একটি বৈধ IP ঠিকানা ঢো
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr "একাধিক আই.ডি.কমার দ্বারা আলাদা করুন।"
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "একের চেয়ে বেশি নির্বাচন করতে \"Control\" অথবা ম্যাক-এ \"Command\" চেপে ধরে "
 "রাখুন।"
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "একটি বৈধ ই-মেল ঠিকানা ঢোকান।"
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index 42d1fa64cc..1ba08c5b7f 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 c595316209..2cd8357797 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-23 00:05+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\n"
 "PO-Revision-Date: 2005-11-18 14:33+0100\n"
 "Last-Translator: Radek Svarz <translate@svarz.cz>\n"
 "Language-Team: Czech\n"
@@ -301,7 +301,7 @@ 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
+#: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
 "<h3>By %s:</h3>\n"
@@ -310,43 +310,43 @@ msgstr ""
 "<h3>Od %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr "Vše"
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 #, fuzzy
 msgid "Any date"
 msgstr "Všechna data"
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "Pondělí"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "List."
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr "Neznámé"
 
@@ -378,7 +378,7 @@ msgstr "log záznam"
 msgid "log entries"
 msgstr "log záznamy"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr "Všechna data"
 
@@ -413,101 +413,101 @@ msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 "Vaše e-mailová adresa není Vaše uživatelské jméno. Zkuste místo toho '%s'."
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Django správa"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr "Vybrat %s"
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr "Vyberte %s pro změnu"
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, 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:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr "Můžete to opět upravit níže."
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr "Můžete přidat další %s níže."
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, python-format
 msgid "Add %s"
 msgstr "%s: přidat"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr "Záznam %s byl přidán."
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr "a"
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Changed %s."
 msgstr "%s: změněno"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr "Záznam %s byl smazán."
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr "Nebyly změněny žádné pole."
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, 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:508
+#: contrib/admin/views/main.py:499
 #, 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:546
+#: contrib/admin/views/main.py:537
 #, python-format
 msgid "Change %s"
 msgstr "%s: změnit"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, 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:631
+#: contrib/admin/views/main.py:620
 #, 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:660
+#: contrib/admin/views/main.py:649
 #, 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:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Jste si jist(á)?"
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "Historie změn: %s"
@@ -583,11 +583,11 @@ msgstr "Stát US (2 velké znaky)"
 msgid "XML text"
 msgstr "text XML"
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -597,56 +597,6 @@ msgstr "text XML"
 msgid "Home"
 msgstr "Domů"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr "%(name)s: přidat"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Přidat"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Změnit"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Nemáte oprávnění nic měnit."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Poslední akce"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mé akce"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nic"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Chyba serveru"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Chyba serveru (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Chyba 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 ""
-"Nastala chyba. Ta byla oznámena administrátorovi serveru pomocí e-mailu a "
-"měla by být brzy odstraněna. Děkujeme za trpělivost."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -684,6 +634,65 @@ msgstr "Django správa webu"
 msgid "Django administration"
 msgstr "Django správa"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Chyba serveru"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Chyba serveru (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Chyba 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 ""
+"Nastala chyba. Ta byla oznámena administrátorovi serveru pomocí e-mailu a "
+"měla by být brzy odstraněna. Děkujeme za trpělivost."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Stránka nenalezena"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Přidat"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Změnit"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Nemáte oprávnění nic měnit."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Poslední akce"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mé akce"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nic"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "%(name)s: přidat"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Uživatelské jméno:"
@@ -696,33 +705,17 @@ msgstr "Heslo:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">Zapomněl(a) jste své heslo?</a>"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Stránka nenalezena"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Vítejte,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Změnit heslo"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr "Pohled na stránku"
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Prosíme, odstraňte chybu uvedenou níže."
-msgstr[1] "Prosíme, odstraňte chyby uvedené níže."
-msgstr[2] "Prosíme, odstraňte chyby uvedené níže."
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr "Objednávání"
-
-#: 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ásit se"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -747,17 +740,29 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ano, jsem si jist"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Vítejte,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr "Od %(title)s"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Změnit heslo"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Pohled na stránku"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odhlásit se"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Prosíme, odstraňte chybu uvedenou níže."
+msgstr[1] "Prosíme, odstraňte chyby uvedené níže."
+msgstr[2] "Prosíme, odstraňte chyby uvedené níže."
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Objednávání"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Objednávka:"
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -779,11 +784,6 @@ msgstr "Uložit a pokračovat v úpravách"
 msgid "Save"
 msgstr "Uložit"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr "Od %(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
@@ -802,6 +802,7 @@ msgstr "Vaše heslo bylo změněno."
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Obnovení hesla"
@@ -1309,7 +1310,7 @@ msgid "password"
 msgstr "heslo"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1436,41 +1437,41 @@ msgstr "Švédsky"
 msgid "Simplified Chinese"
 msgstr "Jednoduchá čínština"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 msgid "This field is required."
 msgstr "Toto pole je povinné."
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, fuzzy, python-format
-msgid "Ensure your text is less than %s character"
+msgid "Ensure your text is less than %s character."
 msgid_plural "Ensure your text is less than %s characters."
 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:344
+#: core/formfields.py:341
 msgid "Line breaks are not allowed here."
 msgstr "Zalomení řádky zde nenjsou povolená."
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, 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:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr "Odevzdaný soubor je prázdný."
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 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:668
+#: core/formfields.py:664
 msgid "Enter a positive number."
 msgstr "Vložte celé kladné číslo."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Vložte celé číslo mezi 0 a 32,767."
 
@@ -1754,26 +1755,26 @@ msgstr "Prosíme, zadejte %s správně."
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr "%(optname)s s tímto %(fieldname)s již existuje."
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr "Oddělte více identifikátorů čárkami."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Podržte  \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné "
 "položky."
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 msgid "Enter a valid filename."
 msgstr "Vložte platný název souboru."
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] "Prosíme, vložte platná %(self)s ID. Hodnota %(value)r není platná."
 msgstr[1] ""
 "Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index 99232e2071..679b9c1a49 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 1f0c98b412..b79aa55253 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-23 00:06+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\n"
 "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
 "Last-Translator: Jason Davies <jason@jasondavies.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -278,49 +278,49 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "Dydd Llun"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "Tach."
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -352,7 +352,7 @@ msgstr "cofnod"
 msgid "log entries"
 msgstr "cofnodion"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -382,100 +382,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Gweinyddiad Django"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Ychwanegu"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Newidio"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Newidio"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Newid cyfrinair"
@@ -556,11 +556,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -570,56 +570,6 @@ msgstr ""
 msgid "Home"
 msgstr "Adref"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Ychwanegu"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Ychwanegu"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Newidio"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Does genych ddim hawl i olygu unrhywbeth."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Gweithredau Diweddar"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Fy Ngweithredau"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Dim ar gael"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Gwall gweinyddwr"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Gwall gweinyddwr (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Gwall Gweinyddwr <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 ""
-"Mae gwall wedi digwydd. Adroddwyd i weinyddwyr y safle drwy e-bost ac ddylai "
-"cael ei drwsio cyn bo hir."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -657,6 +607,65 @@ msgstr "Gweinyddiad safle Django"
 msgid "Django administration"
 msgstr "Gweinyddiad Django"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Gwall gweinyddwr"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Gwall gweinyddwr (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Gwall Gweinyddwr <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 ""
+"Mae gwall wedi digwydd. Adroddwyd i weinyddwyr y safle drwy e-bost ac ddylai "
+"cael ei drwsio cyn bo hir."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Tudalen heb ei ddarganfod"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Mae'n ddrwg gennym, ond nid darganfwyd y dudalen a dymunwyd"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Ychwanegu"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Newidio"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Does genych ddim hawl i olygu unrhywbeth."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Gweithredau Diweddar"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Fy Ngweithredau"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Dim ar gael"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Ychwanegu"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Enw defnyddiwr:"
@@ -669,32 +678,17 @@ msgstr "Cyfrinair:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Ydych wedi <a href=\"/password_reset/\">anghofio eich cyfrinair</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Tudalen heb ei ddarganfod"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Croeso,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Mae'n ddrwg gennym, ond nid darganfwyd y dudalen a dymunwyd"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Newid cyfrinair"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Allgofnodi"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -719,17 +713,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Yndw, rwy'n sicr"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Croeso,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Newid cyfrinair"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Allgofnodi"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -752,11 +757,6 @@ msgstr ""
 msgid "Save"
 msgstr "gweithredol"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -775,6 +775,7 @@ msgstr "Newidwyd eich cyfrinair."
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Ailosod cyfrinair"
@@ -1264,7 +1265,7 @@ msgid "password"
 msgstr "cyfrinair"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1392,44 +1393,44 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr "Tsieinëeg Symledig"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 #, fuzzy
 msgid "This field is required."
 msgstr "Mae'r faes yma yn annilydd."
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Ni chaniateir lythrennau bach yma."
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Rhowch rhif cyfan."
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Rhowch rhif cyfan."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Rhowch rhif cyfan."
@@ -1711,26 +1712,26 @@ msgstr "Rhowch cyfeiriad IP dilys, os gwelwch yn dda."
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr " Gwahanwch mwy nag un ID gyda atalnodau."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Gafaelwch lawr \"Control\", neu \"Command\" ar Fac, i ddewis mwy nag un."
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Rhowch cyfeiriad e-bost ddilys."
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo
index 222fa4af32..ef0fcc7e97 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 1e3b779873..3f49a14b17 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-23 00:06+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Morten Bagai <m@bagai.com>\n"
 "Language-Team: Danish\n"
@@ -278,49 +278,49 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "Mandag"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "Nov."
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -352,7 +352,7 @@ msgstr "logmeddelelse"
 msgid "log entries"
 msgstr "logmeddelelser"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -382,100 +382,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Django administration"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Tilføj"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Ændre"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Ændre"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Ændre adgangskode"
@@ -556,11 +556,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -570,56 +570,6 @@ msgstr ""
 msgid "Home"
 msgstr "Hjem"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Tilføj"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Ændre"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Du har ikke rettigehed til at foretage ændringer"
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Seneste handlinger"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mine handlinger"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Ingen tilgængelige"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Serverfejl"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Serverfejl (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Serverfejl <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 ""
-"Der opstod en fejl. Fejlen er rapporteret til site-administratoren via e-"
-"mail, og vil blive rettet hurtigst muligt. Tak for din tålmodighed."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -657,6 +607,65 @@ msgstr "Django site administration"
 msgid "Django administration"
 msgstr "Django administration"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Serverfejl"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Serverfejl (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Serverfejl <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 ""
+"Der opstod en fejl. Fejlen er rapporteret til site-administratoren via e-"
+"mail, og vil blive rettet hurtigst muligt. Tak for din tålmodighed."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Siden blev ikke fundet"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Vi Beklager, men den ønskede side kunne ikke findes"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Tilføj"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Ændre"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Du har ikke rettigehed til at foretage ændringer"
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Seneste handlinger"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mine handlinger"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Ingen tilgængelige"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Brugernavn:"
@@ -669,32 +678,17 @@ msgstr "Adgangskode:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Har du <a href=\"/password_reset/\">glemt din adgangskode</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Siden blev ikke fundet"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Velkommen"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Vi Beklager, men den ønskede side kunne ikke findes"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Ændre adgangskode"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Log ud"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -719,17 +713,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ja, jeg er sikker"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Velkommen"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Ændre adgangskode"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Log ud"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -752,11 +757,6 @@ msgstr ""
 msgid "Save"
 msgstr "aktiv"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -775,6 +775,7 @@ msgstr "Din adgangskode er ændret"
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Nulstil adgangskode"
@@ -1268,7 +1269,7 @@ msgid "password"
 msgstr "adgangskode"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1396,44 +1397,44 @@ msgstr "Svensk"
 msgid "Simplified Chinese"
 msgstr "Simpel Kinesisk"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 #, fuzzy
 msgid "This field is required."
 msgstr "Dette felt er ugyldigt."
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Små bogstaver er ikke tilladt her"
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Indtast et heltal."
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Indtast et heltal."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Indtast et heltal."
@@ -1711,26 +1712,26 @@ msgstr "Venlist indtast en gyldig email-adresse."
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr "Adskil id'er med kommaer."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Hold \"Kontrol\", eller \"Æbletasten\" på Mac, nede for at vælge mere end en."
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Indtast en gyldig email-adresse."
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index 72ba0c03ed..e11050075d 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 98e308c815..db070944b8 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-23 16:48+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\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,7 +288,7 @@ 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
+#: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
 "<h3>By %s:</h3>\n"
@@ -297,40 +297,40 @@ msgstr ""
 "<h3>Nach %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr "Alle"
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr "Alle Daten"
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 msgid "Today"
 msgstr "Heute"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr "Letzte 7 Tage"
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr "Diesen Monat"
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr "Dieses Jahr"
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr "Ja"
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "No"
 msgstr "Nein"
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -362,7 +362,7 @@ msgstr "Logeintrag"
 msgid "log entries"
 msgstr "Logeintr�ge"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr "Alle Tage"
 
@@ -398,69 +398,69 @@ msgstr ""
 "Die eMail-Adresse ist nicht der Benutzername. Bitte '%s' stattdessen "
 "versuchen."
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 msgid "Site administration"
 msgstr "Website Verwaltung"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr "%s ausw�hlen"
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr "%s zur �nderung ausw�hlen"
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, 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:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr "Das Element kann jetzt weiter ge�ndert werden."
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, 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:451
+#: contrib/admin/views/main.py:442
 #, python-format
 msgid "Add %s"
 msgstr "%s zuf�gen"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr "%s hinzugef�gt."
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr "und"
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Changed %s."
 msgstr "%s ge�ndert"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr "%s gel�scht."
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr "Keine Felder ge�ndert."
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, 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:508
+#: contrib/admin/views/main.py:499
 #, 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:546
+#: contrib/admin/views/main.py:537
 #, python-format
 msgid "Change %s"
 msgstr "%s �ndern"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, 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:631
+#: contrib/admin/views/main.py:620
 #, 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:660
+#: contrib/admin/views/main.py:649
 #, 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:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Sicher? Ganz sicher?"
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "�nderungsgeschichte: %s"
@@ -568,11 +568,11 @@ msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)"
 msgid "XML text"
 msgstr "XML Text"
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -582,57 +582,6 @@ msgstr "XML Text"
 msgid "Home"
 msgstr "Start"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr "%(name)s zuf�gen"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Zuf�gen"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "�ndern"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Sie haben keine Berechtigung irgendwas zu �ndern."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "K�rzliche Aktionen"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Meine Aktionen"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Keine vorhanden"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Serverfehler"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Serverfehler (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Serverfehler <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 ""
-"Es hat einen Fehler gegeben. Dieser Fehler wurde an die Serververwalter per "
-"eMail weitergegeben und sollte bald behoben sein. Vielen Dank f�r Ihr "
-"Verst�ndnis."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -670,6 +619,67 @@ msgstr "Django Systemverwaltung"
 msgid "Django administration"
 msgstr "Django Verwaltung"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Serverfehler"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Serverfehler (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Serverfehler <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 ""
+"Es hat einen Fehler gegeben. Dieser Fehler wurde an die Serververwalter per "
+"eMail weitergegeben und sollte bald behoben sein. Vielen Dank f�r Ihr "
+"Verst�ndnis."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Seite nicht gefunden"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr ""
+"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Zuf�gen"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "�ndern"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Sie haben keine Berechtigung irgendwas zu �ndern."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "K�rzliche Aktionen"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Meine Aktionen"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Keine vorhanden"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "%(name)s zuf�gen"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Benutzername:"
@@ -682,33 +692,17 @@ msgstr "Passwort:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Haben Sie <a href=\"/password_reset/\">ihr Passwort vergessen</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Seite nicht gefunden"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Willkommen,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr ""
-"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Passwort �ndern"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr "Im Web Anzeigen"
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Bitte den Fehler korrigieren."
-msgstr[1] "Bitte die Fehler korrigieren."
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr "Sortierung"
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr "Reihenfolge:"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Abmelden"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -734,17 +728,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ja, ich bin sicher"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Willkommen,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr " Nach %(title)s "
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Passwort �ndern"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Im Web Anzeigen"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Abmelden"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Bitte den Fehler korrigieren."
+msgstr[1] "Bitte die Fehler korrigieren."
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Sortierung"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Reihenfolge:"
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -766,11 +771,6 @@ msgstr "Sichern und weiter bearbeiten"
 msgid "Save"
 msgstr "Sichern"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr " Nach %(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
@@ -1420,41 +1420,41 @@ msgstr "Schwedisch"
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 msgid "This field is required."
 msgstr "Dieses Feld ist zwingend."
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 msgid "Line breaks are not allowed here."
 msgstr "Zeilenumbr�che sind hier nicht erlaubt."
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, 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:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr "Die ausgew�hlte Datei ist leer."
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 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:668
+#: core/formfields.py:664
 msgid "Enter a positive number."
 msgstr "Bitte eine ganze, positive Zahl eingeben."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Bitte eine ganze Zahl zwischen 0 und 32.767 eingeben."
 
@@ -1741,37 +1741,28 @@ msgstr "Bitte ein g
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr "Ein '%(optname)s' mit diesem '%(fieldname)s' existiert bereits."
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr "Mehrere IDs k�nnen mit Komma getrennt werden."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 " Um mehr als eine Selektion zu treffen, \"Strg\", oder auf dem Mac \"Command"
 "\", beim Klicken gedr�ckt halten."
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 msgid "Enter a valid filename."
 msgstr "Bitte einen g�ltigen Dateinamen eingeben"
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 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 7199e536de..21cff98d44 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 3ba0920f30..39d75a0330 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-23 00:05+0100\n"
+"POT-Creation-Date: 2005-11-25 17:26-0600\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,47 +263,47 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 msgid "Today"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "No"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -335,7 +335,7 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -365,99 +365,99 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 msgid "Site administration"
 msgstr ""
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, python-format
 msgid "Add %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Changed %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, python-format
 msgid "Change %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr ""
@@ -533,11 +533,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -547,54 +547,6 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr ""
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr ""
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr ""
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr ""
-
-#: 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 ""
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -630,6 +582,63 @@ msgstr ""
 msgid "Django administration"
 msgstr ""
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr ""
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr ""
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr ""
+
+#: 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 ""
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr ""
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr ""
@@ -642,31 +651,16 @@ msgstr ""
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr ""
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
 msgstr ""
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
 msgstr ""
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
 msgstr ""
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
@@ -688,16 +682,27 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
 msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
 msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
@@ -720,11 +725,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -743,6 +743,7 @@ msgstr ""
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr ""
@@ -1214,7 +1215,7 @@ msgid "password"
 msgstr ""
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1339,40 +1340,40 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 msgid "This field is required."
 msgstr ""
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 msgid "Line breaks are not allowed here."
 msgstr ""
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr ""
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 msgid "Enter a positive number."
 msgstr ""
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 msgid "Enter a whole number between 0 and 32,767."
 msgstr ""
 
@@ -1631,23 +1632,23 @@ msgstr ""
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr ""
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 msgid "Enter a valid filename."
 msgstr ""
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index a3613a1dcb..148615dca3 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 6794ab5e12..03687c9dde 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-23 00:05+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\n"
 "PO-Revision-Date: 2005-10-04 20:59GMT\n"
 "Last-Translator: Ricardo Javier C�rdenes Medina <ricardo.cardenes@gmail."
 "com>\n"
@@ -268,47 +268,47 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 msgid "Today"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "No"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -341,7 +341,7 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -371,100 +371,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Administraci�n de Django"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "Cambie para modificar"
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Agregar"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Cambiar clave"
@@ -543,11 +543,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -557,58 +557,6 @@ msgstr ""
 msgid "Home"
 msgstr "Inicio"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Agregar"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Agregar"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Modificar"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "No tiene permiso para editar nada."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Acciones recientes"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mis acciones"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Ninguno disponible"
-
-#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
-msgid "Server error"
-msgstr "Error del servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Error del servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Error de servidor <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 ""
-"Ha ocurrido un error. Se ha informado a los administradores del sitio "
-"mediante correo electr�nico y deber�a arreglarse en breve. Gracias por su "
-"paciencia"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -646,6 +594,67 @@ msgstr "Sitio de administraci
 msgid "Django administration"
 msgstr "Administraci�n de Django"
 
+#: contrib/admin/templates/admin/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "Error del servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Error del servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Error de servidor <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 ""
+"Ha ocurrido un error. Se ha informado a los administradores del sitio "
+"mediante correo electr�nico y deber�a arreglarse en breve. Gracias por su "
+"paciencia"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "P�gina no encontrada"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Lo sentimos, pero no se encuentra la p�gina solicitada."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Agregar"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Modificar"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "No tiene permiso para editar nada."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Acciones recientes"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mis acciones"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Ninguno disponible"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Agregar"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Usuario:"
@@ -658,32 +667,17 @@ msgstr "Clave:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "�Ha <a href=\"/password_reset/\">olvidado su clave</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "P�gina no encontrada"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bienvenido,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Lo sentimos, pero no se encuentra la p�gina solicitada."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Cambiar clave"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Terminar"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
@@ -709,17 +703,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "S�, estoy seguro"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bienvenido,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Cambiar clave"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Terminar"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -741,11 +746,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -764,6 +764,7 @@ msgstr "Su clave ha cambiado."
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Recuperar clave"
@@ -1245,7 +1246,7 @@ msgid "password"
 msgstr "Clave:"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1371,41 +1372,41 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 msgid "This field is required."
 msgstr ""
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 msgid "Line breaks are not allowed here."
 msgstr ""
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr ""
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Direcci�n de correo:"
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 msgid "Enter a whole number between 0 and 32,767."
 msgstr ""
 
@@ -1666,25 +1667,25 @@ msgstr ""
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr ""
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Direcci�n de correo:"
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 0cec8eb688..0b059f944a 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 bd32c96654..e1ddd2286d 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-23 00:05+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\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,49 +277,49 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "Lundi"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "Nov."
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -351,7 +351,7 @@ msgstr "entr
 msgid "log entries"
 msgstr "entr�es de log"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -381,100 +381,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Administration de Django"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Ajouter"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Modifier"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Modifier"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Modifier votre mot de passe"
@@ -555,11 +555,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -569,58 +569,6 @@ msgstr ""
 msgid "Home"
 msgstr "Accueil"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Ajouter"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Ajouter"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Modifier"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Vous n'avez pas la permission d'�diter quoi que ce soit."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Actions r�centes"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mes actions"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Aucun(e) disponible"
-
-#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
-msgid "Server error"
-msgstr "Erreur du serveur (500)"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Erreur du serveur (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Erreur du serveur <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 ""
-"Une erreur est survenue. Elle a �t� transmise par courriel aux "
-"administrateurs du site et sera corrig�e dans les meilleurs d�lais. Merci "
-"pour votre patience."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -658,6 +606,67 @@ msgstr "Site d'administration de Django"
 msgid "Django administration"
 msgstr "Administration de Django"
 
+#: contrib/admin/templates/admin/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "Erreur du serveur (500)"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Erreur du serveur (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Erreur du serveur <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 ""
+"Une erreur est survenue. Elle a �t� transmise par courriel aux "
+"administrateurs du site et sera corrig�e dans les meilleurs d�lais. Merci "
+"pour votre patience."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Cette page n'a pas �t� trouv�e"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Nous sommes d�sol�s, mais la page demand�e est introuvable."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Ajouter"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Modifier"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Vous n'avez pas la permission d'�diter quoi que ce soit."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Actions r�centes"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mes actions"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Aucun(e) disponible"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Ajouter"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Nom d'utilisateur"
@@ -670,32 +679,17 @@ msgstr "Mot de passe"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Avez vous <a href=\"/password_reset/\">perdu votre mot de passe</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Cette page n'a pas �t� trouv�e"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bienvenue,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Nous sommes d�sol�s, mais la page demand�e est introuvable."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Modifier votre mot de passe"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "D�connection"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
@@ -721,17 +715,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Oui, je suis certain"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bienvenue,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Modifier votre mot de passe"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "D�connection"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -754,11 +759,6 @@ msgstr ""
 msgid "Save"
 msgstr "actif"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -777,6 +777,7 @@ msgstr "Votre mot de passe a 
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "R�initialisation de votre mot de passe"
@@ -1272,7 +1273,7 @@ msgid "password"
 msgstr "mot de passe"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1403,44 +1404,44 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 #, fuzzy
 msgid "This field is required."
 msgstr "Ce champ est invalide."
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Les lettres minuscules ne sont pas autoris�es ici."
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Entrez un nombre entier."
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Entrez un nombre entier."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Entrez un nombre entier."
@@ -1729,27 +1730,27 @@ msgstr "Entrez une adresse IP valide."
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr "S�parez les ID par des virgules."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Maintenez \"Control\", or \"Command\" sur un Mac, pour en s�lectionner plus "
 "d'une."
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Entrez une adresse de courriel valide."
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index 3ad4bbae2c..ea9a66606b 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 194e1d167f..de6f404442 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-23 00:05+0100\n"
+"POT-Creation-Date: 2005-11-25 17:26-0600\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,47 +268,47 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 msgid "Today"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "No"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -341,7 +341,7 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -371,100 +371,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Administración de Django"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "Faga clic para modificar"
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Engadir"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Cambiar contrasinal"
@@ -543,11 +543,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -557,57 +557,6 @@ msgstr ""
 msgid "Home"
 msgstr "Inicio"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Engadir"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Engadir"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Modificar"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Non ten permiso para editar nada."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Accións recentes"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "As miñas accións"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Ningunha dispoñíbel"
-
-#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
-msgid "Server error"
-msgstr "Erro do servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Erro do servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Erro do servidor <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 ""
-"Houbo un erro. Xa se informou aos administradores do sitio por correo "
-"electrónico e debería quedar arranxado pronto. Grazas pola súa paciencia."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -645,6 +594,66 @@ msgstr "Administración de sitio Django"
 msgid "Django administration"
 msgstr "Administración de Django"
 
+#: contrib/admin/templates/admin/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "Erro do servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Erro do servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Erro do servidor <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 ""
+"Houbo un erro. Xa se informou aos administradores do sitio por correo "
+"electrónico e debería quedar arranxado pronto. Grazas pola súa paciencia."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Páxina non atopada"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Sentímolo, pero non se atopou a páxina solicitada."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Engadir"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Modificar"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Non ten permiso para editar nada."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Accións recentes"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "As miñas accións"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Ningunha dispoñíbel"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Engadir"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Usuario:"
@@ -657,32 +666,17 @@ msgstr "Contrasinal:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">Esqueceu o contrasinal</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Páxina non atopada"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Benvido,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Sentímolo, pero non se atopou a páxina solicitada."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Cambiar contrasinal"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Saír"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
@@ -708,17 +702,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Si, estou seguro"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Benvido,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Cambiar contrasinal"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Saír"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -740,11 +745,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -763,6 +763,7 @@ msgstr "Cambiouse o seu contrasinal."
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Recuperar o contrasinal"
@@ -1244,7 +1245,7 @@ msgid "password"
 msgstr "Contrasinal:"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1370,41 +1371,41 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 msgid "This field is required."
 msgstr ""
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 msgid "Line breaks are not allowed here."
 msgstr ""
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr ""
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Enderezo de correo electrónico:"
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 msgid "Enter a whole number between 0 and 32,767."
 msgstr ""
 
@@ -1665,24 +1666,24 @@ msgstr ""
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr ""
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Enderezo de correo electrónico:"
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index 5f9e335d9c..4030c1bd35 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 641999b2f9..8a12af4d7e 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-23 00:06+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\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,49 +280,49 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "mánudagur"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "nóv."
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -354,7 +354,7 @@ msgstr "kladdafærsla"
 msgid "log entries"
 msgstr "kladdafærslur"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -384,100 +384,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Django vefstjórn"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Bæta við"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Breyta"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Breyta"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Breyta lykilorði"
@@ -558,11 +558,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -572,56 +572,6 @@ msgstr ""
 msgid "Home"
 msgstr "Heim"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Bæta við"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Bæta við"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Breyta"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Þú hefur ekki réttindi til að breyta nokkru"
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Nýlega framkvæmdar aðgerðir"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Aðgerðir mínar"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Engin fáanleg"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Kerfisvilla"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Kerfisvilla (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Kerfisvilla <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 ""
-"Villa hefur komið upp. Hún hefur verið tilkynnt vefstjórunum með tölvupósti "
-"og ætti að verða lagað fljótlega. Þökkum þolinmæðina."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -659,6 +609,65 @@ msgstr "Django vefstjóri"
 msgid "Django administration"
 msgstr "Django vefstjórn"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Kerfisvilla"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Kerfisvilla (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Kerfisvilla <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 ""
+"Villa hefur komið upp. Hún hefur verið tilkynnt vefstjórunum með tölvupósti "
+"og ætti að verða lagað fljótlega. Þökkum þolinmæðina."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Síða fannst ekki"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Því miður fannst umbeðin síða ekki."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Bæta við"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Breyta"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Þú hefur ekki réttindi til að breyta nokkru"
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Nýlega framkvæmdar aðgerðir"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Aðgerðir mínar"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Engin fáanleg"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Bæta við"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Notandanafn:"
@@ -671,32 +680,17 @@ msgstr "Lykilorð:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">Gleymdir þú lykilorðinu</a> þínu?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Síða fannst ekki"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Velkomin(n),"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Því miður fannst umbeðin síða ekki."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Breyta lykilorði"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Skrá út"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -721,17 +715,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Já ég er viss."
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Velkomin(n),"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Breyta lykilorði"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Skrá út"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -754,11 +759,6 @@ msgstr ""
 msgid "Save"
 msgstr "virkur"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -777,6 +777,7 @@ msgstr "Lykilorði þínu var breytt"
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Endursetja lykilorð"
@@ -1265,7 +1266,7 @@ msgid "password"
 msgstr "lykilorð"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1394,44 +1395,44 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr "Einfölduð Kínverska "
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 #, fuzzy
 msgid "This field is required."
 msgstr "Þessi reitur er ótækur."
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Lágstafir eru ekki leyfðir hér."
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Settu inn heila tölu."
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Settu inn heila tölu."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Settu inn heila tölu."
@@ -1708,27 +1709,27 @@ msgstr "Vinsamlegast skrifaðu gilda IP tölu."
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr "Notaðu kommur til að aðskilja kenni."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Haltu niðri \"Control\", eða \"Command\" á Mac til þess að velja fleira en "
 "eitt."
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Skrifaðu gilt tölvupóstfang."
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 4cec17c1d4..773a38fac5 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 1ccbf82105..9ea1fc8e1c 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-23 00:05+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\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,49 +278,49 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "Luned�"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "Nov."
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -352,7 +352,7 @@ msgstr "voce di log"
 msgid "log entries"
 msgstr "voci di log"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -382,100 +382,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Amministrazione Django"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "Clicca per cambiare"
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Aggiungi"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Cambia"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Cambia"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Cambia la password"
@@ -556,11 +556,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -570,57 +570,6 @@ msgstr ""
 msgid "Home"
 msgstr "Pagina iniziale"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Aggiungi"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Aggiungi"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Cambia"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Non hai i permessi di modificare nulla."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Azioni Recenti"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Azioni Proprie"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nessuna disponibile"
-
-#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
-msgid "Server error"
-msgstr "Errore del server (500)"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Errore del server (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Errore del Server <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 ""
-"C'� stato un errore. E' stato riportato agli amministratori del sito via e-"
-"mail e verr� risolto a breve. Grazie per la pazienza."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -658,6 +607,66 @@ msgstr "Amministrazione sito Django"
 msgid "Django administration"
 msgstr "Amministrazione Django"
 
+#: contrib/admin/templates/admin/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "Errore del server (500)"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Errore del server (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Errore del Server <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 ""
+"C'� stato un errore. E' stato riportato agli amministratori del sito via e-"
+"mail e verr� risolto a breve. Grazie per la pazienza."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Pagina non trovata"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Spiacente, ma la pagina richiesta non esiste."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Aggiungi"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Cambia"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Non hai i permessi di modificare nulla."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Azioni Recenti"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Azioni Proprie"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nessuna disponibile"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Aggiungi"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Nome utente:"
@@ -670,32 +679,17 @@ msgstr "Password:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Hai <a href=\"/password_reset/\">dimenticato la tua password</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Pagina non trovata"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Benvenuto,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Spiacente, ma la pagina richiesta non esiste."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Cambia la password"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Esci"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
@@ -721,17 +715,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "S�, sono sicuro"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Benvenuto,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Cambia la password"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Esci"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -754,11 +759,6 @@ msgstr ""
 msgid "Save"
 msgstr "attivo"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -777,6 +777,7 @@ msgstr "La tua password 
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Resetta la password"
@@ -1265,7 +1266,7 @@ msgid "password"
 msgstr "password"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1394,44 +1395,44 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 #, fuzzy
 msgid "This field is required."
 msgstr "Il campo non � valido."
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Non sono ammesse lettere minuscole."
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Inserire un numero."
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Inserire un numero."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Inserire un numero."
@@ -1710,25 +1711,25 @@ msgstr "Inserire un indirizzo IP valido."
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr " Separa ID multipli con virgole."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 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:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Inserire un indirizzo e-mail valido."
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index efb1b10e5c..b76367ee90 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 77f7f71719..4025dfc0aa 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-23 00:06+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n"
 "Language-Team: Norwegian\n"
@@ -292,7 +292,7 @@ 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
+#: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
 "<h3>By %s:</h3>\n"
@@ -301,43 +301,43 @@ msgstr ""
 "<h3>Av %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr "Alle"
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 #, fuzzy
 msgid "Any date"
 msgstr "Alle datoer"
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "Mondag"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "Nov."
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr "Ukjent"
 
@@ -369,7 +369,7 @@ msgstr "logg notis"
 msgid "log entries"
 msgstr "logg innlegg"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr "Alle datoer"
 
@@ -404,100 +404,100 @@ msgstr "Brukernavnet kan ikke inneholde '@'"
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Epost adressen din er ikke brukernavnet ditt, prøv '%s' i stede."
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Django administrasjon"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr "Velg %s"
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr "Velg %s for å endre"
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, 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:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr "Du kan endre under"
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr "Du kan legge til en ny %s under."
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, python-format
 msgid "Add %s"
 msgstr "Ny %s"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr "La til %s"
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr "og"
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Changed %s."
 msgstr "Endret %s."
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr "Slettet %s."
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr "Ingen felt endret."
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" ble endret."
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, 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:546
+#: contrib/admin/views/main.py:537
 #, python-format
 msgid "Change %s"
 msgstr "Endre %s"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, 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:631
+#: contrib/admin/views/main.py:620
 #, 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:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" ble slettet."
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Endre historien: %s"
@@ -575,11 +575,11 @@ msgstr "Stat (i USA, to store bokstaver)"
 msgid "XML text"
 msgstr "XML tekst"
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -589,56 +589,6 @@ msgstr "XML tekst"
 msgid "Home"
 msgstr "Hjem"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr "Legg til %(name)s"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Legg til"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Endre"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Du har ikke rettigheter til å endre."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Siste handlinger"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mine handlinger"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Ingen tilgjengelige"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Tjener feil"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Tjener feil (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Tjener feil <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 ""
-"Det har vært en feil. Feilen er blitt rapportert til administrator via e-"
-"mail, og vill bli fikset snart. Takk for din tålmodighet."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -676,6 +626,65 @@ msgstr "Django administrasjonsside"
 msgid "Django administration"
 msgstr "Django administrasjon"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Tjener feil"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Tjener feil (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Tjener feil <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 ""
+"Det har vært en feil. Feilen er blitt rapportert til administrator via e-"
+"mail, og vill bli fikset snart. Takk for din tålmodighet."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Fant ikke siden"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Beklager, men siden du spør etter finnest ikke."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Legg til"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Endre"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Du har ikke rettigheter til å endre."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Siste handlinger"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mine handlinger"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Ingen tilgjengelige"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "Legg til %(name)s"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Brukernavn:"
@@ -688,32 +697,17 @@ msgstr "Passord:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Har du <a href=\"/password_reset/\">glemt passordet ditt</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Fant ikke siden"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Velkommen"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Beklager, men siden du spør etter finnest ikke."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Endre passord"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr "Vis på siden"
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Vennligst fiks feilen under."
-msgstr[1] "Vennligst fiks feilene under."
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr "Rekkefølge"
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr "Rekkefølge:"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Log ut"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -738,17 +732,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ja, jeg er sikker"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Velkommen"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr "Av %(title)s "
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Endre passord"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Vis på siden"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Log ut"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Vennligst fiks feilen under."
+msgstr[1] "Vennligst fiks feilene under."
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Rekkefølge"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Rekkefølge:"
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -770,11 +775,6 @@ msgstr "Lagre og fortsett å endre"
 msgid "Save"
 msgstr "Lagre"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr "Av %(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
@@ -793,6 +793,7 @@ msgstr "Ditt passord er endret."
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Tilbakestill passord"
@@ -1288,7 +1289,7 @@ msgid "password"
 msgstr "passord"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1415,40 +1416,40 @@ msgstr "Svensk"
 msgid "Simplified Chinese"
 msgstr "Simplifisert Kinesisk"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 msgid "This field is required."
 msgstr "Dette feltet er påkrevd."
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, fuzzy, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 msgid "Line breaks are not allowed here."
 msgstr "Det er ikke tillatt med flere linjer her."
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, 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:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr "Filen er tom."
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Skriv inn et heltall mellom -31768 og 32767."
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 msgid "Enter a positive number."
 msgstr "Skriv inn et positivt heltall."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Skriv inn et heltall mellom 0 og 32767."
 
@@ -1730,26 +1731,26 @@ msgstr "Vennligst skriv inn en godkjent IP adresse."
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr "$(optname)s med %(fieldname)s finnes allerede."
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr "Separer Id-ene med kommaer."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mere enn en."
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Skriv inn en godkjent e-post adresse."
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index 4655e7be3f..bd74a9d34f 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 a1c44ead54..438788d13b 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-23 00:05+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\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,49 +278,49 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "Segunda Feira"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "Nov."
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -352,7 +352,7 @@ msgstr "entrada de log"
 msgid "log entries"
 msgstr "entradas de log"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -382,100 +382,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Administração do Django"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "Clique para alterar"
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Adicionar"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Alterar senha"
@@ -556,11 +556,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -570,57 +570,6 @@ msgstr ""
 msgid "Home"
 msgstr "Início"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Adicionar"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Adicionar"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Modificar"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Você não tem permissão para edição."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Ações Recentes"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Minhas Ações"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nenhuma disponível"
-
-#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
-msgid "Server error"
-msgstr "Erro no servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Erro no servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Erro no Servidor <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 ""
-"Houve um erro. Este foi reportado aos administradores do site através d e-"
-"mail e deve ser consertado em breve. Obrigado pela compreensão."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -658,6 +607,66 @@ msgstr "Site de administração do Django"
 msgid "Django administration"
 msgstr "Administração do Django"
 
+#: contrib/admin/templates/admin/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "Erro no servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Erro no servidor (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Erro no Servidor <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 ""
+"Houve um erro. Este foi reportado aos administradores do site através d e-"
+"mail e deve ser consertado em breve. Obrigado pela compreensão."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Página não encontrada"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Desculpe, mas a página requisitada não pode ser encontrada."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Adicionar"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Modificar"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Você não tem permissão para edição."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Ações Recentes"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Minhas Ações"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nenhuma disponível"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Adicionar"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Usuário:"
@@ -670,32 +679,17 @@ msgstr "Senha:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Você <a href=\"/password_reset/\"esqueceu a senha</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Página não encontrada"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bem vindo,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Desculpe, mas a página requisitada não pode ser encontrada."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Alterar senha"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Encerrar sessão"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
@@ -721,17 +715,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Sim, tenho certeza"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bem vindo,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Alterar senha"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Encerrar sessão"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -754,11 +759,6 @@ msgstr ""
 msgid "Save"
 msgstr "ativar"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -777,6 +777,7 @@ msgstr "Sua senha foi alterada."
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Reinicializar senha"
@@ -1268,7 +1269,7 @@ msgid "password"
 msgstr "senha"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1398,44 +1399,44 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 #, fuzzy
 msgid "This field is required."
 msgstr "Este campo é inválido."
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Letras em minúsculo não são permitidas aqui."
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Informe um número inteiro."
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Informe um número inteiro."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Informe um número inteiro."
@@ -1714,27 +1715,27 @@ msgstr "Informe um endereço IP válido."
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr " Separe IDs múltiplos com vírgulas."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 " Mantenha pressionado \"Control\", ou \"Command\" num Mac para selecionar "
 "mais de uma opção."
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Informe um endereço de email válido."
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index 01c98da1a7..6fb17fe14f 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 bf0ca36809..46e51ef1ee 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-23 00:06+0100\n"
+"POT-Creation-Date: 2005-11-26 00:26+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,49 +278,49 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "Luni"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "Noi."
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -352,7 +352,7 @@ msgstr "intrare log"
 msgid "log entries"
 msgstr "intrări log"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -382,100 +382,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Administrare Django"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Adaugă"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Schimbă"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Schimbă"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Schimbă parola"
@@ -556,11 +556,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -570,56 +570,6 @@ msgstr ""
 msgid "Home"
 msgstr "Acasă"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Adaugă"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Adaugă"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Schimbă"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Nu ai drepturi de editare."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Acţiuni Recente"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Acţiunile Mele"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Indisponibil"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Eroare de server"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Eroare de server (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Eroare server <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 ""
-"A apărut o eroare. Este raportată către administrator via emailşi va fi "
-"fixată în scurt timp. Mulţumim pentru înţelegere."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -657,6 +607,65 @@ msgstr "Administrare sit Django"
 msgid "Django administration"
 msgstr "Administrare Django"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Eroare de server"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Eroare de server (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Eroare server <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 ""
+"A apărut o eroare. Este raportată către administrator via emailşi va fi "
+"fixată în scurt timp. Mulţumim pentru înţelegere."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Pagină inexistentă"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Ne pare rău, dar pagina cerută nu există."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Adaugă"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Schimbă"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Nu ai drepturi de editare."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Acţiuni Recente"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Acţiunile Mele"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Indisponibil"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Adaugă"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Utilizator:"
@@ -669,32 +678,17 @@ msgstr "Parola:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Ai <a href=\"/password_reset/\">uitat parola</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Pagină inexistentă"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bine ai venit,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Ne pare rău, dar pagina cerută nu există."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Schimbă parola"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Deautentificare"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -720,17 +714,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Da, sînt sigur"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bine ai venit,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Schimbă parola"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Deautentificare"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -753,11 +758,6 @@ msgstr ""
 msgid "Save"
 msgstr "activ"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -776,6 +776,7 @@ msgstr "Parola a fost schimbată."
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Resetează parola"
@@ -1266,7 +1267,7 @@ msgid "password"
 msgstr "parola"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1394,44 +1395,44 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr "Chineză simplificată"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 #, fuzzy
 msgid "This field is required."
 msgstr "Cîmpul este invalid."
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Literele mici nu sînt permise aici."
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Introduceţi un număr întreg."
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Introduceţi un număr întreg."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Introduceţi un număr întreg."
@@ -1714,27 +1715,27 @@ msgstr "Introduceţi vă rog o adresă IP validă."
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr "Separă ID-urile multiple cu virgulă."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 " Ţine apăsat \"Control\", sau \"Command\" pe un Mac, pentru a selecta mai "
 "multe."
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Introduceţi o adresă de email validă."
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 2a59acdee8..13e42dcf51 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 921557eddf..61426e1c43 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-23 00:05+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\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,47 +266,47 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 msgid "Today"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "No"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -339,7 +339,7 @@ msgstr ""
 msgid "log entries"
 msgstr ""
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -369,100 +369,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "����������������� Django"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "�������� ��� ���������"
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "��������"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "��������"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "��������"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "��������� ������"
@@ -541,11 +541,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -555,57 +555,6 @@ msgstr ""
 msgid "Home"
 msgstr "������"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "��������"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "��������"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "��������"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "������������ ���� ��� ��������������."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "��������� ��������"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "��� ��������"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "����������"
-
-#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
-msgid "Server error"
-msgstr "������ ������� (500)"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "������ ������� (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "������ ������� <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 ""
-"��������� ������. ����� �� ������ ��������� ��������������� ����� �� e-mail� "
-"��� ������ ���� ������ ����������. ���������� ��� �� �������� � ������."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -643,6 +592,66 @@ msgstr "
 msgid "Django administration"
 msgstr "����������������� Django"
 
+#: contrib/admin/templates/admin/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "������ ������� (500)"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "������ ������� (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "������ ������� <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 ""
+"��������� ������. ����� �� ������ ��������� ��������������� ����� �� e-mail� "
+"��� ������ ���� ������ ����������. ���������� ��� �� �������� � ������."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "�������� �� �������"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "� ���������, ������������� ���� �������� �� �������."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "��������"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "��������"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "������������ ���� ��� ��������������."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "��������� ��������"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "��� ��������"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "����������"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "��������"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "���:"
@@ -655,32 +664,17 @@ msgstr "
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "�� <a href=\"/password_reset/\">������ ������</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "�������� �� �������"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "����� ����������,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "� ���������, ������������� ���� �������� �� �������."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "��������� ������"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "�����"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, fuzzy, python-format
@@ -706,17 +700,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "��, � ������"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "����� ����������,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "��������� ������"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "�����"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -738,11 +743,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -761,6 +761,7 @@ msgstr "
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "����� ������"
@@ -1249,7 +1250,7 @@ msgid "password"
 msgstr "������:"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1377,41 +1378,41 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr ""
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 msgid "This field is required."
 msgstr ""
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 msgid "Line breaks are not allowed here."
 msgstr ""
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr ""
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "E-mail �����:"
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 msgid "Enter a whole number between 0 and 32,767."
 msgstr ""
 
@@ -1684,27 +1685,27 @@ msgstr ""
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr "���������� ��������� ID �������."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 " ����������� \"Control\", ��� \"Command\" �� ��������, ��� ������ ������ ��� "
 "������."
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "E-mail �����:"
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 26d18a6cec..212ac9cdff 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 35d2182837..7ec3595422 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-23 00:06+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\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
 msgid "object ID"
@@ -252,8 +221,9 @@ msgstr "Nemožete voliť vlastný príspevok"
 #: contrib/comments/views/comments.py:25
 msgid ""
 "This rating is required because you've entered at least one other rating."
-msgstr "Toto hlasovanie je nevyhnutné, lebo súvisí s predchádzjúcou voľbou."
-"Táto voľba je nevyhnutná nakoľko je pokračovaním vašej predchádzajúcej."
+msgstr ""
+"Toto hlasovanie je nevyhnutné, lebo súvisí s predchádzjúcou voľbou.Táto "
+"voľba je nevyhnutná nakoľko je pokračovaním vašej predchádzajúcej."
 
 #: contrib/comments/views/comments.py:109
 #, fuzzy, python-format
@@ -309,8 +279,9 @@ msgstr "Bola zistena neoprávnená manipulácia s formulárom komentára "
 msgid ""
 "The comment form had an invalid 'target' parameter -- the object ID was "
 "invalid"
-msgstr "Formulár kometára má chybný výstupný parameter -- objectID bol chybný"
-"Formulár komentára ma chybný 'cieľový' parameter  -- the objekt ID bol "
+msgstr ""
+"Formulár kometára má chybný výstupný parameter -- objectID bol "
+"chybnýFormulár komentára ma chybný 'cieľový' parameter  -- the objekt ID bol "
 "poškodený"
 
 #: contrib/comments/views/comments.py:254
@@ -318,7 +289,7 @@ 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/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
 "<h3>By %s:</h3>\n"
@@ -327,43 +298,43 @@ msgstr ""
 "<h3>Od %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr "Všetko"
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 #, fuzzy
 msgid "Any date"
 msgstr "Ľubovoľný dátum"
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "Dnes"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr "Posledných 7 dní"
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr "Tento mesiac"
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr "Tento rok"
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr "Áno"
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "Nie"
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr "Neznámy"
 
@@ -395,7 +366,7 @@ msgstr "záznam priebehu"
 msgid "log entries"
 msgstr "záznamy priebehu"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr "Všetky dátumy"
 
@@ -431,101 +402,101 @@ msgstr ""
 "Vaša emailová adresa nie je vaším užívateľským menon. Skuste toto '%s' "
 "namiesto nej"
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Spáva webu"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr "Vyber %s"
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr "Vyber %s na zmenu"
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, 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:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr "Môžete to zmeniť znovu nižšie."
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr "Môžete pridať ďalší %s nižšie."
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Pridaj"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr "Pridal %s"
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr "a"
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Zmenený"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr "Vymazaný"
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr "Polia neboli zmenené."
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, 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:508
+#: contrib/admin/views/main.py:499
 #, 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:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Zmeň"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, 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:631
+#: contrib/admin/views/main.py:620
 #, 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:660
+#: contrib/admin/views/main.py:649
 #, 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:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Ste si istý/á?"
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Zmena histórie:"
@@ -589,6 +560,10 @@ msgstr "Text"
 msgid "Time"
 msgstr "Čas"
 
+#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr ""
+
 #: contrib/admin/views/doc.py:285
 msgid "U.S. state (two uppercase letters)"
 msgstr "U.S. štát (dve veľké písmená)"
@@ -597,11 +572,11 @@ msgstr "U.S. štát (dve veľké písmená)"
 msgid "XML text"
 msgstr "XML text"
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -611,56 +586,6 @@ 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"
@@ -698,17 +623,25 @@ msgstr "Django web admin"
 msgid "Django administration"
 msgstr "Spravované Djangom"
 
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Meno užívateľa:"
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Chyba servera"
 
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Heslo:"
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Chyba servera (500)"
 
-#: 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/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/404.html:4
 #: contrib/admin/templates/admin/404.html:8
@@ -724,23 +657,59 @@ 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/change_form.html:20
-msgid "View on site"
-msgstr "Pozri tu"
+#: 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: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:33
+msgid "Change"
+msgstr "Zmeň"
 
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr "Objednávanie"
+#: 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:48
-msgid "Order:"
-msgstr "Objednávka:"
+#: 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/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Pridaj %(name)s"
+
+#: 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/delete_confirmation.html:7
 #, python-format
@@ -766,17 +735,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ano, som si istý"
 
-#: 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/base.html:23
-msgid "Log out"
-msgstr "Odhlásenie"
+#: 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/submit_line.html:3
 msgid "Delete"
@@ -799,11 +779,6 @@ 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
@@ -822,6 +797,7 @@ msgstr "Vaše heslo bolo zmenené."
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Obnova hesla"
@@ -1322,7 +1298,7 @@ msgid "password"
 msgstr "heslo"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1449,44 +1425,44 @@ msgstr "Švédsky"
 msgid "Simplified Chinese"
 msgstr "Zjednodušená činština "
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 #, fuzzy
 msgid "This field is required."
 msgstr "Toto pole nie je platné."
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, fuzzy, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Malé písmena tu nie sú povolené."
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, 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:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr "Poslaný súbor je prázdny."
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 #, 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:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Vložte celé kladné číslo."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Vložte celé číslo s hodnotou medzi 0 a 32,767."
@@ -1766,27 +1742,27 @@ msgstr "Prosím vložte platné %s."
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr "%(optname)s s týmto %(fieldname)s už existuje."
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr "Identifikátory oddeľte  čiarkami."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 " Podržte \"Control\", alebo \"Command\" na  Mac_u, na výber viac ako jednej "
 "položky."
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Vložte platné meno súboru."
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"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é"
 
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index c577f4918a..ebc660a94f 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 1d9cb0a81e..50a93cbc98 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Serbian (latin) translation v1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-23 00:05+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\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."
@@ -293,7 +293,7 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "Ovaj komentar nije koristio 'preview' ili 'post'"
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
 "<h3>By %s:</h3>\n"
@@ -302,40 +302,40 @@ msgstr ""
 "<h3>Od %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr "Sve"
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr "Bilo koji datum"
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 msgid "Today"
 msgstr "Danas"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr "Zadnjih sedam dana"
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr "Ovaj mesec"
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr "Ova godina"
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr "Da"
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "No"
 msgstr "Ne"
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr "Nepoznato"
 
@@ -367,7 +367,7 @@ msgstr "unos u dnevnik izmena"
 msgid "log entries"
 msgstr "unosi u dnevnik izmena"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr "Svi datumi"
 
@@ -401,99 +401,99 @@ msgstr "Korisnička imena ne mogu sadržati karakter '@'."
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "Vaša e-mail adresa nije koriničko ime. Probajte sa '%s'."
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 msgid "Site administration"
 msgstr "Administracija sajta"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr "Izaberi %s"
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr "Izaberi %s za izmenu"
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "Uspešno dodat %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr "Ispod ga možete ponovo izmeniti."
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr "Ispod možete dodati još jedan %s."
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, python-format
 msgid "Add %s"
 msgstr "Dodaj %s"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr "Dodat %s"
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr "i"
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Changed %s."
 msgstr "Izmenjen %s."
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr "Obrisan %s"
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr "Nijedno polje nije promenjeno."
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "Uspešno izmenjen: %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 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:546
+#: contrib/admin/views/main.py:537
 #, python-format
 msgid "Change %s"
 msgstr "Izmeni %s"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, 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:631
+#: contrib/admin/views/main.py:620
 #, 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:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Uspešno obrisan: %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr "Da li ste sigurni?"
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, python-format
 msgid "Change history: %s"
 msgstr "Istorija izmena: %s"
@@ -571,11 +571,11 @@ msgstr "U.S. država (dva VELIKA slova)"
 msgid "XML text"
 msgstr "XML tekst"
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -585,56 +585,6 @@ msgstr "XML tekst"
 msgid "Home"
 msgstr "Početna strana"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr "Dodaj %(name)s"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Dodaj"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Izmena"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Nemate prava da vršite izmene."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Skorije akcije"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Moje akcije"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Nema dostupnih"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Greška na serveru"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Greška na serveru (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-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."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -672,6 +622,65 @@ msgstr "Django administracija sajta"
 msgid "Django administration"
 msgstr "Django administracija"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Greška na serveru"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Greška na serveru (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+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."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Strana nije pronađena"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Tražena strana ne postoji."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Dodaj"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Izmena"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Nemate prava da vršite izmene."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Skorije akcije"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Moje akcije"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Nema dostupnih"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr "Dodaj %(name)s"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Korisničko ime:"
@@ -684,33 +693,17 @@ msgstr "Lozinka:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Da li ste <a href=\"/password_reset/\">zaboravili Vašu lozinku?</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Strana nije pronađena"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Dobrodošli,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Tražena strana ne postoji."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Izmeni lozinku"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr "Pogledaj na sajtu"
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Ispravite dole navedenu grešku."
-msgstr[1] "Ispravite dole navedene greške."
-msgstr[2] "Ispravite dole navedene greške."
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr "Redosled"
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr "Red:"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odjavi se"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -735,17 +728,29 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Da, siguran sam"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Dobrodošli,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr "Po %(title)s "
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Izmeni lozinku"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Pogledaj na sajtu"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odjavi se"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Ispravite dole navedenu grešku."
+msgstr[1] "Ispravite dole navedene greške."
+msgstr[2] "Ispravite dole navedene greške."
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Redosled"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Red:"
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -767,11 +772,6 @@ msgstr "Snimi i nastavi sa izmenama"
 msgid "Save"
 msgstr "Snimi"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr "Po %(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
@@ -790,6 +790,7 @@ msgstr "Vaša lozinka je izmenjena."
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Resetovanje lozinke"
@@ -1295,7 +1296,7 @@ msgid "password"
 msgstr "lozinka"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1421,41 +1422,41 @@ msgstr "Švedski"
 msgid "Simplified Chinese"
 msgstr "Kineski (pojednostavljen)"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 msgid "This field is required."
 msgstr "Obavezno polje."
 
-#: core/formfields.py:339
-#, python-format
-msgid "Ensure your text is less than %s character"
+#: core/formfields.py:336
+#, fuzzy, python-format
+msgid "Ensure your text is less than %s character."
 msgid_plural "Ensure your text is less than %s characters."
 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:344
+#: core/formfields.py:341
 msgid "Line breaks are not allowed here."
 msgstr "Novi redovi ovde nisu dozvoljeni."
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, 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:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr "Poslati fajl je prazan."
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 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:668
+#: core/formfields.py:664
 msgid "Enter a positive number."
 msgstr "Unesite pozitivan broj."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Unesite celi broj između 0 i 32,767."
 
@@ -1738,26 +1739,26 @@ msgstr "Unesite ispravan %s."
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr "%(optname)s sa ovim %(fieldname)s već postoji."
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr " Odvojite višestruke ID-ove zarezima."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 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:511
+#: core/meta/fields.py:508
 msgid "Enter a valid filename."
 msgstr "Unesite ispravno ime fajla."
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"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."
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo
index 3a9be99f22..728a8cc181 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 ae3c42826b..50f71090a3 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-23 00:06+0100\n"
+"POT-Creation-Date: 2005-11-25 17:27-0600\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,49 +278,49 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "måndag"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "nov"
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -352,7 +352,7 @@ msgstr "loggpost"
 msgid "log entries"
 msgstr "loggpost"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -382,100 +382,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Administration för Django"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Lägg till"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Ändra"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Ändra"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Ändra lösenord"
@@ -556,11 +556,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -570,56 +570,6 @@ msgstr ""
 msgid "Home"
 msgstr "Hem"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "Lägg till"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "Lägg till"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "Ändra"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "Du har inte rättigheter att ändra något."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "Senaste händelserna"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "Mina händelser"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "Inga tillgängliga"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Serverfel"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Serverfel (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Serverfel <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 ""
-"Ett fel har uppstått. Sidadministratören har meddelats via e-post och felet "
-"bör åtgärdas snart. Tack för ditt tålamod."
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -657,6 +607,65 @@ msgstr "Djangos sidadministration"
 msgid "Django administration"
 msgstr "Administration för Django"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Serverfel"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Serverfel (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Serverfel <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 ""
+"Ett fel har uppstått. Sidadministratören har meddelats via e-post och felet "
+"bör åtgärdas snart. Tack för ditt tålamod."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Sidan kunde inte hittas"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Vi är ledsna, men den efterfrågade sidan kunde inte hittas."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "Lägg till"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "Ändra"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "Du har inte rättigheter att ändra något."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "Senaste händelserna"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "Mina händelser"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "Inga tillgängliga"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "Lägg till"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "Användarnamn:"
@@ -669,32 +678,17 @@ msgstr "Lösenord:"
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "Har du <a href=\"/password_reset/\">glömt ditt lösenord</a>?"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Sidan kunde inte hittas"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Välkommen,"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Vi är ledsna, men den efterfrågade sidan kunde inte hittas."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Ändra lösenord"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Logga ut"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -720,17 +714,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ja, jag är säker"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Välkommen,"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Ändra lösenord"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Logga ut"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -753,11 +758,6 @@ msgstr ""
 msgid "Save"
 msgstr "aktiv"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -776,6 +776,7 @@ msgstr "Ditt lösenord har ändrats."
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "Nollställ lösenordet"
@@ -1267,7 +1268,7 @@ msgid "password"
 msgstr "lösenord"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1395,44 +1396,44 @@ msgstr ""
 msgid "Simplified Chinese"
 msgstr "Förenklad kinesiska"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 #, fuzzy
 msgid "This field is required."
 msgstr "Det här fältet är ogiltigt."
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+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:344
+#: core/formfields.py:341
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "Små bokstäver är inte tillåtna här."
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Fyll i ett heltal."
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "Fyll i ett heltal."
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Fyll i ett heltal."
@@ -1713,26 +1714,26 @@ msgstr "Var god fyll i ett giltigt IP-nummer."
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr " Separera flera ID:n med kommatecken."
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 " Håll ner \"Control\", eller \"Command\" på en Mac, för att välja mer än en."
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "Fyll i en giltig e-postadress."
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 msgstr[1] ""
 
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index 669bc72cea..05b11942c2 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 fd108e2492..1b66e0a9d7 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-23 00:05+0100\n"
+"POT-Creation-Date: 2005-11-25 17:26-0600\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,49 +280,49 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
 #, 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
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
 msgid "Any date"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
 #, fuzzy
 msgid "Today"
 msgstr "星期一"
 
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
 msgid "Past 7 days"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
 msgid "This month"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
 msgid "This year"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 msgid "Yes"
 msgstr ""
 
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
 #, fuzzy
 msgid "No"
 msgstr "十一月"
 
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
 msgid "Unknown"
 msgstr ""
 
@@ -354,7 +354,7 @@ msgstr "日志记录"
 msgid "log entries"
 msgstr "日志记录"
 
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:243
 msgid "All dates"
 msgstr ""
 
@@ -384,100 +384,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
 #, fuzzy
 msgid "Site administration"
 msgstr "Django管理员"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:412
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:442
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "增加"
 
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:462
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:460
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "修改"
 
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:462
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:465
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:490
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:499
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:537
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "修改"
 
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:615
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:620
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:649
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:652
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:667
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "修改口令"
@@ -558,11 +558,11 @@ msgstr ""
 msgid "XML text"
 msgstr ""
 
-#: 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/500.html:4
+#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:12
 #: 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
@@ -572,56 +572,6 @@ msgstr ""
 msgid "Home"
 msgstr "首页"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, fuzzy, python-format
-msgid "Add %(name)s"
-msgstr "增加"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr "增加"
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr "修改"
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr "你无权修改任何东西。"
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr "最近动作"
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr "我的动作"
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr "无可用的"
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "服务器错误"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "服务器错误(500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "服务器错误 <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 ""
-"存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢"
-"谢你的关心。"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/change_form.html:19
 msgid "History"
@@ -657,6 +607,65 @@ msgstr "Django管理站点"
 msgid "Django administration"
 msgstr "Django管理员"
 
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "服务器错误"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "服务器错误(500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "服务器错误 <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 ""
+"存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢"
+"谢你的关心。"
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "页面没有找到"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "很报歉，请求页面无法找到。"
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:14
+msgid "Add"
+msgstr "增加"
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr "修改"
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr "你无权修改任何东西。"
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr "最近动作"
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr "我的动作"
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr "无可用的"
+
+#: contrib/admin/templates/admin/change_list.html:10
+#, fuzzy, python-format
+msgid "Add %(name)s"
+msgstr "增加"
+
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
 msgstr "用户名："
@@ -669,32 +678,17 @@ msgstr "口令："
 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?"
 msgstr "<a href=\"/password_reset/\">忘记你的密码</a>？"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "页面没有找到"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "欢迎，"
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "很报歉，请求页面无法找到。"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "修改口令"
 
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ""
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "注销"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
@@ -718,17 +712,28 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "是的，我确定"
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "欢迎，"
+#: contrib/admin/templates/admin/filter.html:1
+#, python-format
+msgid " By %(title)s "
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "修改口令"
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr ""
 
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "注销"
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr ""
 
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
@@ -751,11 +756,6 @@ msgstr ""
 msgid "Save"
 msgstr "活动"
 
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
 #: 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
@@ -774,6 +774,7 @@ msgstr "你的口令已经被修改。"
 
 #: contrib/admin/templates/registration/password_reset_form.html:4
 #: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
 #: contrib/admin/templates/registration/password_reset_done.html:4
 msgid "Password reset"
 msgstr "口令重设"
@@ -1249,7 +1250,7 @@ msgid "password"
 msgstr "口令"
 
 #: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
 msgstr ""
 
 #: models/auth.py:38
@@ -1375,43 +1376,43 @@ msgstr "瑞典语"
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
 #, fuzzy
 msgid "This field is required."
 msgstr "这个字段无效。"
 
-#: core/formfields.py:339
+#: core/formfields.py:336
 #, python-format
-msgid "Ensure your text is less than %s character"
+msgid "Ensure your text is less than %s character."
 msgid_plural "Ensure your text is less than %s characters."
 msgstr[0] ""
 
-#: core/formfields.py:344
+#: core/formfields.py:341
 #, fuzzy
 msgid "Line breaks are not allowed here."
 msgstr "这里不允许小写字母。"
 
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
 #, python-format
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr ""
 
-#: core/formfields.py:605
+#: core/formfields.py:601
 msgid "The submitted file is empty."
 msgstr ""
 
-#: core/formfields.py:659
+#: core/formfields.py:655
 #, fuzzy
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "输入整数。"
 
-#: core/formfields.py:668
+#: core/formfields.py:664
 #, fuzzy
 msgid "Enter a positive number."
 msgstr "输入整数。"
 
-#: core/formfields.py:677
+#: core/formfields.py:673
 #, fuzzy
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "输入整数。"
@@ -1676,25 +1677,25 @@ msgstr "请输入一个有效的IP地址。"
 msgid "%(optname)s with this %(fieldname)s already exists."
 msgstr ""
 
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
 msgid " Separate multiple IDs with commas."
 msgstr " 用逗号分隔多个ID。"
 
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr " 按下 \"Control\"，或者在Mac上按 \"Command\" 来选择一个或多个值。"
 
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
 #, fuzzy
 msgid "Enter a valid filename."
 msgstr "输入一个有效的邮件地址。"
 
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
 #, 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"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] ""
 
 #, fuzzy