From 733e5265fe79dad220a527ebd5d023318b2c6a67 Mon Sep 17 00:00:00 2001
From: Georg Bauer <gb@hugo.westfalen.de>
Date: Fri, 25 Nov 2005 23:25:59 +0000
Subject: [PATCH] updated all message files for the new_admin merge

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1436 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/conf/locale/bn/LC_MESSAGES/django.mo   | Bin 26898 -> 26898 bytes
 django/conf/locale/bn/LC_MESSAGES/django.po   | 283 +++++++--------
 django/conf/locale/cs/LC_MESSAGES/django.mo   | Bin 27135 -> 27136 bytes
 django/conf/locale/cs/LC_MESSAGES/django.po   | 285 +++++++--------
 django/conf/locale/cy/LC_MESSAGES/django.mo   | Bin 16972 -> 16972 bytes
 django/conf/locale/cy/LC_MESSAGES/django.po   | 283 +++++++--------
 django/conf/locale/da/LC_MESSAGES/django.mo   | Bin 16807 -> 16807 bytes
 django/conf/locale/da/LC_MESSAGES/django.po   | 283 +++++++--------
 django/conf/locale/de/LC_MESSAGES/django.mo   | Bin 45469 -> 30637 bytes
 django/conf/locale/de/LC_MESSAGES/django.po   | 293 ++++++++--------
 django/conf/locale/en/LC_MESSAGES/django.mo   | Bin 536 -> 536 bytes
 django/conf/locale/en/LC_MESSAGES/django.po   | 267 +++++++-------
 django/conf/locale/es/LC_MESSAGES/django.mo   | Bin 5203 -> 5203 bytes
 django/conf/locale/es/LC_MESSAGES/django.po   | 287 +++++++--------
 django/conf/locale/fr/LC_MESSAGES/django.mo   | Bin 17427 -> 17427 bytes
 django/conf/locale/fr/LC_MESSAGES/django.po   | 287 +++++++--------
 django/conf/locale/gl/LC_MESSAGES/django.mo   | Bin 5322 -> 5322 bytes
 django/conf/locale/gl/LC_MESSAGES/django.po   | 285 +++++++--------
 django/conf/locale/is/LC_MESSAGES/django.mo   | Bin 17726 -> 17726 bytes
 django/conf/locale/is/LC_MESSAGES/django.po   | 283 +++++++--------
 django/conf/locale/it/LC_MESSAGES/django.mo   | Bin 16501 -> 16501 bytes
 django/conf/locale/it/LC_MESSAGES/django.po   | 285 +++++++--------
 django/conf/locale/no/LC_MESSAGES/django.mo   | Bin 24054 -> 24054 bytes
 django/conf/locale/no/LC_MESSAGES/django.po   | 283 +++++++--------
 .../conf/locale/pt_BR/LC_MESSAGES/django.mo   | Bin 16330 -> 16330 bytes
 .../conf/locale/pt_BR/LC_MESSAGES/django.po   | 285 +++++++--------
 django/conf/locale/ro/LC_MESSAGES/django.mo   | Bin 17096 -> 17096 bytes
 django/conf/locale/ro/LC_MESSAGES/django.po   | 283 +++++++--------
 django/conf/locale/ru/LC_MESSAGES/django.mo   | Bin 13714 -> 13714 bytes
 django/conf/locale/ru/LC_MESSAGES/django.po   | 285 +++++++--------
 django/conf/locale/sk/LC_MESSAGES/django.mo   | Bin 39478 -> 28112 bytes
 django/conf/locale/sk/LC_MESSAGES/django.po   | 326 ++++++++----------
 django/conf/locale/sr/LC_MESSAGES/django.mo   | Bin 29588 -> 29365 bytes
 django/conf/locale/sr/LC_MESSAGES/django.po   | 287 +++++++--------
 django/conf/locale/sv/LC_MESSAGES/django.mo   | Bin 17616 -> 17616 bytes
 django/conf/locale/sv/LC_MESSAGES/django.po   | 283 +++++++--------
 .../conf/locale/zh_CN/LC_MESSAGES/django.mo   | Bin 16844 -> 16844 bytes
 .../conf/locale/zh_CN/LC_MESSAGES/django.po   | 283 +++++++--------
 38 files changed, 2710 insertions(+), 2726 deletions(-)

diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index f8d41709956b5b242934ec9f18fed9c741f7aece..d7e8ce269eb7f2454ef4c9c5ea6944668255f4b5 100644
GIT binary patch
delta 25
hcmbPqiE+{;#tp(+T&4<!=2k}Lx&~&OWwpNA0RU{S2jTz#

delta 25
hcmbPqiE+{;#tp(+T*e9p237`U+6IQ3WwpNA0RU^{2hIQh

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 42d1fa64ccb7536472b60803578d814eb2d1b7d0..1ba08c5b7f4e2d5951de3d04026b5cdde6faf1b0 100644
GIT binary patch
delta 3621
zcmXZd3v|zA9LMqJZx^%8Wt-bB*u`cWv$3&@#N;w;!;oQ;>(FwJ3M<ubnlp*0ol`lA
zj$=*~AzjGH91ce=CAY9#N3|mkmBpD$@6Ucur+Pi#=lA<R&-eL0&+pljQ=YQZp6#7|
zoN{B##3W;u;$@tM#odi*fk!b2FQ6a(g-!9EjUS;mv2U_5tuX*YF%knX3!C9!48f6@
zfz#0k*CrdM@r4a^XyC0Fj^AJ){(`}H30vS@8=Dj+B@RI)9EMNfo2YU2U<4jOE#M03
z{lD$=2dD%+Jsfuh&3hR0G#$YhhNEyYmLQ8X$8b0{Aip(3db*ZkTjI^A=lif12BsR*
z6$hXanTuJt97o_GjKQ`}n)^Z)R?smH$KoaAUz5gYnqW4z!!l$Jvl@HjQH;eV1cexn
zLvb;V({rR~CMMmOC>)Ji=zJW4&et@ww+~T!>B9!8g#H+f!RUp(Y=0(>C(gz$_%Z5t
z2T*%`7`5_~s6Bp+O29kQ-O@BHCeB8tbj)TNGwHaB8X$){DWL+?026II1)CGkK}}GK
z9k2>j;{EsxUdBEc!~f!NGKOIV#^ZVnz$1;a|7U6Fa9l&Jv<`LHZee3(P!;jvgy~Q=
zM<o)58YtfOr`b3g_4_<*iAA=*1pSFiQ41|s%>3qE8p?DvYQ@!hfCo`8o<L1>!N$L%
zN`A-2_w4g0s6+$$x`~HaBQTi$SQ}@c7LbjO1|C5}6HUZ6I0H4%BGih@QSZHns>mm(
z1U8}){v7q*c5H<|peFdqKK~8%yK7kMG3F-T!JqrF|N7y+Y-7gYaZJSM0q*I|!$RVX
z$d_jxqY_MEqhG?o7=gP{37thHUV}kci%R?+wnxuE_q{Mwf}I9Zf0aIo4y|Mimf-}{
z05!-dHMh_kV+XnKC1N;n3TmrzQ41M|TEKMV%QLG`l|6(?>;x*IbEqx3?%2kEsEqsv
zySB$D;yBbH%E1m;h`zW0HQ^hmf#0!lrHwyDZN+D(h3rBldIWv&3~Ec98vDX^^rfR7
z+u<YJifx9t7sdh9scw?v-sM54mBgYd(F2uW9>(DdsEI34E3LvL{LVhVfnD_d2M%>J
zNyCo3&=+H{2=#+9<dZgEVl>uaCk!0sUO?Tj8}S&_#EY>lZo&ktMr~moj>V|qB!>&p
zoB2&G4VC0i<gzliQ6=w^Ys_nyjsf@;`r=;n$AjpHCs12(-g*`J5>1_b9+&5ipN!4u
z?}dTb4~z8u=hDz#ZN^gk9-CuozFWd<)af0Kny3VI7+*mp{wiu<2U(<9hU4%w>iupb
z+?y{ATM$pe)>wj$GFePx1+K)-7(SBA0sCWrd<!+u0qargDb&O@s7l;GjdvThMGdI4
z6h6xRqm_zY#4}NqoHL60YX$S@&;SeVgEG{FOHq|rg^9Qpd*Wf_FQ{oiotfkU_pIcj
z5_lc8(q$Net8M=l)FIuCE%Da^>K{qt4?2{Q-)MJ$mevRiqCWwHu@7=QOg_%QHCT?i
zy|m&bs0vo0m&ceNaWC<4PM!|$if7$FPTMer_@+bSJdFr8>?5qlIk>XWUBLrX0)FG&
z3WcF67K2JS0ad9K48;u8L<OjX=cBghZPd+KiJ7<w^?T<U4GmCdJMN;c)cdH?x0&FU
zFa|YXI%-dcp$49cFJlRE%bF{wuch-u_w!6aO<ahYXD;e@3y`zmm@*nV%}a17F2i^{
zg_H3ireRSLtHSrO8(zm$44UL7HVAWw3o#SdV=UI77UX%3y9GNUyJCtkTHpT;8rr+l
zSb_iI6kNpY{qZ8|^XvG$d$FXW2Fk~NxB?UK80t*aW8(x2!WU?Epb|Ax-LsK~0}01t
zzC&Xj4W0g5s7lnMO4Wd&=rygeRHg%}bWu1HyP{TDY5RAfO1&R-xXz)rqS<u!Vrzri
z!hF<On}SXTjR!R5VNcT6#8s$?wxAOG)>@4^jE6B2FJKHdU=(&DD{WymYO9uG9A3h3
z^eJ{L8io2irxsIxO*D@VO|%F-xWv9tVf#NoANtp!uHGut%C@2I`aP(`PND|BZsUJ2
zgxF`6+aHRph~rU}$ecy})ySnI87HGJu0rkkhuAm~>SEbr<HM-;PNNo3WBYH|{=3+e
z{`;uJ&1`pTd{JLj1nL4xbZ97}EbDO8N{Ube%tcMS0JXAm+h2)Z#B0zS*P%+h0kz_4
z)C8wc<J4knyosu?{)y+moqi!_!aUt~UQBwim4C0u9_d*<)00wq?;P{=7hV4cx;wW_

delta 3619
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

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 99232e20712b14a77ca040133841c2b22008e244..679b9c1a491ec851e69e16648edd1afd5ce53771 100644
GIT binary patch
delta 25
gcmX@p!g!{Ial;o4E>i_Vb1NfrT?4bt|1|t00ee{ptN;K2

delta 25
gcmX@p!g!{Ial;o4E@K4)11keFZ3Dy2|1|t00eX)Jm;e9(

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 222fa4af32670515b5ec3cb44391e4d1eca6766b..ef0fcc7e973a493738f1789135381e0b09f4b153 100644
GIT binary patch
delta 25
gcmZ49%(%Rnaf7rbm#KoGxs{Q*u7TNRRm~;|0Ae-<;{X5v

delta 25
gcmZ49%(%Rnaf7rbm$8C@ft7)owt?YhRm~;|0AXwf&j0`b

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 72ba0c03edd661503f76032fdafc215f29b405fa..e11050075db06abcff02e1c859a928285ff0dc57 100644
GIT binary patch
delta 6311
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

delta 7600
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
Yi1=@J-BR1%ZM>b+%&N}+WRH#iFGz>><^TWy

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 7199e536defd92ab01ca70741856fc10746f592c..21cff98d4407e8a2e980e0d3b24980121718f759 100644
GIT binary patch
delta 22
dcmbQiGJ|D<3?rARf}y#Uk(sW6*<>}wPXIoM1+D-9

delta 22
dcmbQiGJ|D<3?rAZf`NgRfvL8E;bb+&PXImA1)2Z=

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 a3613a1dcb30e0886afbfccc00e5147231e65f18..148615dca3ca85cb8a75e6e03e85f784d5278487 100644
GIT binary patch
delta 23
ecmcbtaam)-J8mvh1w(TyBXeB?v&}!aqd5R(nFqE2

delta 23
ecmcbtaam)-J8mvx1p@;s15<4S!_7aqqd5R&#s{GQ

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 0cec8eb6885115451c89109ad2ba1b160d538d5f..0b059f944a4b91f9a1340f3eddcbe6a05abaed2a 100644
GIT binary patch
delta 25
gcmbQ-!8o~tal;vPE>i_Vb1NfrT?4bt*VJug0B!RJ;s5{u

delta 25
gcmbQ-!8o~tal;vPE@K4)11kelZ3Dy2*VJug0Bs-#%>V!Z

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 3ad4bbae2caf4064deebfbd4789a66bed0f6bad8..ea9a66606b3242f1a1162148b8116973f24cbf40 100644
GIT binary patch
delta 23
fcmX@5c}jD`J8mvh1w(TyBQsqCv&}!aFL3|>W*i6{

delta 23
fcmX@5c}jD`J8mvx1p@;s15<4S!_7aqFL3|>Wl{(T

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 5f9e335d9c58f228b1ea3d131afb04dd867b8f9f..4030c1bd35b5d2067869b42854c60fb9500e94c0 100644
GIT binary patch
delta 25
gcmdnj#kjAFaYMf*m#KoGxs{Q*u7TO+nVL(b0deaHEdT%j

delta 25
gcmdnj#kjAFaYMf*m$8C@ft7)owt?a1nVL(b0dXM+82|tP

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 4cec17c1d4560181f1644ad1e3636477cca73955..773a38fac561e30e9524ad598344f524c8bc559b 100644
GIT binary patch
delta 25
hcmey`!1%R+al>_WE>i_Vb1NfrT?4bt57nng004j`2>$>8

delta 25
hcmey`!1%R+al>_WE@K4)11kelZ3Dy257nng004hd2<iX;

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 efb1b10e5c5597686f6a52e4a9a5ad75d8d18f41..b76367ee90e71c2681c1c8b0ec2e1e4ed4817c90 100644
GIT binary patch
delta 25
gcmeyioAKLj#tr#aT&4<!=2k}Lx&~&OE3Imk0fQU}!2kdN

delta 25
gcmeyioAKLj#tr#aT*e9p237`U+6IQ3E3Imk0fJHptpET3

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 4655e7be3f97e0f20dec82d8dc4e9eda33bea3c3..bd74a9d34f0625d06960aa13e562df28d18bc030 100644
GIT binary patch
delta 23
ecmX?Af2w}NQZ+791w(TyBXeB?v(4+(q$L4vx(CMq

delta 23
ecmX?Af2w}NQZ+7P1p@;s15<4S!_Di}q$L4u=LfO?

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 01c98da1a7d8ea444fdf695d5832e947937907ab..6fb17fe14f59542ea97085d4b6c4c23769ea221c 100644
GIT binary patch
delta 21
ccmX@n%6Oucal=dvHZuhS11qD=^EEW309Q%|^8f$<

delta 21
ccmX@n%6Oucal=dvHe&??11p2g^EEW309PFb?f?J)

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 2a59acdee87a0ca9fc1cca7b72f53cfd24856755..13e42dcf5108cb59afc6ada23f791dbc20494933 100644
GIT binary patch
delta 23
ecmbP~Jt=#Gnj)8}f}y#Uk-4sc*=7U9BoP2t4F+id

delta 23
ecmbP~Jt=#Gnj)96f`NgRfvL8E;bsHHBoP2sItEk#

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 26d18a6cec6b73283e855b7ca8222ac59881dd67..212ac9cdffd3d5124ee0f39fa49d065ed0a89e7c 100644
GIT binary patch
delta 8090
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

delta 8028
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
K{U6$9<NgB+!RPb<

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 c577f4918a69eb1a903b8b54b109574f7417b2dd..ebc660a94f4822eff89da8b34a50b64d51060827 100644
GIT binary patch
delta 7595
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

delta 7823
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

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 3a9be99f22c1b6f279c7f8677c9b885559492574..728a8cc1811c3d61e91e0f51b161bfec97546c27 100644
GIT binary patch
delta 25
gcmcc6$#|iYal;=?E>i_Vb1NfrT?4btY+9$J0D86vP5=M^

delta 25
gcmcc6$#|iYal;=?E@K4)11keFZ3Dy2Y+9$J0D0^PIsgCw

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 669bc72ceaab9e5397e241fcc5fd5d0374fb6d7e..05b11942c29284e1326ddcaa568c8315f9e216a4 100644
GIT binary patch
delta 25
hcmX@p%y_1mal;KwE>i_Vb1Ne=T?4btk2GJ20|0sj2@L=M

delta 25
hcmX@p%y_1mal;KwE@K4)11kelZ3Dy2k2GJ20|0qD2>Ad2

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