diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index 714f5b051f..243e8b63df 100644
Binary files a/django/conf/locale/bn/LC_MESSAGES/django.mo and b/django/conf/locale/bn/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po
index 4a57076b97..ed24a7f1c7 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-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:46+0100\n"
 "PO-Revision-Date: 2005-11-12 20:05+0530\n"
 "Last-Translator: Baishampayan Ghose <b.ghose@gnu.org.in>\n"
 "Language-Team: Ankur Bangla <core@bengalinux.org>\n"
@@ -382,100 +382,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 #, fuzzy
 msgid "Site administration"
 msgstr "জ্যাঙ্গো পরিচালনা"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "যোগ করুন"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "পরিবর্তন"
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "পরিবর্তন"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "পাসওয়ার্ড পরিবর্তন করুন"
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index 666f9256ac..9114a453d4 100644
Binary files a/django/conf/locale/cs/LC_MESSAGES/django.mo and b/django/conf/locale/cs/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po
index 67285651db..9572941914 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-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:45+0100\n"
 "PO-Revision-Date: 2005-11-28 12:00+0100\n"
 "Last-Translator: Radek Svarz <translate@svarz.cz>\n"
 "Language-Team: Czech\n"
@@ -404,100 +404,100 @@ 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:49
+#: contrib/admin/views/main.py:52
 msgid "Site administration"
 msgstr "Django správa"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr "Vybrat %s"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr "Vyberte %s pro změnu"
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, 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:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr "Můžete to opět upravit níže."
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr "Můžete přidat další %s níže."
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, python-format
 msgid "Add %s"
 msgstr "%s: přidat"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr "Záznam %s byl přidán."
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr "a"
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Changed %s."
 msgstr "%s: změněno"
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr "Záznam %s byl smazán."
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr "Nebyly změněny žádné pole."
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, 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:494
+#: contrib/admin/views/main.py:497
 #, 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:532
+#: contrib/admin/views/main.py:535
 #, python-format
 msgid "Change %s"
 msgstr "%s: změnit"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, 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:615
+#: contrib/admin/views/main.py:618
 #, 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:644
+#: contrib/admin/views/main.py:647
 #, 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:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr "Jste si jist(á)?"
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, python-format
 msgid "Change history: %s"
 msgstr "Historie změn: %s"
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index 962b38503e..8fa71ab397 100644
Binary files a/django/conf/locale/cy/LC_MESSAGES/django.mo and b/django/conf/locale/cy/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po
index 7cee0e500b..a5011e2b01 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-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:46+0100\n"
 "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
 "Last-Translator: Jason Davies <jason@jasondavies.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -370,99 +370,99 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 msgid "Site administration"
 msgstr "Gweinyddiad safle"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr "Dewis %s"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr "Dewis %s i newid"
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, python-format
 msgid "Add %s"
 msgstr "Ychwanegu %s"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr "Ychwanegwyd %s."
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr "ac"
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Changed %s."
 msgstr "Newidiwyd %s."
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr "Dileuwyd %s."
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, python-format
 msgid "Change %s"
 msgstr "Newidio %s"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr "Ydych yn sicr?"
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, python-format
 msgid "Change history: %s"
 msgstr "Hanes newid: %s"
@@ -929,8 +929,8 @@ msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
-"Yn dangos y fath-cynnwys a'r ID unigryw ar gyfer tudalennau sy'n cynrychioli"
-"gwrthrych sengl."
+"Yn dangos y fath-cynnwys a'r ID unigryw ar gyfer tudalennau sy'n "
+"cynrychioligwrthrych sengl."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:25
 msgid "Edit this object (current window)"
diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo
index 299c257f9c..871aa4d6a5 100644
Binary files a/django/conf/locale/da/LC_MESSAGES/django.mo and b/django/conf/locale/da/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po
index d693acfd98..00633884f6 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-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Morten Bagai <m@bagai.com>\n"
 "Language-Team: Danish\n"
@@ -382,100 +382,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 #, fuzzy
 msgid "Site administration"
 msgstr "Django administration"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Tilføj"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Ændre"
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Ændre"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Ændre adgangskode"
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index 13938797b8..a1682ec199 100644
Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index b72dc69b1b..8403db5cef 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-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:46+0100\n"
 "PO-Revision-Date: 2005-10-08 00:03+0200\n"
 "Last-Translator: Georg Bauer <gb@bofh.ms>\n"
 "MIME-Version: 1.0\n"
@@ -398,69 +398,69 @@ msgstr ""
 "Die eMail-Adresse ist nicht der Benutzername. Bitte '%s' stattdessen "
 "versuchen."
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 msgid "Site administration"
 msgstr "Website Verwaltung"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr "%s ausw�hlen"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr "%s zur �nderung ausw�hlen"
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, 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:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr "Das Element kann jetzt weiter ge�ndert werden."
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, 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:437
+#: contrib/admin/views/main.py:440
 #, python-format
 msgid "Add %s"
 msgstr "%s zuf�gen"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr "%s hinzugef�gt."
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr "und"
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Changed %s."
 msgstr "%s ge�ndert"
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr "%s gel�scht."
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr "Keine Felder ge�ndert."
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, 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:494
+#: contrib/admin/views/main.py:497
 #, 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:532
+#: contrib/admin/views/main.py:535
 #, python-format
 msgid "Change %s"
 msgstr "%s �ndern"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, 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:615
+#: contrib/admin/views/main.py:618
 #, 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:644
+#: contrib/admin/views/main.py:647
 #, 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:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr "Sicher? Ganz sicher?"
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, python-format
 msgid "Change history: %s"
 msgstr "�nderungsgeschichte: %s"
diff --git a/django/conf/locale/de/LC_MESSAGES/djangojs.mo b/django/conf/locale/de/LC_MESSAGES/djangojs.mo
index e0907d9791..51058671b4 100644
Binary files a/django/conf/locale/de/LC_MESSAGES/djangojs.mo and b/django/conf/locale/de/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/de/LC_MESSAGES/djangojs.po b/django/conf/locale/de/LC_MESSAGES/djangojs.po
index 9188debace..405f48f5bd 100644
--- a/django/conf/locale/de/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/de/LC_MESSAGES/djangojs.po
@@ -7,13 +7,43 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django JavaScript 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-06 21:32+0100\n"
+"POT-Creation-Date: 2005-12-09 11:41+0100\n"
 "PO-Revision-Date: 2005-12-04 13:21+0100\n"
 "Last-Translator: Georg Bauer <gb@bofh.ms>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: contrib/admin/media/js/SelectFilter2.js:33
+#, perl-format
+msgid "Available %s"
+msgstr "Verf�gbare %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:41
+msgid "Choose all"
+msgstr "alles ausw�hlen"
+
+#: contrib/admin/media/js/SelectFilter2.js:46
+msgid "Add"
+msgstr "Zuf�gen"
+
+#: contrib/admin/media/js/SelectFilter2.js:48
+msgid "Remove"
+msgstr "Entfernen"
+
+#: contrib/admin/media/js/SelectFilter2.js:53
+#, perl-format
+msgid "Chosen %s"
+msgstr "Ausgew�hlte %s"
+
+#: contrib/admin/media/js/SelectFilter2.js:54
+msgid "Select your choice(s) and click "
+msgstr "Gew�nschte Auswahl treffen und "
+
+#: contrib/admin/media/js/SelectFilter2.js:59
+msgid "Clear all"
+msgstr "alles abw�hlen"
+
 #: contrib/admin/media/js/dateparse.js:26
 #: contrib/admin/media/js/calendar.js:24
 msgid ""
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index ccf56f5124..ccc4204353 100644
Binary files a/django/conf/locale/en/LC_MESSAGES/django.mo and b/django/conf/locale/en/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index b2be22fa58..9a0393e522 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-12-04 14:55+0100\n"
+"POT-Creation-Date: 2005-12-09 11:44+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -365,99 +365,99 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 msgid "Site administration"
 msgstr ""
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, python-format
 msgid "Add %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Changed %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, python-format
 msgid "Change %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, python-format
 msgid "Change history: %s"
 msgstr ""
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index c3771b702b..f5c37ecd48 100644
Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index a85921ec97..3b5ed09b4d 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:45+0100\n"
 "PO-Revision-Date: 2005-11-28 15:28+0000\n"
 "Last-Translator: Ricardo Javier Cardenes Medina <ricardo.cardenes@gmail."
 "com>\n"
@@ -399,100 +399,100 @@ msgstr ""
 "Su direcci�n de correo no es su nombre de usuario. Pruebe con '%s' en su "
 "lugar."
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 msgid "Site administration"
 msgstr "Sitio administrativo"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr "Escoja %s"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr "Escoja %s para modificar"
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "Se a�adi� con �xito el %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr "Puede editarlo de nuevo debajo."
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr "Puede agregar otro %s debajo."
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, python-format
 msgid "Add %s"
 msgstr "Agregar %s"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr "Agregado %s."
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr "y"
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Changed %s."
 msgstr "Modificado %s."
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr "Borrado %s."
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr "No cambi� ning�n campo."
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "Se modific� con �xito el %(name)s \"%(obj)s."
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "Se agreg� con �xito el %(name)s \"%(obj)s. Puede editarlo de nuevo debajo."
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Uno o m�s %(fieldname)s en %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Uno o m�s %(fieldname)s en %(name)s:"
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Se elimin� con �xito el %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr "�Est� seguro?"
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, python-format
 msgid "Change history: %s"
 msgstr "Modificar hist�rico: %s"
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index bde556408c..90a54a2b5f 100644
Binary files a/django/conf/locale/fr/LC_MESSAGES/django.mo and b/django/conf/locale/fr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index 98f3476b5c..7c930fa6f7 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-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:46+0100\n"
 "PO-Revision-Date: 2005-10-18 12:27+0200\n"
 "Last-Translator: Laurent Rahuel <laurent.rahuel@gmail.com>\n"
 "Language-Team: fran�ais <fr@li.org>\n"
@@ -381,100 +381,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 #, fuzzy
 msgid "Site administration"
 msgstr "Administration de Django"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Ajouter"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Modifier"
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Modifier"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Modifier votre mot de passe"
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index 26028e9295..a98ea5433c 100644
Binary files a/django/conf/locale/gl/LC_MESSAGES/django.mo and b/django/conf/locale/gl/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index a5dc5cf15d..85800a6ba9 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-12-04 14:55+0100\n"
+"POT-Creation-Date: 2005-12-09 11:45+0100\n"
 "PO-Revision-Date: 2005-12-08 15:03+0100\n"
 "Last-Translator: Afonso Fernández Nogueira <fonzzo.django@gmail.com>\n"
 "Language-Team: Galego\n"
@@ -237,13 +237,13 @@ msgid_plural ""
 "\n"
 "%(text)s"
 msgstr[0] ""
-"Este comentario foi publicado por un usuario que ten publicados menos de "
-"%(count)s comentario:\n"
+"Este comentario foi publicado por un usuario que ten publicados menos de %"
+"(count)s comentario:\n"
 "\n"
 "%(text)s"
 msgstr[1] ""
-"Este comentario foi publicado por un usuario que ten publicados menos de "
-"%(count)s comentarios:\n"
+"Este comentario foi publicado por un usuario que ten publicados menos de %"
+"(count)s comentarios:\n"
 "\n"
 "%(text)s"
 
@@ -394,69 +394,69 @@ msgstr ""
 "O seu enderezo de correo electrónico non é o seu nome de usuario. Probe con "
 "'%s'."
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 msgid "Site administration"
 msgstr "Administración do sitio web"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr "Seleccione un elemento %s"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr "Seleccione un elemento %s para modificar"
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "O elemento \"%(obj)s\" de tipo %(name)s engadiuse correctamente."
 
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr "Pode volver editalo embaixo."
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr "Pode engadir outro elemento %s embaixo."
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, python-format
 msgid "Add %s"
 msgstr "Engadir un elemento %s"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr "Engadido(s) %s."
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr "e"
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Changed %s."
 msgstr "Modificado(s) %s."
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr "Eliminado(s) %s."
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr "Non se modificou ningún campo."
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "O elemento %(name)s \"%(obj)s\"  modificouse correctamente."
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -464,31 +464,31 @@ msgstr ""
 "O elemento %(name)s \"%(obj)s\" engadiuse correctamente. Pode volver editalo "
 "embaixo."
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "Un ou máis %(fieldname)s no elemento %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "Un ou máis %(fieldname)s no elemento %(name)s:"
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "O elemento %(name)s \"%(obj)s\" eliminouse correctamente."
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr "Está seguro?"
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, python-format
 msgid "Change history: %s"
 msgstr "Histórico de cambios: %s"
@@ -1785,8 +1785,8 @@ msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
 "Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] "Insira IDs de %(self)s válidas. O valor %(value)r non é válido."
-msgstr[1] "Insira IDs de %(self)s válidas. Os valores %(value)r "
-"non son válidos."
+msgstr[1] ""
+"Insira IDs de %(self)s válidas. Os valores %(value)r non son válidos."
 
 #: core/template/defaultfilters.py:354
 msgid "yes,no,maybe"
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index 78b64d0e09..3d768bd798 100644
Binary files a/django/conf/locale/is/LC_MESSAGES/django.mo and b/django/conf/locale/is/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po
index 84c607b279..3a702be408 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-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:47+0100\n"
 "PO-Revision-Date: 2005-11-13 18:08-0000\n"
 "Last-Translator: Dagur Páll Ammendrup <dagurp@gmail.com>\n"
 "Language-Team:  <dagurp@gmail.com>\n"
@@ -384,100 +384,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 #, fuzzy
 msgid "Site administration"
 msgstr "Django vefstjórn"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Bæta við"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Breyta"
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Breyta"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Breyta lykilorði"
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 493a83177b..a936c33bb9 100644
Binary files a/django/conf/locale/it/LC_MESSAGES/django.mo and b/django/conf/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index 505bfdba26..3e147e0178 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-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -382,100 +382,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 #, fuzzy
 msgid "Site administration"
 msgstr "Amministrazione Django"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "Clicca per cambiare"
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Aggiungi"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Cambia"
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Cambia"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Cambia la password"
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index a7143d85d2..89d0e2ac8f 100644
Binary files a/django/conf/locale/no/LC_MESSAGES/django.mo and b/django/conf/locale/no/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index c014f50e6c..546be65797 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-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:47+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n"
 "Language-Team: Norwegian\n"
@@ -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:49
+#: contrib/admin/views/main.py:52
 #, fuzzy
 msgid "Site administration"
 msgstr "Django administrasjon"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr "Velg %s"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr "Velg %s for å endre"
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, 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:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr "Du kan endre under"
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr "Du kan legge til en ny %s under."
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, python-format
 msgid "Add %s"
 msgstr "Ny %s"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr "La til %s"
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr "og"
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Changed %s."
 msgstr "Endret %s."
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr "Slettet %s."
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr "Ingen felt endret."
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" ble endret."
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, 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:532
+#: contrib/admin/views/main.py:535
 #, python-format
 msgid "Change %s"
 msgstr "Endre %s"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, 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:615
+#: contrib/admin/views/main.py:618
 #, 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:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" ble slettet."
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr "Er du sikker?"
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Endre historien: %s"
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index c828f6e554..ecbc6544de 100644
Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index da3e97a9dc..096dc11fec 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-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:45+0100\n"
 "PO-Revision-Date: 2005-10-11 09:12GMT-3\n"
 "Last-Translator: João Paulo Farias <jpaulofarias@gmail.com>\n"
 "Language-Team: Português do Brasil <pt-br@li.org>\n"
@@ -382,100 +382,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 #, fuzzy
 msgid "Site administration"
 msgstr "Administração do Django"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, fuzzy, python-format
 msgid "Select %s to change"
 msgstr "Clique para alterar"
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Adicionar"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Modificar"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Alterar senha"
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index 4c469c16c0..0fdd56436f 100644
Binary files a/django/conf/locale/ro/LC_MESSAGES/django.mo and b/django/conf/locale/ro/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po
index 4677675cbc..19ce2bd8dc 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-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:46+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"
@@ -382,100 +382,100 @@ msgstr ""
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 #, fuzzy
 msgid "Site administration"
 msgstr "Administrare Django"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr ""
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr ""
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr ""
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, fuzzy, python-format
 msgid "Add %s"
 msgstr "Adaugă"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr ""
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, fuzzy, python-format
 msgid "Changed %s."
 msgstr "Schimbă"
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr ""
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, fuzzy, python-format
 msgid "Change %s"
 msgstr "Schimbă"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr ""
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr ""
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr ""
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, fuzzy, python-format
 msgid "Change history: %s"
 msgstr "Schimbă parola"
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 57b23dc6c0..2d7b27e5b4 100644
Binary files a/django/conf/locale/ru/LC_MESSAGES/django.mo and b/django/conf/locale/ru/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index f7cce242f1..a2ada0bd82 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-12-04 14:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:45+0100\n"
 "PO-Revision-Date: 2005-11-26 00:00\n"
 "Last-Translator: Dmitry Sorokin <ds@dial.com.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -375,99 +375,99 @@ msgstr "
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr ""
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 msgid "Site administration"
 msgstr "����������������� �����"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr "�������� %s"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr "�������� %s ��� ���������"
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" ���� ������� ���������."
 
-#: contrib/admin/views/main.py:412 contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr "�� ����� ������ ������������� �� �����"
 
-#: contrib/admin/views/main.py:420 contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr "�� ������ �������� % �����."
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, python-format
 msgid "Add %s"
 msgstr "�������� %s"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr "��������� %s"
 
-#: contrib/admin/views/main.py:453 contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr "�"
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Changed %s."
 msgstr "�������� %s."
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr "������� %s."
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr ""
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr ""
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, python-format
 msgid "Change %s"
 msgstr "�������� %s"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "���� ��� �����  %(fieldname)s � %(name)s: %(obj)s"
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "���� ��� ����� %(fieldname)s � %(name)s:"
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" ���� ������� �������."
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr "�� �������?"
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, python-format
 msgid "Change history: %s"
 msgstr "������ �������: %s"
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index eac752aa01..138aab9827 100644
Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 047eac8edd..c8f0fedcf9 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-12-07 22:10-0500\n"
+"POT-Creation-Date: 2005-12-09 11:47+0100\n"
 "PO-Revision-Date: 2005-11-10 23:22-0500\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"
@@ -317,58 +286,6 @@ msgstr ""
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "Formulár komentára neposkytuje odpoveď buď 'prezri' alebo 'pošli'"
 
-#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267
-msgid "URL"
-msgstr "URL"
-
-#: contrib/flatpages/models/flatpages.py:7
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj "
-"záverečné lomítka."
-
-#: contrib/flatpages/models/flatpages.py:8
-msgid "title"
-msgstr "názov"
-
-#: contrib/flatpages/models/flatpages.py:9
-msgid "content"
-msgstr "obsah"
-
-#: contrib/flatpages/models/flatpages.py:10
-msgid "enable comments"
-msgstr "povolené komentáre"
-
-#: contrib/flatpages/models/flatpages.py:11
-msgid "template name"
-msgstr "meno predlohy"
-
-#: contrib/flatpages/models/flatpages.py:12
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo,  systém použije  "
-"'flatpages/default'."
-
-#: contrib/flatpages/models/flatpages.py:13
-msgid "registration required"
-msgstr "musíte byť zaregistrovaný"
-
-#: contrib/flatpages/models/flatpages.py:13
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku."
-
-#: contrib/flatpages/models/flatpages.py:17
-msgid "flat page"
-msgstr "plochá stránka"
-
-#: contrib/flatpages/models/flatpages.py:18
-msgid "flat pages"
-msgstr "ploché stránky"
-
 #: contrib/admin/filterspecs.py:40
 #, python-format
 msgid ""
@@ -572,7 +489,7 @@ msgid "Are you sure?"
 msgstr "Ste si istý?"
 
 #: contrib/admin/views/main.py:665
-#,  python-format
+#, python-format
 msgid "Change history: %s"
 msgstr "Zmena histórie:"
 
@@ -639,6 +556,10 @@ msgstr "Text"
 msgid "Time"
 msgstr "Čas"
 
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "URL"
+
 #: contrib/admin/views/doc.py:268
 msgid "U.S. state (two uppercase letters)"
 msgstr "U.S. štát (dve veľké písmena)"
@@ -647,19 +568,11 @@ msgstr "U.S. štát (dve veľké písmena)"
 msgid "XML text"
 msgstr "XML text"
 
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr ""
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Čas"
-
 #: contrib/admin/templates/admin/object_history.html:3
 #: contrib/admin/templates/admin/change_list.html:4
-#: contrib/admin/templates/admin/change_form.html:9
 #: contrib/admin/templates/admin/base.html:23
 #: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
 #: contrib/admin/templates/admin_doc/bookmarklets.html:4
 #: contrib/admin/templates/admin_doc/view_detail.html:4
 #: contrib/admin/templates/admin_doc/template_tag_index.html:5
@@ -675,9 +588,9 @@ msgstr "Zmena hesla"
 
 #: contrib/admin/templates/admin/object_history.html:3
 #: contrib/admin/templates/admin/change_list.html:4
-#: contrib/admin/templates/admin/change_form.html:9
 #: contrib/admin/templates/admin/base.html:23
 #: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
 #: contrib/admin/templates/admin_doc/bookmarklets.html:4
 #: contrib/admin/templates/admin_doc/view_detail.html:4
 #: contrib/admin/templates/admin_doc/template_tag_index.html:5
@@ -692,10 +605,10 @@ msgid "Log out"
 msgstr "Odhlásenie"
 
 #: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_list.html:5
 #: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_form.html:12
+#: 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
@@ -734,15 +647,13 @@ msgstr ""
 "Tento object nemá históriu zmien. Možno nebol pridaný prostredníctvom tohoto "
 "web admina"
 
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr ""
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django web admin"
 
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr " Od %(title)s "
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administrácia Django"
 
 #: contrib/admin/templates/admin/500.html:4
 msgid "Server error"
@@ -764,17 +675,14 @@ 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/search_form.html:7
-msgid "Go"
-msgstr "Choď"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Stránka nebola nájdená"
 
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django web admin"
-
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Administrácia Django"
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Ľutujeme, ale požadovaná stránka nebola nájdená."
 
 #: contrib/admin/templates/admin/index.html:27
 #: contrib/admin/templates/admin/change_form.html:14
@@ -801,14 +709,10 @@ msgstr "Moje udalosti"
 msgid "None available"
 msgstr "Nepovolené"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Stránka nebola nájdená"
-
-#: contrib/admin/templates/admin/404.html:10
-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_list.html:10
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
 
 #: contrib/admin/templates/admin/login.html:15
 msgid "Username:"
@@ -822,24 +726,6 @@ msgstr "Heslo:"
 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/change_form.html:20
-msgid "View on site"
-msgstr "Pozri na webe"
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Opravte chybu, čo je nižšie, prosím."
-msgstr[1] "Opravte chyby, čo sú nižšie, prosím."
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr "Určenie"
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr "Poradie:"
-
 #: contrib/admin/templates/admin/base.html:23
 msgid "Welcome,"
 msgstr "Vítajte,"
@@ -868,6 +754,33 @@ msgstr ""
 msgid "Yes, I'm sure"
 msgstr "Ano, som si istý"
 
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(title)s "
+msgstr " Od %(title)s "
+
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr "Choď"
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Pozri na webe"
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Opravte chybu, čo je nižšie, prosím."
+msgstr[1] "Opravte chyby, čo sú nižšie, prosím."
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Určenie"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Poradie:"
+
 #: contrib/admin/templates/admin/submit_line.html:3
 msgid "Delete"
 msgstr "Vymazať"
@@ -1076,6 +989,93 @@ msgstr "Editujte tento objekt (nové okno)"
 msgid "As above, but opens the admin page in a new window."
 msgstr "Ako vyššie, ale stranka admina sa otvorí v novom okne."
 
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr ""
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr "Čas"
+
+#: 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/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj "
+"záverečné lomítka."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "názov"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "obsah"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "povolené komentáre"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "meno predlohy"
+
+#: contrib/flatpages/models/flatpages.py:12
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo,  systém použije  "
+"'flatpages/default'."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "musíte byť zaregistrovaný"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku."
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "plochá stránka"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "ploché stránky"
+
 #: utils/translation.py:350
 msgid "DATE_FORMAT"
 msgstr ""
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index 4ed2674bad..dd5e68553b 100644
Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index 5b50a19c2a..6b0274db70 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -2,14 +2,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django Serbian (latin) translation v1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-04 14:55+0100\n"
+"POT-Creation-Date: 2005-12-09 11:45+0100\n"
 "PO-Revision-Date: 2005-12-05 15:00+0100\n"
 "Last-Translator: Nebojša Đorđević <nesh@studioquattro.co.yu>\n"
-"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail.com>\n"
+"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail."
+"com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Poedit-Language: Serbian\n"
 "X-Poedit-Country: YUGOSLAVIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -75,8 +77,7 @@ msgstr "datum/vreme slanja"
 msgid "is public"
 msgstr "da li je javni"
 
-#: contrib/comments/models/comments.py:26
-#: contrib/admin/views/doc.py:256
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
 msgid "IP address"
 msgstr "IP adresa"
 
@@ -85,8 +86,12 @@ msgid "is removed"
 msgstr "obrisan je"
 
 #: contrib/comments/models/comments.py:27
-msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
-msgstr "Selektujte ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je obrisan\" umesto teksta komentara."
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Selektujte ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je "
+"obrisan\" umesto teksta komentara."
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
@@ -216,29 +221,35 @@ msgstr "Ne možete da glasate sami za sebe"
 
 # nesh: grrrrr, ala je rogobatno
 #: contrib/comments/views/comments.py:25
-msgid "This rating is required because you've entered at least one other rating."
+msgid ""
+"This rating is required because you've entered at least one other rating."
 msgstr "Ovaj rejting je obavezan pošto ste uneli još najmanje jedan rejting."
 
 #: contrib/comments/views/comments.py:109
 #, python-format
 msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
 "\n"
 "%(text)s"
 msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
 "\n"
 "%(text)s"
 msgstr[0] ""
-"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s "
+"komentara:\n"
 "\n"
 "%(text)s"
 msgstr[1] ""
-"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s "
+"komentara:\n"
 "\n"
 "%(text)s"
 msgstr[2] ""
-"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n"
+"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s "
+"komentara:\n"
 "\n"
 "%(text)s"
 
@@ -271,8 +282,11 @@ msgstr "Neko je menjao form za komentare (povreda sigurnosti)"
 
 #: contrib/comments/views/comments.py:204
 #: contrib/comments/views/comments.py:289
-msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
-msgstr "Form komentara ima neispravni 'target' parametar -- ID objekta nije ispravan"
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+"Form komentara ima neispravni 'target' parametar -- ID objekta nije ispravan"
 
 #: contrib/comments/views/comments.py:254
 #: contrib/comments/views/comments.py:318
@@ -288,8 +302,7 @@ msgstr ""
 "<h3>Od %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:70
-#: contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
 #: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr "Sve"
@@ -364,12 +377,20 @@ msgid "Log in"
 msgstr "Prijavi se"
 
 #: contrib/admin/views/decorators.py:56
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
-msgstr "Ponovo se prijavite pošto je vaša sesija istekla. Ne brinite, vaši podaci su sačuvani."
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Ponovo se prijavite pošto je vaša sesija istekla. Ne brinite, vaši podaci su "
+"sačuvani."
 
 #: contrib/admin/views/decorators.py:63
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "Izgleda da vaš browser ne podržava \"cookie\". Uključite ih, ponovo učitajte stranu i pokušajte ponovo."
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Izgleda da vaš browser ne podržava \"cookie\". Uključite ih, ponovo učitajte "
+"stranu i pokušajte ponovo."
 
 #: contrib/admin/views/decorators.py:77
 msgid "Usernames cannot contain the '@' character."
@@ -380,111 +401,106 @@ 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:49
+#: contrib/admin/views/main.py:52
 msgid "Site administration"
 msgstr "Administracija sajta"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr "Izaberi %s"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr "Izaberi %s za izmenu"
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "Uspešno dodat %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:412
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr "Ispod ga možete ponovo izmeniti."
 
-#: contrib/admin/views/main.py:420
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr "Ispod možete dodati još jedan %s."
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, python-format
 msgid "Add %s"
 msgstr "Dodaj %s"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr "Dodat %s"
 
-#: contrib/admin/views/main.py:453
-#: contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr "i"
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Changed %s."
 msgstr "Izmenjen %s."
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr "Obrisan %s"
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr "Nijedno polje nije promenjeno."
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "Uspešno izmenjen: %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" je uspešno dodat. Ispod ga možete ponovo menjati."
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, python-format
 msgid "Change %s"
 msgstr "Izmeni %s"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, 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:615
+#: contrib/admin/views/main.py:618
 #, 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:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "Uspešno obrisan: %(name)s \"%(obj)s\"."
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr "Da li ste sigurni?"
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, python-format
 msgid "Change history: %s"
 msgstr "Istorija izmena: %s"
 
-#: contrib/admin/views/doc.py:244
-#: contrib/admin/views/doc.py:253
-#: contrib/admin/views/doc.py:255
-#: contrib/admin/views/doc.py:261
-#: contrib/admin/views/doc.py:262
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
 msgid "Integer"
 msgstr "Ceo broj"
 
@@ -513,8 +529,7 @@ msgstr "Datum (sa vremenom)"
 msgid "E-mail address"
 msgstr "E-mail adresa"
 
-#: contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:254
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
 msgid "File path"
 msgstr "Putanja do fajla"
 
@@ -548,8 +563,7 @@ msgstr "Vreme"
 
 # nesh: ovo se valjda ne prevodi
 # petar: ne prevodi se
-#: contrib/admin/views/doc.py:267
-#: contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "URL"
 
@@ -620,8 +634,7 @@ msgstr "Istorija"
 msgid "Date/time"
 msgstr "Datum/vreme"
 
-#: contrib/admin/templates/admin/object_history.html:19
-#: models/auth.py:47
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
 msgid "User"
 msgstr "Korisnik"
 
@@ -634,8 +647,12 @@ msgid "DATE_WITH_TIME_FULL"
 msgstr "j. N Y, H:i"
 
 #: contrib/admin/templates/admin/object_history.html:36
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
-msgstr "Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem administracije sajta."
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem "
+"administracije sajta."
 
 #: contrib/admin/templates/admin/base_site.html:4
 msgid "Django site admin"
@@ -658,8 +675,12 @@ msgid "Server Error <em>(500)</em>"
 msgstr "Greška na serveru <em>(500)</em>"
 
 #: contrib/admin/templates/admin/500.html:10
-msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
-msgstr "Dogodila se greška koja je prijavljena administratorima i biće popravljena uskoro. Hvala Vam na strpljenju."
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Dogodila se greška koja je prijavljena administratorima i biće popravljena "
+"uskoro. Hvala Vam na strpljenju."
 
 #: contrib/admin/templates/admin/404.html:4
 #: contrib/admin/templates/admin/404.html:8
@@ -718,13 +739,22 @@ msgstr "Dobrodošli,"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:6
 #, python-format
-msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "Brisanjem %(object_name)s  '%(object)s' došlo bi do brisanja dodatnih podataka, ali nemate prava da brišete sledeće tipove podataka:"
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Brisanjem %(object_name)s  '%(object)s' došlo bi do brisanja dodatnih "
+"podataka, ali nemate prava da brišete sledeće tipove podataka:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:13
 #, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
-msgstr "Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće obrisani i sledeći pridruženi objekti:"
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće "
+"obrisani i sledeći pridruženi objekti:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:17
 msgid "Yes, I'm sure"
@@ -802,8 +832,12 @@ msgid "Password reset"
 msgstr "Resetovanje lozinke"
 
 #: contrib/admin/templates/registration/password_reset_form.html:12
-msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
-msgstr "Zaboravili ste svoju lozinku? Unesite vašu e-mail adresu i dobićete novu lozinku na dati e-mail."
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"Zaboravili ste svoju lozinku? Unesite vašu e-mail adresu i dobićete novu "
+"lozinku na dati e-mail."
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
@@ -827,12 +861,20 @@ msgid "Password reset successful"
 msgstr "Vaša lozinka je uspešno resetovana"
 
 #: contrib/admin/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "Nova lozinka poslata vam je na zadatu e-mail adresu. E-mail bi trebao da stigne u narednih nekoliko minuta."
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Nova lozinka poslata vam je na zadatu e-mail adresu. E-mail bi trebao da "
+"stigne u narednih nekoliko minuta."
 
 #: contrib/admin/templates/registration/password_change_form.html:12
-msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
-msgstr "Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi provere ispravnosti unosa."
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi "
+"provere ispravnosti unosa."
 
 #: contrib/admin/templates/registration/password_change_form.html:17
 msgid "Old password:"
@@ -904,23 +946,36 @@ msgid ""
 "your computer is \"internal\").</p>\n"
 msgstr ""
 "\n"
-"<p class=\"help\">Da bi ste instalirali \"bookmarklet\", odvučite link u vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup nekima od strana mora biti sa kompjutera čija je IP adresa označena kao \"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je vaš IP označen kao \"internal\").</p>\n"
+"<p class=\"help\">Da bi ste instalirali \"bookmarklet\", odvučite link u "
+"vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete "
+"da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup "
+"nekima od strana mora biti sa kompjutera čija je IP adresa označena kao "
+"\"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je "
+"vaš IP označen kao \"internal\").</p>\n"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:19
 msgid "Documentation for this page"
 msgstr "Dokumentacija za ovu stranu"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid "Jumps you from any page to the documentation for the view that generates that page."
-msgstr "Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji generiše tu stranu."
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji "
+"generiše tu stranu."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:22
 msgid "Show object ID"
 msgstr "Prikaži ID objekta"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan objekt."
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan "
+"objekt."
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:25
 msgid "Edit this object (current window)"
@@ -951,16 +1006,24 @@ msgid "redirect from"
 msgstr "redirekcija od"
 
 #: contrib/redirects/models/redirects.py:8
-msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
-msgstr "Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/search/'."
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/"
+"search/'."
 
 #: contrib/redirects/models/redirects.py:9
 msgid "redirect to"
 msgstr "redirekcija na"
 
 #: contrib/redirects/models/redirects.py:10
-msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
-msgstr "Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa 'http://'."
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa "
+"'http://'."
 
 #: contrib/redirects/models/redirects.py:12
 msgid "redirect"
@@ -971,8 +1034,11 @@ msgid "redirects"
 msgstr "redirekcije"
 
 #: contrib/flatpages/models/flatpages.py:7
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu crtu."
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu "
+"crtu."
 
 #: contrib/flatpages/models/flatpages.py:8
 msgid "title"
@@ -991,8 +1057,12 @@ msgid "template name"
 msgstr "ime templejta"
 
 #: contrib/flatpages/models/flatpages.py:12
-msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'."
-msgstr "Primer: 'flatpages/contact-page'. Ako nije dato sistem će koristiti flatpages/default'."
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Primer: 'flatpages/contact-page'. Ako nije dato sistem će koristiti "
+"flatpages/default'."
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "registration required"
@@ -1000,7 +1070,9 @@ msgstr "samo za registrovane korisnike"
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj strani."
+msgstr ""
+"Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj "
+"strani."
 
 #: contrib/flatpages/models/flatpages.py:17
 msgid "flat page"
@@ -1058,28 +1130,23 @@ msgstr "Januar"
 msgid "February"
 msgstr "Februar"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "March"
 msgstr "Mart"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "April"
 msgstr "April"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "May"
 msgstr "Maj"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "June"
 msgstr "Jun"
 
-#: utils/dates.py:15
-#: utils/dates.py:27
+#: utils/dates.py:15 utils/dates.py:27
 msgid "July"
 msgstr "Jul"
 
@@ -1186,10 +1253,7 @@ msgstr "sajtovi"
 msgid "label"
 msgstr "labela"
 
-#: models/core.py:29
-#: models/core.py:40
-#: models/auth.py:6
-#: models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
 msgid "name"
 msgstr "ime"
 
@@ -1241,8 +1305,7 @@ msgstr "kodno ime"
 msgid "Permission"
 msgstr "Pravo"
 
-#: models/auth.py:11
-#: models/auth.py:58
+#: models/auth.py:11 models/auth.py:58
 msgid "Permissions"
 msgstr "Prava"
 
@@ -1250,8 +1313,7 @@ msgstr "Prava"
 msgid "Group"
 msgstr "Grupa"
 
-#: models/auth.py:23
-#: models/auth.py:60
+#: models/auth.py:23 models/auth.py:60
 msgid "Groups"
 msgstr "Grupe"
 
@@ -1304,8 +1366,11 @@ msgid "date joined"
 msgstr "datum otvaranja naloga"
 
 #: models/auth.py:44
-msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
-msgstr "Uz ručno dodata prava, korisnik će dobiti sva prava iz grupa kojima pripada."
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Uz ručno dodata prava, korisnik će dobiti sva prava iz grupa kojima pripada."
 
 #: models/auth.py:48
 msgid "Users"
@@ -1399,9 +1464,7 @@ msgstr "Švedski"
 msgid "Simplified Chinese"
 msgstr "Kineski (pojednostavljen)"
 
-#: core/formfields.py:59
-#: core/meta/fields.py:285
-#: core/meta/fields.py:488
+#: 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."
@@ -1418,9 +1481,7 @@ msgstr[2] "Tekst mora imati manje od %s slova."
 msgid "Line breaks are not allowed here."
 msgstr "Novi redovi ovde nisu dozvoljeni."
 
-#: core/formfields.py:436
-#: core/formfields.py:507
-#: core/formfields.py:545
+#: 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."
@@ -1448,7 +1509,8 @@ msgstr "Ovo polje može sadržati samo slova, brojeve i donju crtu (_)."
 
 #: core/validators.py:66
 msgid "This value must contain only letters, numbers, underscores and slashes."
-msgstr "Ovo polje može sadržati samo slova, brojeve, donju crtu (_) i kose crte."
+msgstr ""
+"Ovo polje može sadržati samo slova, brojeve, donju crtu (_) i kose crte."
 
 #: core/validators.py:74
 msgid "Uppercase letters are not allowed here."
@@ -1507,8 +1569,12 @@ msgid "Enter a valid e-mail address."
 msgstr "Unesite ispravnu e-mail adresu."
 
 #: core/validators.py:150
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Pošaljite ispravnu sliku. Fajl koji ste poslali ili nije slika ili je sam fajl oštećen."
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Pošaljite ispravnu sliku. Fajl koji ste poslali ili nije slika ili je sam "
+"fajl oštećen."
 
 #: core/validators.py:157
 #, python-format
@@ -1519,7 +1585,8 @@ msgstr "URL %s ne pokazuje na ispravnu sliku"
 #: core/validators.py:161
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan."
+msgstr ""
+"Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan."
 
 #: core/validators.py:169
 #, python-format
@@ -1549,8 +1616,7 @@ msgstr "Neispravan XML: %s"
 msgid "Invalid URL: %s"
 msgstr "Neispravan URL: %s"
 
-#: core/validators.py:208
-#: core/validators.py:210
+#: core/validators.py:208 core/validators.py:210
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL %s je neispravan link."
@@ -1577,8 +1643,7 @@ msgstr "Ovo polje mora biti jednako sa poljem '%s'."
 msgid "Please enter something for at least one field."
 msgstr "Morate popuniti barem jedno polje."
 
-#: core/validators.py:266
-#: core/validators.py:277
+#: core/validators.py:266 core/validators.py:277
 msgid "Please enter both fields or leave them both empty."
 msgstr "Popunite oba polja ili oba ostavite prazna."
 
@@ -1608,7 +1673,8 @@ msgstr "Unesite ispravan decimalni broj."
 #: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural "Please enter a valid decimal number with at most %s total digits."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
 msgstr[0] "Unesite ispravan decimalni broj sa %s cifrom."
 msgstr[1] "Unesite ispravan decimalni broj sa %s cifre."
 msgstr[2] "Unesite ispravan decimalni broj sa %s cifara."
@@ -1616,7 +1682,8 @@ msgstr[2] "Unesite ispravan decimalni broj sa %s cifara."
 #: core/validators.py:354
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural "Please enter a valid decimal number with at most %s decimal places."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
 msgstr[0] "Unesite decimalni broj sa najviše %s decimalnim mestom."
 msgstr[1] "Unesite decimalni broj sa najviše %s decimalna mesta."
 msgstr[2] "Unesite decimalni broj sa najviše %s decimalnih mesta."
@@ -1646,38 +1713,63 @@ msgstr "Ništa nije moglo da se skine sa URL-a %s."
 
 #: core/validators.py:431
 #, python-format
-msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr "Sa URL-a %(url)s se vratio pogrešan Content-Type header '%(contenttype)s'."
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+"Sa URL-a %(url)s se vratio pogrešan Content-Type header '%(contenttype)s'."
 
 #: core/validators.py:464
 #, python-format
-msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
-msgstr "Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%"
+"(start)s\".)"
 
 #: core/validators.py:468
 #, python-format
-msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
-msgstr "Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red "
+"počinje sa \"%(start)s\".)"
 
 #: core/validators.py:473
 #, python-format
-msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
-msgstr "Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(start)"
+"s\".)"
 
 #: core/validators.py:478
 #, python-format
-msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
-msgstr "Tag \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(start)s\".)"
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"Tag \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(start)s\".)"
 
 #: core/validators.py:482
 #, python-format
-msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
-msgstr "Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%"
+"(start)s\".)"
 
 #: core/validators.py:487
 #, python-format
-msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
-msgstr "Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje sa \"%(start)s\".)"
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje "
+"sa \"%(start)s\".)"
 
 #: core/meta/fields.py:46
 #, python-format
@@ -1694,8 +1786,11 @@ msgid " Separate multiple IDs with commas."
 msgstr " Odvojite višestruke ID-ove zarezima."
 
 #: 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."
+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:508
 msgid "Enter a valid filename."
@@ -1704,7 +1799,8 @@ msgstr "Unesite ispravno ime fajla."
 #: 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."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
 msgstr[1] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
 msgstr[2] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
@@ -1715,6 +1811,7 @@ msgstr "da,ne,možda"
 
 #~ msgid "Error in Template"
 #~ msgstr "Greška u templejtu"
+
 #~ msgid ""
 #~ "\n"
 #~ "In template %(name)s, error at line %(line)s:\n"
@@ -1725,4 +1822,3 @@ msgstr "da,ne,možda"
 #, fuzzy
 #~ msgid "count"
 #~ msgstr "sadržaj"
-
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo
index ae84e33e67..c52cd562d8 100644
Binary files a/django/conf/locale/sv/LC_MESSAGES/django.mo and b/django/conf/locale/sv/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po
index b38d974841..02bd7585ea 100644
--- a/django/conf/locale/sv/LC_MESSAGES/django.po
+++ b/django/conf/locale/sv/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-04 15:56+0100\n"
+"POT-Creation-Date: 2005-12-09 11:47+0100\n"
 "PO-Revision-Date: 2005-12-04 16:20+0100\n"
 "Last-Translator: Robin Sonefors <ozamosi@blinkenlights.se>\n"
 "Language-Team: Django translators <djangoi18n@googlegroups.com>\n"
@@ -18,1197 +18,6 @@ msgstr ""
 "X-Poedit-Language: Swedish\n"
 "X-Poedit-Country: SWEDEN\n"
 
-#: conf/global_settings.py:37
-msgid "Bengali"
-msgstr "Bengaliska"
-
-#: conf/global_settings.py:38
-msgid "Czech"
-msgstr "Tjeckiska"
-
-#: conf/global_settings.py:39
-msgid "Welsh"
-msgstr "Walesiska"
-
-#: conf/global_settings.py:40
-msgid "Danish"
-msgstr "Danska"
-
-#: conf/global_settings.py:41
-msgid "German"
-msgstr "Tyska"
-
-#: conf/global_settings.py:42
-msgid "English"
-msgstr "Engelska"
-
-#: conf/global_settings.py:43
-msgid "Spanish"
-msgstr "Spanska"
-
-#: conf/global_settings.py:44
-msgid "French"
-msgstr "Franska"
-
-#: conf/global_settings.py:45
-msgid "Galician"
-msgstr "Galisiska"
-
-#: conf/global_settings.py:46
-msgid "Icelandic"
-msgstr "Isländska"
-
-#: conf/global_settings.py:47
-msgid "Italian"
-msgstr "Italienska"
-
-#: conf/global_settings.py:48
-msgid "Norwegian"
-msgstr "Norska"
-
-#: conf/global_settings.py:49
-msgid "Brazilian"
-msgstr "Brasilianska"
-
-#: conf/global_settings.py:50
-msgid "Romanian"
-msgstr "Rumänska"
-
-#: conf/global_settings.py:51
-msgid "Russian"
-msgstr "Ryska"
-
-#: conf/global_settings.py:52
-msgid "Slovak"
-msgstr "Slovakiska"
-
-#: conf/global_settings.py:53
-msgid "Serbian"
-msgstr "Serbiska"
-
-#: conf/global_settings.py:54
-msgid "Swedish"
-msgstr "Svenska"
-
-#: conf/global_settings.py:55
-msgid "Simplified Chinese"
-msgstr "Förenklad kinesiska"
-
-#: core/validators.py:62
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Det här värdet får bara innehålla bokstäver, tal och understräck."
-
-#: core/validators.py:66
-msgid "This value must contain only letters, numbers, underscores and slashes."
-msgstr "Det här värdet får bara innehålla bokstäver, tal, understräck och snedsträck"
-
-#: core/validators.py:74
-msgid "Uppercase letters are not allowed here."
-msgstr "Stora bokstäver är inte tillåtna här."
-
-#: core/validators.py:78
-msgid "Lowercase letters are not allowed here."
-msgstr "Små bokstäver är inte tillåtna här."
-
-#: core/validators.py:85
-msgid "Enter only digits separated by commas."
-msgstr "Fyll enbart i siffror avskillda med kommatecken."
-
-#: core/validators.py:97
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "Fyll i giltiga e-postadresser avskillda med kommatecken."
-
-#: core/validators.py:101
-msgid "Please enter a valid IP address."
-msgstr "Var god fyll i ett giltigt IP-nummer."
-
-#: core/validators.py:105
-msgid "Empty values are not allowed here."
-msgstr "Tomma värden är inte tillåtna här."
-
-#: core/validators.py:109
-msgid "Non-numeric characters aren't allowed here."
-msgstr "Icke-numeriska tecken är inte tillåtna här."
-
-#: core/validators.py:113
-msgid "This value can't be comprised solely of digits."
-msgstr "Det här värdet kan inte enbart bestå av siffror."
-
-#: core/validators.py:118
-msgid "Enter a whole number."
-msgstr "Fyll i ett heltal."
-
-#: core/validators.py:122
-msgid "Only alphabetical characters are allowed here."
-msgstr "Endast alfabetiska bokstäver är tillåtna här."
-
-#: core/validators.py:126
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Fyll i ett giltigt datum i formatet ÅÅÅÅ-MM-DD."
-
-#: core/validators.py:130
-msgid "Enter a valid time in HH:MM format."
-msgstr "Fyll i en giltig tid i formatet TT:MM"
-
-#: core/validators.py:134
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Fyll i en giltig tidpunkt i formatet ÅÅÅÅ-MM-DD TT:MM"
-
-#: core/validators.py:138
-msgid "Enter a valid e-mail address."
-msgstr "Fyll i en giltig e-postadress."
-
-#: core/validators.py:150
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Ladda upp en giltig bild. Filen du laddade upp var antingen inte en bild, eller så var det en korrupt bild."
-
-#: core/validators.py:157
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "Adressen %s pekar inte till en giltig bild."
-
-#: core/validators.py:161
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "Telefonnummer måste vara i det amerikanska formatet XXX-XXX-XXXX. \"%s\" är ogiltigt."
-
-#: core/validators.py:169
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "Adressen %s pekar inte till en giltig QuickTime-video."
-
-#: core/validators.py:173
-msgid "A valid URL is required."
-msgstr "En giltig adress krävs."
-
-#: core/validators.py:187
-#, python-format
-msgid ""
-"Valid HTML is required. Specific errors are:\n"
-"%s"
-msgstr ""
-"Giltig HTML krävs. Specifika fel är:\n"
-"%s"
-
-#: core/validators.py:194
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "Missformad XML: %s"
-
-#: core/validators.py:204
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "Felaktig URL: %s"
-
-#: core/validators.py:208
-#: core/validators.py:210
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "URL:en %s är en trasig länk."
-
-#: core/validators.py:216
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "Fyll i en giltig förkortning för en amerikansk delstat"
-
-#: core/validators.py:231
-#, python-format
-msgid "Watch your mouth! The word %s is not allowed here."
-msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] "Håll i tungan! Ordet %s är inte tillåtet här."
-msgstr[1] "Håll i tungan! Orden %s är inte tillåtna här."
-
-#: core/validators.py:238
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "Det här fältet måste matcha fältet '%s'."
-
-#: core/validators.py:257
-msgid "Please enter something for at least one field."
-msgstr "Fyll i något i minst ett fält."
-
-#: core/validators.py:266
-#: core/validators.py:277
-msgid "Please enter both fields or leave them both empty."
-msgstr "Fyll antingen i båda fälten, eller lämna båda tomma"
-
-#: core/validators.py:284
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
-msgstr "Det är fältet måste anges om %(field)s är %(value)s"
-
-#: core/validators.py:296
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
-msgstr "Det här fältet måste anges om %(field)s inte är %(value)s"
-
-#: core/validators.py:315
-msgid "Duplicate values are not allowed."
-msgstr "Upprepade värden är inte tillåtna."
-
-#: core/validators.py:338
-#, python-format
-msgid "This value must be a power of %s."
-msgstr "Det här värdet måste vara en multipel av %s."
-
-#: core/validators.py:349
-msgid "Please enter a valid decimal number."
-msgstr "Fyll i ett giltigt decimaltal."
-
-#: core/validators.py:351
-#, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural "Please enter a valid decimal number with at most %s total digits."
-msgstr[0] "Fyll i ett giltigt decimaltal med mindre än %s siffra totalt."
-msgstr[1] "Fyll i ett giltigt decimaltal med mindre än %s siffror totalt."
-
-#: core/validators.py:354
-#, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural "Please enter a valid decimal number with at most %s decimal places."
-msgstr[0] "Fyll i ett giltigt decimaltal med som mest %s decimalsiffra."
-msgstr[1] "Fyll i ett giltigt decimaltal med som mest %s decimalsiffror."
-
-#: core/validators.py:364
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "Se till att filen du laddade upp är minst %s bytes stor."
-
-#: core/validators.py:365
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "Se till att filen du laddade upp är max %s bytes stor."
-
-#: core/validators.py:378
-msgid "The format for this field is wrong."
-msgstr "Formatet på det här fältet är fel."
-
-#: core/validators.py:393
-msgid "This field is invalid."
-msgstr "Det här fältet är ogiltigt."
-
-#: core/validators.py:428
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "Kunde inte hämta något från %s."
-
-#: core/validators.py:431
-#, python-format
-msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr "Adressen %(url)s returnerade det ogiltiga innehållstyphuvudet (Content-Type header) '%(contenttype)s'"
-
-#: core/validators.py:464
-#, python-format
-msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
-msgstr "Var god avsluta den oavslutade taggen %(tag)s på rad %(line)s. (Raden börjar med \"%(start)s\".)"
-
-#: core/validators.py:468
-#, python-format
-msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
-msgstr "En del text från rad %(line)s är inte tillåtet i det sammanhanget. (Raden börjar med \"%(start)s\".)"
-
-#: core/validators.py:473
-#, python-format
-msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
-msgstr "\"%(attr)s\" på rad %(line)s är inte ett gilltigt attribut. (Raden startar med \"%(start)s\".)"
-
-#: core/validators.py:478
-#, python-format
-msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
-msgstr "\"<%(tag)s>\" på rad %(line)s är inte en giltig tagg. (Raden börjar med \"%(start)s\".)"
-
-#: core/validators.py:482
-#, python-format
-msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
-msgstr "En tagg på rad %(line)s saknar en eller flera nödvändiga attribut. (Raden börjar med \"%(start)s\".)"
-
-#: core/validators.py:487
-#, python-format
-msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
-msgstr "Attributet \"%(attr)s\" på rad %(line)s har ett ogiltigt värde. (Raden börjar med \"%(start)s\".)"
-
-#: 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 "Det här fältet är obligatoriskt."
-
-#: core/formfields.py:336
-#, python-format
-msgid "Ensure your text is less than %s character."
-msgid_plural "Ensure your text is less than %s characters."
-msgstr[0] "Se till att din text är kortare än %s tecken."
-msgstr[1] "Se till att din text är kortare än %s tecken."
-
-#: core/formfields.py:341
-msgid "Line breaks are not allowed here."
-msgstr "Radbrytningar är inte tillåtna här."
-
-#: 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 "Välj ett giltigt alternativ. '%(data)s' finns inte bland %(choices)s"
-
-#: core/formfields.py:601
-msgid "The submitted file is empty."
-msgstr "Den insända filen är tom."
-
-#: core/formfields.py:655
-msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Fyll i ett heltal mellan -32 768 och 32 767."
-
-#: core/formfields.py:664
-msgid "Enter a positive number."
-msgstr "Fyll i ett positivt heltal."
-
-#: core/formfields.py:673
-msgid "Enter a whole number between 0 and 32,767."
-msgstr "Fyll i ett heltal mellan 0 och 32 767."
-
-#: core/meta/fields.py:46
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Var god fyll i ett giltigt %s."
-
-#: core/meta/fields.py:60
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "%(optname)s med det här %(fieldname)s finns redan."
-
-#: core/meta/fields.py:129
-msgid " Separate multiple IDs with commas."
-msgstr " Separera flera ID:n med kommatecken."
-
-#: 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:508
-msgid "Enter a valid filename."
-msgstr "Fyll i ett giltigt filnamn."
-
-#: 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."
-msgstr[0] "Var god och fyll giltiga %(self)s ID. Värdet %(value)r är ogiltigt."
-msgstr[1] "Var god och fyll giltiga %(self)s ID. Värdena %(value)r är ogiltigt."
-
-#: core/template/defaultfilters.py:354
-msgid "yes,no,maybe"
-msgstr "ja,nej,kanske"
-
-#: contrib/admin/filterspecs.py:40
-#, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-"<h3>Av %s:</h3>\n"
-"<ul>\n"
-
-#: contrib/admin/filterspecs.py:70
-#: contrib/admin/filterspecs.py:88
-#: contrib/admin/filterspecs.py:143
-msgid "All"
-msgstr "Alla"
-
-#: contrib/admin/filterspecs.py:109
-msgid "Any date"
-msgstr "Alla datum"
-
-#: contrib/admin/filterspecs.py:110
-msgid "Today"
-msgstr "Idag"
-
-#: contrib/admin/filterspecs.py:113
-msgid "Past 7 days"
-msgstr "Senaste 7 dagarna"
-
-#: contrib/admin/filterspecs.py:115
-msgid "This month"
-msgstr "Den här månaden"
-
-#: contrib/admin/filterspecs.py:117
-msgid "This year"
-msgstr "Det här året"
-
-#: contrib/admin/filterspecs.py:143
-msgid "Yes"
-msgstr "Ja"
-
-#: contrib/admin/filterspecs.py:143
-msgid "No"
-msgstr "Nej"
-
-#: contrib/admin/filterspecs.py:150
-msgid "Unknown"
-msgstr "Okänt"
-
-#: contrib/admin/views/decorators.py:22
-#: contrib/admin/templates/admin/login.html:24
-msgid "Log in"
-msgstr "Logga in"
-
-#: contrib/admin/views/decorators.py:56
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
-msgstr "Du måste logga in igen, eftersom din session har tagit slut. Oroa dig inte: ditt bidrag har sparats."
-
-#: contrib/admin/views/decorators.py:63
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "Det ser ut som om din webbläsare inte är konfigurerad att acceptera kakor. Aktivera kakor, ladda om den här sidan, och försök igen."
-
-#: contrib/admin/views/decorators.py:77
-msgid "Usernames cannot contain the '@' character."
-msgstr "Användarnamn kan inte innehålla tecknet '@'."
-
-#: contrib/admin/views/decorators.py:79
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Din e-postadress är inte ditt användarnamn. Försök med '%s' istället."
-
-#: contrib/admin/views/main.py:49
-msgid "Site administration"
-msgstr "Hemsideadministration"
-
-#: contrib/admin/views/main.py:64
-#, python-format
-msgid "Select %s"
-msgstr "Välj %s"
-
-#: contrib/admin/views/main.py:65
-#, python-format
-msgid "Select %s to change"
-msgstr "Välj vilken %s du vill ändra"
-
-#: contrib/admin/views/main.py:407
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "%(name)set \"%(obj)s\" lades till."
-
-#: contrib/admin/views/main.py:412
-#: contrib/admin/views/main.py:488
-msgid "You may edit it again below."
-msgstr "Du kan ändra det igen här under."
-
-#: contrib/admin/views/main.py:420
-#: contrib/admin/views/main.py:497
-#, python-format
-msgid "You may add another %s below."
-msgstr "Du kan lägga till en till %s här under"
-
-#: contrib/admin/views/main.py:437
-#, python-format
-msgid "Add %s"
-msgstr "Lägg till %s"
-
-#: contrib/admin/views/main.py:453
-#, python-format
-msgid "Added %s."
-msgstr "Lade till %s."
-
-#: contrib/admin/views/main.py:453
-#: contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
-msgid "and"
-msgstr "och"
-
-#: contrib/admin/views/main.py:455
-#, python-format
-msgid "Changed %s."
-msgstr "Ändrade %s."
-
-#: contrib/admin/views/main.py:457
-#, python-format
-msgid "Deleted %s."
-msgstr "Tog bort %s."
-
-#: contrib/admin/views/main.py:460
-msgid "No fields changed."
-msgstr "Inga fält ändrade."
-
-#: contrib/admin/views/main.py:485
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "%(name)set \"%(obj)s\" ändrades."
-
-#: contrib/admin/views/main.py:494
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "%(name)set \"%(obj)s\" lades till. Du kan ändra det igen här under."
-
-#: contrib/admin/views/main.py:532
-#, python-format
-msgid "Change %s"
-msgstr "Ändra %s"
-
-#: contrib/admin/views/main.py:610
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Ett eller flera %(fieldname)s i %(name)s: %(obj)s"
-
-#: contrib/admin/views/main.py:615
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Ett eller flera %(fieldname)s i %(name)s:"
-
-#: contrib/admin/views/main.py:644
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "%(name)set \"%(obj)s\" togs bort."
-
-#: contrib/admin/views/main.py:647
-msgid "Are you sure?"
-msgstr "Är du säker?"
-
-#: contrib/admin/views/main.py:662
-#, python-format
-msgid "Change history: %s"
-msgstr "Ändra historien: %s"
-
-#: contrib/admin/views/doc.py:244
-#: contrib/admin/views/doc.py:253
-#: contrib/admin/views/doc.py:255
-#: contrib/admin/views/doc.py:261
-#: contrib/admin/views/doc.py:262
-#: contrib/admin/views/doc.py:264
-msgid "Integer"
-msgstr "Heltal"
-
-#: contrib/admin/views/doc.py:245
-msgid "Boolean (Either True or False)"
-msgstr "Boolesk (antingen Sann eller Falsk)"
-
-#: contrib/admin/views/doc.py:246
-#, python-format
-msgid "String (up to %(maxlength)s)"
-msgstr "Sträng (upp till %(maxlength)s)"
-
-#: contrib/admin/views/doc.py:247
-msgid "Comma-separated integers"
-msgstr "Komma-separerade heltal"
-
-#: contrib/admin/views/doc.py:248
-msgid "Date (without time)"
-msgstr "Datum (utan tid)"
-
-#: contrib/admin/views/doc.py:249
-msgid "Date (with time)"
-msgstr "Datum (med tid)"
-
-#: contrib/admin/views/doc.py:250
-msgid "E-mail address"
-msgstr "E-postadress:"
-
-#: contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:254
-msgid "File path"
-msgstr "Sökväg"
-
-#: contrib/admin/views/doc.py:252
-msgid "Decimal number"
-msgstr "decemaltal"
-
-#: contrib/admin/views/doc.py:256
-#: contrib/comments/models/comments.py:26
-msgid "IP address"
-msgstr "IP-adress"
-
-#: contrib/admin/views/doc.py:258
-msgid "Boolean (Either True, False or None)"
-msgstr "Boolesk (antingen Sann, Falsk eller Inget)"
-
-#: contrib/admin/views/doc.py:259
-msgid "Relation to parent model"
-msgstr "Relation till förälder"
-
-#: contrib/admin/views/doc.py:260
-msgid "Phone number"
-msgstr "Telefonnummer"
-
-#: contrib/admin/views/doc.py:263
-msgid "String (up to 50)"
-msgstr "Sträng (upp till 50)"
-
-#: contrib/admin/views/doc.py:265
-msgid "Text"
-msgstr "Text"
-
-#: contrib/admin/views/doc.py:266
-msgid "Time"
-msgstr "Tid"
-
-#: contrib/admin/views/doc.py:267
-#: contrib/flatpages/models/flatpages.py:6
-msgid "URL"
-msgstr "URL"
-
-#: contrib/admin/views/doc.py:268
-msgid "U.S. state (two uppercase letters)"
-msgstr "Stat i USA (två stora bokstäver)"
-
-#: contrib/admin/views/doc.py:269
-msgid "XML text"
-msgstr "XML-text"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "tid för händelse"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "objektets id"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "objektets beskrivning"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "händelseflagga"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "ändra meddelande"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "loggpost"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "loggposter"
-
-#: contrib/admin/templatetags/admin_list.py:245
-msgid "All dates"
-msgstr "Alla datum"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:9
-#: contrib/admin/templates/admin/change_list.html:4
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-msgid "Change password"
-msgstr "Ändra lösenord"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:9
-#: contrib/admin/templates/admin/change_list.html:4
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/base.html:23
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-msgid "Log out"
-msgstr "Logga ut"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#, python-format
-msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "Att ta bort %(object_name)s '%(object)s' skulle innebära att besläktade objekt togs bort, men ditt konto har inte rättigheter att ta bort följande objekttyper:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:13
-#, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
-msgstr "Är du säker på att du vill ta bort %(object_name)s \"%(object)s\"? Följande besläktade föremål kommer att tas bort:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:17
-msgid "Yes, I'm sure"
-msgstr "Ja, jag är säker"
-
-#: 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/change_form.html:12
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_done.html:4
-msgid "Home"
-msgstr "Hem"
-
-#: contrib/admin/templates/admin/change_form.html:14
-#: contrib/admin/templates/admin/index.html:27
-msgid "Add"
-msgstr "Lägg&nbsp;till"
-
-#: contrib/admin/templates/admin/change_form.html:19
-#: contrib/admin/templates/admin/object_history.html:5
-msgid "History"
-msgstr "Historik"
-
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr "Visa på hemsidan"
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Rätta till felet nedan."
-msgstr[1] "Rätta till felen nedan."
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr "Sortering"
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr "Sortera:"
-
-#: contrib/admin/templates/admin/filter.html:2
-#, python-format
-msgid " By %(title)s "
-msgstr " Efter %(title)s "
-
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Delete"
-msgstr "Ta bort"
-
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
-msgstr "Spara som ny"
-
-#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
-msgstr "Spara och lägg till ytterligare en"
-
-#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
-msgstr "Spara och fortsätt redigera"
-
-#: contrib/admin/templates/admin/submit_line.html:7
-msgid "Save"
-msgstr "Spara"
-
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr "Lägg till %(name)s"
-
-#: 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ätt 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/base_site.html:4
-msgid "Django site admin"
-msgstr "Djangos sidadministration"
-
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Administration för Django"
-
-#: contrib/admin/templates/admin/object_history.html:18
-msgid "Date/time"
-msgstr "Datum/tid"
-
-#: contrib/admin/templates/admin/object_history.html:19
-#: models/auth.py:47
-msgid "User"
-msgstr "Användare"
-
-#: contrib/admin/templates/admin/object_history.html:20
-msgid "Action"
-msgstr "Händelse"
-
-#: contrib/admin/templates/admin/object_history.html:26
-msgid "DATE_WITH_TIME_FULL"
-msgstr "D j F Y, H:i:s"
-
-#: contrib/admin/templates/admin/object_history.html:36
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
-msgstr "Det här objektet har ingen ändringshistorik. Det lades antagligen inte till i den här admin-sidan"
-
-#: 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/search_form.html:7
-msgid "Go"
-msgstr "Utför"
-
-#: contrib/admin/templates/admin/login.html:15
-msgid "Username:"
-msgstr "Användarnamn:"
-
-#: contrib/admin/templates/admin/login.html:18
-msgid "Password:"
-msgstr "Lösenord:"
-
-#: contrib/admin/templates/admin/login.html:20
-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/base.html:23
-msgid "Welcome,"
-msgstr "Välkommen,"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Documentation"
-msgstr "Dokumentation"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Bookmarklets"
-msgstr "Smarta bokmärken"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:5
-msgid "Documentation bookmarklets"
-msgstr "Smarta bokmärken för dokumentation"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:9
-msgid ""
-"\n"
-"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
-"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
-"select the bookmarklet from any page in the site.  Note that some of these\n"
-"bookmarklets require you to be viewing the site from a computer designated\n"
-"as \"internal\" (talk to your system administrator if you aren't sure if\n"
-"your computer is \"internal\").</p>\n"
-msgstr ""
-"\n"
-"<p class=\"help\">För att installera smarta bokmärken, dra länken till din\n"
-"verktygsrad med bokmärken, eller högerklicka på länken och lägg till den\n"
-"till dina bokmärken. Nu kan du välja det smarta bokmärket från alla sidor\n"
-"på hemsidan. Notera att några av desa smarta bokmärken kräver att du tittar\n"
-"på sidan på en dator som är \"intern\" (prata med din systemadministratör\n"
-"om du inte är säker på om din dator är \"intern\")</p>\n"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid "Documentation for this page"
-msgstr "Dokumentation för den här sidan"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid "Jumps you from any page to the documentation for the view that generates that page."
-msgstr "Förflyttar dig från valfri sida till dokumentationen för vyn som genererar den sidan."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid "Show object ID"
-msgstr "Visa objektets id"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "Visa innehållstypen och ID:t för sidor som representerar ett enskillt objekt."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
-msgstr "Redigera det här objektet (nuvarande fönster)"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "Hoppar till administrationssidan för sidor som representerar ett enskillt objekt."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-msgid "Edit this object (new window)"
-msgstr "Redigera det här objektet (nytt fönster)"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
-msgid "As above, but opens the admin page in a new window."
-msgstr "Som ovan, men öppnaradministrationssidan i ett nytt fönster."
-
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Datum:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Tid:"
-
-#: 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"
-
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
-msgstr "Har du glömt ditt lösenord? Fyll i din e-postadress nedan, så nollställer vi ditt lösenord och mailar det nya till dig."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "E-postadress:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Nollställ mitt lösenord"
-
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "Du får det här mailet eftersom du bad om att få lösenordet nollställt"
-
-#: contrib/admin/templates/registration/password_reset_email.html:3
-#, python-format
-msgid "for your user account at %(site_name)s"
-msgstr "för ditt användarkonto på %(site_name)s"
-
-#: contrib/admin/templates/registration/password_reset_email.html:5
-#, python-format
-msgid "Your new password is: %(new_password)s"
-msgstr "Ditt nya lösenord är: %(new_password)s"
-
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
-msgstr "Känn dig välkommen att ändra det här lösenordet genom att gå till den här sidan:"
-
-#: contrib/admin/templates/registration/password_reset_email.html:11
-msgid "Your username, in case you've forgotten:"
-msgstr "Ditt användarnamn, om du har glömt:"
-
-#: contrib/admin/templates/registration/password_reset_email.html:13
-msgid "Thanks for using our site!"
-msgstr "Tack för att du använder vår sida!"
-
-#: contrib/admin/templates/registration/password_reset_email.html:15
-#, python-format
-msgid "The %(site_name)s team"
-msgstr "%(site_name)s-laget"
-
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Tack för att du spenderade kvalitetstid med webbsidan idag."
-
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Logga in igen"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Nollställning av lösenordet lyckades"
-
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "Vi har skickat ett nytt lösenord till e-postadressen du fyllde i. Det bör anlända snarast."
-
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_form.html:6
-#: contrib/admin/templates/registration/password_change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:4
-msgid "Password change"
-msgstr "Ändra lösenord"
-
-#: contrib/admin/templates/registration/password_change_form.html:12
-msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
-msgstr "Var god fyll i ditt gamla lösenord, för säkerhets skull, och skriv sedan in det nya lösenordet två gånger så vi kan kontrollera att du skrev det rätt."
-
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
-msgstr "Gamla lösenordet:"
-
-#: contrib/admin/templates/registration/password_change_form.html:19
-msgid "New password:"
-msgstr "Nytt lösenord:"
-
-#: contrib/admin/templates/registration/password_change_form.html:21
-msgid "Confirm password:"
-msgstr "Bekräfta lösenord:"
-
-#: contrib/admin/templates/registration/password_change_form.html:23
-msgid "Change my password"
-msgstr "Ändra mitt lösenord"
-
-#: contrib/admin/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/registration/password_change_done.html:10
-msgid "Password change successful"
-msgstr "Lösenordet ändrades"
-
-#: contrib/admin/templates/registration/password_change_done.html:12
-msgid "Your password was changed."
-msgstr "Ditt lösenord har ändrats."
-
-#: contrib/flatpages/models/flatpages.py:7
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "Exempel: '/om/kontakt/'. Se till att ha inledande och avslutande snedsträck."
-
-#: contrib/flatpages/models/flatpages.py:8
-msgid "title"
-msgstr "titel"
-
-#: contrib/flatpages/models/flatpages.py:9
-msgid "content"
-msgstr "innehåll"
-
-#: contrib/flatpages/models/flatpages.py:10
-msgid "enable comments"
-msgstr "aktivera kommentarer"
-
-#: contrib/flatpages/models/flatpages.py:11
-msgid "template name"
-msgstr "mallnamn"
-
-#: contrib/flatpages/models/flatpages.py:12
-msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'."
-msgstr "Exempel: 'flatpages/kontaktsida'. Om det här inte fylls i kommer systemet att använda 'flatpages/default'."
-
-#: contrib/flatpages/models/flatpages.py:13
-msgid "registration required"
-msgstr "registrering krävs"
-
-#: contrib/flatpages/models/flatpages.py:13
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "Om det här bockas i kommer endast inloggade användare att kunna visa sidan"
-
-#: contrib/flatpages/models/flatpages.py:17
-msgid "flat page"
-msgstr "flatsida"
-
-#: contrib/flatpages/models/flatpages.py:18
-msgid "flat pages"
-msgstr "flatsidor"
-
-#: contrib/redirects/models/redirects.py:7
-msgid "redirect from"
-msgstr "vidarebefodra från"
-
-#: contrib/redirects/models/redirects.py:8
-msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
-msgstr "Det här bör vara en absolut sökväg, förutom domännamnet. Exempel: '/handelser/sok/'."
-
-#: contrib/redirects/models/redirects.py:9
-msgid "redirect to"
-msgstr "vidarebefodra till"
-
-#: contrib/redirects/models/redirects.py:10
-msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
-msgstr "Det här kan vara antingen en absolut sökväg (som ovan), eller en komplett adress som börjar med 'http://'."
-
-#: contrib/redirects/models/redirects.py:12
-msgid "redirect"
-msgstr "vidarebefodra"
-
-#: contrib/redirects/models/redirects.py:13
-msgid "redirects"
-msgstr "vidarebefodringar"
-
-#: contrib/comments/views/karma.py:18
-msgid "Anonymous users cannot vote"
-msgstr "Anonyma användare kan inte rösta"
-
-#: contrib/comments/views/karma.py:22
-msgid "Invalid comment ID"
-msgstr "Kommentaren har ett ogiltigt ID"
-
-#: contrib/comments/views/karma.py:24
-msgid "No voting for yourself"
-msgstr "Du får inte rösta på dig själv"
-
-#: contrib/comments/views/comments.py:25
-msgid "This rating is required because you've entered at least one other rating."
-msgstr "Det här betyget krävs eftersom du har fyllt i minst ett annat betyg."
-
-#: contrib/comments/views/comments.py:109
-#, python-format
-msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
-"\n"
-"%(text)s"
-msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
-"\n"
-"%(text)s"
-msgstr[0] ""
-"Den här kommentaren postades av en användare som har postat färre än %(count)s kommentar:\n"
-"\n"
-"%(text)s"
-msgstr[1] ""
-"Den här kommentaren postades av en användare som har postat färre än %(count)s kommentarer:\n"
-"\n"
-"%(text)s"
-
-#: contrib/comments/views/comments.py:114
-#, python-format
-msgid ""
-"This comment was posted by a sketchy user:\n"
-"\n"
-"%(text)s"
-msgstr ""
-"Den här kommentaren postades av en oseriös användare:\n"
-"\n"
-"%(text)s"
-
-#: contrib/comments/views/comments.py:186
-#: contrib/comments/views/comments.py:277
-msgid "Only POSTs are allowed"
-msgstr "Endast POSTningar är tillåtna"
-
-#: contrib/comments/views/comments.py:190
-#: contrib/comments/views/comments.py:281
-msgid "One or more of the required fields wasn't submitted"
-msgstr "Ett eller fler av fälten som krävs fylldes inte i"
-
-#: contrib/comments/views/comments.py:194
-#: contrib/comments/views/comments.py:283
-msgid "Somebody tampered with the comment form (security violation)"
-msgstr "Någon fifflade med kommenteringsformuläret (säkerhetsbrott)"
-
-#: contrib/comments/views/comments.py:204
-#: contrib/comments/views/comments.py:289
-msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
-msgstr "Kommenteringsformuläret har en ogiltig 'target'-parameter -- objektets ID är ogiltigt"
-
-#: contrib/comments/views/comments.py:254
-#: contrib/comments/views/comments.py:318
-msgid "The comment form didn't provide either 'preview' or 'post'"
-msgstr "Kommenteringsformuläret skickade varken 'förhandsgranska' eller 'post'"
-
 #: contrib/comments/models/comments.py:8
 #: contrib/comments/models/comments.py:161
 msgid "object ID"
@@ -1269,13 +78,21 @@ msgstr "datum/tid postat"
 msgid "is public"
 msgstr "är offentligt"
 
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
+msgid "IP address"
+msgstr "IP-adress"
+
 #: contrib/comments/models/comments.py:27
 msgid "is removed"
 msgstr "är borttaget"
 
 #: contrib/comments/models/comments.py:27
-msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
-msgstr "Bocka för den här rutan om kommentaren är olämplig. Ett \"Den här kommentaren har tagits bort\"-meddelande kommer visas istället"
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Bocka för den här rutan om kommentaren är olämplig. Ett \"Den här "
+"kommentaren har tagits bort\"-meddelande kommer visas istället"
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
@@ -1391,6 +208,886 @@ msgstr "Moderatorborttagningar"
 msgid "Moderator deletion by %r"
 msgstr "Moderatorborttagning av %r"
 
+#: contrib/comments/views/karma.py:18
+msgid "Anonymous users cannot vote"
+msgstr "Anonyma användare kan inte rösta"
+
+#: contrib/comments/views/karma.py:22
+msgid "Invalid comment ID"
+msgstr "Kommentaren har ett ogiltigt ID"
+
+#: contrib/comments/views/karma.py:24
+msgid "No voting for yourself"
+msgstr "Du får inte rösta på dig själv"
+
+#: contrib/comments/views/comments.py:25
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr "Det här betyget krävs eftersom du har fyllt i minst ett annat betyg."
+
+#: contrib/comments/views/comments.py:109
+#, python-format
+msgid ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
+"\n"
+"%(text)s"
+msgid_plural ""
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
+"\n"
+"%(text)s"
+msgstr[0] ""
+"Den här kommentaren postades av en användare som har postat färre än %(count)"
+"s kommentar:\n"
+"\n"
+"%(text)s"
+msgstr[1] ""
+"Den här kommentaren postades av en användare som har postat färre än %(count)"
+"s kommentarer:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/views/comments.py:114
+#, python-format
+msgid ""
+"This comment was posted by a sketchy user:\n"
+"\n"
+"%(text)s"
+msgstr ""
+"Den här kommentaren postades av en oseriös användare:\n"
+"\n"
+"%(text)s"
+
+#: contrib/comments/views/comments.py:186
+#: contrib/comments/views/comments.py:277
+msgid "Only POSTs are allowed"
+msgstr "Endast POSTningar är tillåtna"
+
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:281
+msgid "One or more of the required fields wasn't submitted"
+msgstr "Ett eller fler av fälten som krävs fylldes inte i"
+
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:283
+msgid "Somebody tampered with the comment form (security violation)"
+msgstr "Någon fifflade med kommenteringsformuläret (säkerhetsbrott)"
+
+#: contrib/comments/views/comments.py:204
+#: contrib/comments/views/comments.py:289
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+"Kommenteringsformuläret har en ogiltig 'target'-parameter -- objektets ID är "
+"ogiltigt"
+
+#: contrib/comments/views/comments.py:254
+#: contrib/comments/views/comments.py:318
+msgid "The comment form didn't provide either 'preview' or 'post'"
+msgstr "Kommenteringsformuläret skickade varken 'förhandsgranska' eller 'post'"
+
+#: contrib/admin/filterspecs.py:40
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Av %s:</h3>\n"
+"<ul>\n"
+
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
+msgid "All"
+msgstr "Alla"
+
+#: contrib/admin/filterspecs.py:109
+msgid "Any date"
+msgstr "Alla datum"
+
+#: contrib/admin/filterspecs.py:110
+msgid "Today"
+msgstr "Idag"
+
+#: contrib/admin/filterspecs.py:113
+msgid "Past 7 days"
+msgstr "Senaste 7 dagarna"
+
+#: contrib/admin/filterspecs.py:115
+msgid "This month"
+msgstr "Den här månaden"
+
+#: contrib/admin/filterspecs.py:117
+msgid "This year"
+msgstr "Det här året"
+
+#: contrib/admin/filterspecs.py:143
+msgid "Yes"
+msgstr "Ja"
+
+#: contrib/admin/filterspecs.py:143
+msgid "No"
+msgstr "Nej"
+
+#: contrib/admin/filterspecs.py:150
+msgid "Unknown"
+msgstr "Okänt"
+
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "tid för händelse"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "objektets id"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "objektets beskrivning"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "händelseflagga"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "ändra meddelande"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "loggpost"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "loggposter"
+
+#: contrib/admin/templatetags/admin_list.py:245
+msgid "All dates"
+msgstr "Alla datum"
+
+#: contrib/admin/views/decorators.py:22
+#: contrib/admin/templates/admin/login.html:24
+msgid "Log in"
+msgstr "Logga in"
+
+#: contrib/admin/views/decorators.py:56
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Du måste logga in igen, eftersom din session har tagit slut. Oroa dig inte: "
+"ditt bidrag har sparats."
+
+#: contrib/admin/views/decorators.py:63
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Det ser ut som om din webbläsare inte är konfigurerad att acceptera kakor. "
+"Aktivera kakor, ladda om den här sidan, och försök igen."
+
+#: contrib/admin/views/decorators.py:77
+msgid "Usernames cannot contain the '@' character."
+msgstr "Användarnamn kan inte innehålla tecknet '@'."
+
+#: contrib/admin/views/decorators.py:79
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "Din e-postadress är inte ditt användarnamn. Försök med '%s' istället."
+
+#: contrib/admin/views/main.py:52
+msgid "Site administration"
+msgstr "Hemsideadministration"
+
+#: contrib/admin/views/main.py:67
+#, python-format
+msgid "Select %s"
+msgstr "Välj %s"
+
+#: contrib/admin/views/main.py:68
+#, python-format
+msgid "Select %s to change"
+msgstr "Välj vilken %s du vill ändra"
+
+#: contrib/admin/views/main.py:410
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "%(name)set \"%(obj)s\" lades till."
+
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
+msgid "You may edit it again below."
+msgstr "Du kan ändra det igen här under."
+
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
+#, python-format
+msgid "You may add another %s below."
+msgstr "Du kan lägga till en till %s här under"
+
+#: contrib/admin/views/main.py:440
+#, python-format
+msgid "Add %s"
+msgstr "Lägg till %s"
+
+#: contrib/admin/views/main.py:456
+#, python-format
+msgid "Added %s."
+msgstr "Lade till %s."
+
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
+msgid "and"
+msgstr "och"
+
+#: contrib/admin/views/main.py:458
+#, python-format
+msgid "Changed %s."
+msgstr "Ändrade %s."
+
+#: contrib/admin/views/main.py:460
+#, python-format
+msgid "Deleted %s."
+msgstr "Tog bort %s."
+
+#: contrib/admin/views/main.py:463
+msgid "No fields changed."
+msgstr "Inga fält ändrade."
+
+#: contrib/admin/views/main.py:488
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "%(name)set \"%(obj)s\" ändrades."
+
+#: contrib/admin/views/main.py:497
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "%(name)set \"%(obj)s\" lades till. Du kan ändra det igen här under."
+
+#: contrib/admin/views/main.py:535
+#, python-format
+msgid "Change %s"
+msgstr "Ändra %s"
+
+#: contrib/admin/views/main.py:613
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Ett eller flera %(fieldname)s i %(name)s: %(obj)s"
+
+#: contrib/admin/views/main.py:618
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Ett eller flera %(fieldname)s i %(name)s:"
+
+#: contrib/admin/views/main.py:647
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "%(name)set \"%(obj)s\" togs bort."
+
+#: contrib/admin/views/main.py:650
+msgid "Are you sure?"
+msgstr "Är du säker?"
+
+#: contrib/admin/views/main.py:665
+#, python-format
+msgid "Change history: %s"
+msgstr "Ändra historien: %s"
+
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
+msgid "Integer"
+msgstr "Heltal"
+
+#: contrib/admin/views/doc.py:245
+msgid "Boolean (Either True or False)"
+msgstr "Boolesk (antingen Sann eller Falsk)"
+
+#: contrib/admin/views/doc.py:246
+#, python-format
+msgid "String (up to %(maxlength)s)"
+msgstr "Sträng (upp till %(maxlength)s)"
+
+#: contrib/admin/views/doc.py:247
+msgid "Comma-separated integers"
+msgstr "Komma-separerade heltal"
+
+#: contrib/admin/views/doc.py:248
+msgid "Date (without time)"
+msgstr "Datum (utan tid)"
+
+#: contrib/admin/views/doc.py:249
+msgid "Date (with time)"
+msgstr "Datum (med tid)"
+
+#: contrib/admin/views/doc.py:250
+msgid "E-mail address"
+msgstr "E-postadress:"
+
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
+msgid "File path"
+msgstr "Sökväg"
+
+#: contrib/admin/views/doc.py:252
+msgid "Decimal number"
+msgstr "decemaltal"
+
+#: contrib/admin/views/doc.py:258
+msgid "Boolean (Either True, False or None)"
+msgstr "Boolesk (antingen Sann, Falsk eller Inget)"
+
+#: contrib/admin/views/doc.py:259
+msgid "Relation to parent model"
+msgstr "Relation till förälder"
+
+#: contrib/admin/views/doc.py:260
+msgid "Phone number"
+msgstr "Telefonnummer"
+
+#: contrib/admin/views/doc.py:263
+msgid "String (up to 50)"
+msgstr "Sträng (upp till 50)"
+
+#: contrib/admin/views/doc.py:265
+msgid "Text"
+msgstr "Text"
+
+#: contrib/admin/views/doc.py:266
+msgid "Time"
+msgstr "Tid"
+
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:268
+msgid "U.S. state (two uppercase letters)"
+msgstr "Stat i USA (två stora bokstäver)"
+
+#: contrib/admin/views/doc.py:269
+msgid "XML text"
+msgstr "XML-text"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Change password"
+msgstr "Ändra lösenord"
+
+#: contrib/admin/templates/admin/object_history.html:3
+#: contrib/admin/templates/admin/change_list.html:4
+#: contrib/admin/templates/admin/base.html:23
+#: contrib/admin/templates/admin/delete_confirmation.html:3
+#: contrib/admin/templates/admin/change_form.html:9
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+#: contrib/admin/templates/admin_doc/view_detail.html:4
+#: contrib/admin/templates/admin_doc/template_tag_index.html:5
+#: contrib/admin/templates/admin_doc/template_detail.html:4
+#: contrib/admin/templates/admin_doc/template_filter_index.html:5
+#: contrib/admin/templates/admin_doc/missing_docutils.html:4
+#: contrib/admin/templates/admin_doc/view_index.html:5
+#: contrib/admin/templates/admin_doc/model_detail.html:3
+#: contrib/admin/templates/admin_doc/index.html:4
+#: contrib/admin/templates/admin_doc/model_index.html:5
+msgid "Log out"
+msgstr "Logga ut"
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: 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
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Home"
+msgstr "Hem"
+
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:19
+msgid "History"
+msgstr "Historik"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
+msgstr "Datum/tid"
+
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
+msgid "User"
+msgstr "Användare"
+
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
+msgstr "Händelse"
+
+#: contrib/admin/templates/admin/object_history.html:26
+msgid "DATE_WITH_TIME_FULL"
+msgstr "D j F Y, H:i:s"
+
+#: contrib/admin/templates/admin/object_history.html:36
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Det här objektet har ingen ändringshistorik. Det lades antagligen inte till "
+"i den här admin-sidan"
+
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Djangos sidadministration"
+
+#: contrib/admin/templates/admin/base_site.html:7
+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&nbsp;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ätt 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
+#, python-format
+msgid "Add %(name)s"
+msgstr "Lägg till %(name)s"
+
+#: contrib/admin/templates/admin/login.html:15
+msgid "Username:"
+msgstr "Användarnamn:"
+
+#: contrib/admin/templates/admin/login.html:18
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: contrib/admin/templates/admin/login.html:20
+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/base.html:23
+msgid "Welcome,"
+msgstr "Välkommen,"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:6
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Att ta bort %(object_name)s '%(object)s' skulle innebära att besläktade "
+"objekt togs bort, men ditt konto har inte rättigheter att ta bort följande "
+"objekttyper:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:13
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Är du säker på att du vill ta bort %(object_name)s \"%(object)s\"? Följande "
+"besläktade föremål kommer att tas bort:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:17
+msgid "Yes, I'm sure"
+msgstr "Ja, jag är säker"
+
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(title)s "
+msgstr " Efter %(title)s "
+
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr "Utför"
+
+#: contrib/admin/templates/admin/change_form.html:20
+msgid "View on site"
+msgstr "Visa på hemsidan"
+
+#: contrib/admin/templates/admin/change_form.html:28
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Rätta till felet nedan."
+msgstr[1] "Rätta till felen nedan."
+
+#: contrib/admin/templates/admin/change_form.html:45
+msgid "Ordering"
+msgstr "Sortering"
+
+#: contrib/admin/templates/admin/change_form.html:48
+msgid "Order:"
+msgstr "Sortera:"
+
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr "Ta bort"
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Spara som ny"
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Spara och lägg till ytterligare en"
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Spara och fortsätt redigera"
+
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Spara"
+
+#: 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
+#: contrib/admin/templates/registration/password_change_form.html:10
+msgid "Password change"
+msgstr "Ändra lösenord"
+
+#: contrib/admin/templates/registration/password_change_done.html:6
+#: contrib/admin/templates/registration/password_change_done.html:10
+msgid "Password change successful"
+msgstr "Lösenordet ändrades"
+
+#: contrib/admin/templates/registration/password_change_done.html:12
+msgid "Your password was changed."
+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"
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"Har du glömt ditt lösenord? Fyll i din e-postadress nedan, så nollställer vi "
+"ditt lösenord och mailar det nya till dig."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "E-postadress:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Nollställ mitt lösenord"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Tack för att du spenderade kvalitetstid med webbsidan idag."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Logga in igen"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Nollställning av lösenordet lyckades"
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Vi har skickat ett nytt lösenord till e-postadressen du fyllde i. Det bör "
+"anlända snarast."
+
+#: contrib/admin/templates/registration/password_change_form.html:12
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Var god fyll i ditt gamla lösenord, för säkerhets skull, och skriv sedan in "
+"det nya lösenordet två gånger så vi kan kontrollera att du skrev det rätt."
+
+#: contrib/admin/templates/registration/password_change_form.html:17
+msgid "Old password:"
+msgstr "Gamla lösenordet:"
+
+#: contrib/admin/templates/registration/password_change_form.html:19
+msgid "New password:"
+msgstr "Nytt lösenord:"
+
+#: contrib/admin/templates/registration/password_change_form.html:21
+msgid "Confirm password:"
+msgstr "Bekräfta lösenord:"
+
+#: contrib/admin/templates/registration/password_change_form.html:23
+msgid "Change my password"
+msgstr "Ändra mitt lösenord"
+
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "Du får det här mailet eftersom du bad om att få lösenordet nollställt"
+
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "för ditt användarkonto på %(site_name)s"
+
+#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
+msgid "Your new password is: %(new_password)s"
+msgstr "Ditt nya lösenord är: %(new_password)s"
+
+#: contrib/admin/templates/registration/password_reset_email.html:7
+msgid "Feel free to change this password by going to this page:"
+msgstr ""
+"Känn dig välkommen att ändra det här lösenordet genom att gå till den här "
+"sidan:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "Ditt användarnamn, om du har glömt:"
+
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "Tack för att du använder vår sida!"
+
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "%(site_name)s-laget"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr "Dokumentation"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Smarta bokmärken"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr "Smarta bokmärken för dokumentation"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">För att installera smarta bokmärken, dra länken till din\n"
+"verktygsrad med bokmärken, eller högerklicka på länken och lägg till den\n"
+"till dina bokmärken. Nu kan du välja det smarta bokmärket från alla sidor\n"
+"på hemsidan. Notera att några av desa smarta bokmärken kräver att du tittar\n"
+"på sidan på en dator som är \"intern\" (prata med din systemadministratör\n"
+"om du inte är säker på om din dator är \"intern\")</p>\n"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "Dokumentation för den här sidan"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Förflyttar dig från valfri sida till dokumentationen för vyn som genererar "
+"den sidan."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr "Visa objektets id"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Visa innehållstypen och ID:t för sidor som representerar ett enskillt objekt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "Redigera det här objektet (nuvarande fönster)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+"Hoppar till administrationssidan för sidor som representerar ett enskillt "
+"objekt."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "Redigera det här objektet (nytt fönster)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr "Som ovan, men öppnaradministrationssidan i ett nytt fönster."
+
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr "Datum:"
+
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr "Tid:"
+
+#: contrib/redirects/models/redirects.py:7
+msgid "redirect from"
+msgstr "vidarebefodra från"
+
+#: contrib/redirects/models/redirects.py:8
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Det här bör vara en absolut sökväg, förutom domännamnet. Exempel: '/"
+"handelser/sok/'."
+
+#: contrib/redirects/models/redirects.py:9
+msgid "redirect to"
+msgstr "vidarebefodra till"
+
+#: contrib/redirects/models/redirects.py:10
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Det här kan vara antingen en absolut sökväg (som ovan), eller en komplett "
+"adress som börjar med 'http://'."
+
+#: contrib/redirects/models/redirects.py:12
+msgid "redirect"
+msgstr "vidarebefodra"
+
+#: contrib/redirects/models/redirects.py:13
+msgid "redirects"
+msgstr "vidarebefodringar"
+
+#: contrib/flatpages/models/flatpages.py:7
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Exempel: '/om/kontakt/'. Se till att ha inledande och avslutande snedsträck."
+
+#: contrib/flatpages/models/flatpages.py:8
+msgid "title"
+msgstr "titel"
+
+#: contrib/flatpages/models/flatpages.py:9
+msgid "content"
+msgstr "innehåll"
+
+#: contrib/flatpages/models/flatpages.py:10
+msgid "enable comments"
+msgstr "aktivera kommentarer"
+
+#: contrib/flatpages/models/flatpages.py:11
+msgid "template name"
+msgstr "mallnamn"
+
+#: contrib/flatpages/models/flatpages.py:12
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Exempel: 'flatpages/kontaktsida'. Om det här inte fylls i kommer systemet "
+"att använda 'flatpages/default'."
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "registration required"
+msgstr "registrering krävs"
+
+#: contrib/flatpages/models/flatpages.py:13
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Om det här bockas i kommer endast inloggade användare att kunna visa sidan"
+
+#: contrib/flatpages/models/flatpages.py:17
+msgid "flat page"
+msgstr "flatsida"
+
+#: contrib/flatpages/models/flatpages.py:18
+msgid "flat pages"
+msgstr "flatsidor"
+
+#: utils/translation.py:350
+msgid "DATE_FORMAT"
+msgstr "Y-m-d"
+
+#: utils/translation.py:351
+msgid "DATETIME_FORMAT"
+msgstr "Y-m-d, H:i"
+
+#: utils/translation.py:352
+msgid "TIME_FORMAT"
+msgstr "H:i:s"
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "måndag"
@@ -1427,28 +1124,23 @@ msgstr "januari"
 msgid "February"
 msgstr "februari"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "March"
 msgstr "mars"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "April"
 msgstr "april"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "May"
 msgstr "maj"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "June"
 msgstr "juni"
 
-#: utils/dates.py:15
-#: utils/dates.py:27
+#: utils/dates.py:15 utils/dates.py:27
 msgid "July"
 msgstr "juli"
 
@@ -1500,18 +1192,6 @@ msgstr "nov"
 msgid "Dec."
 msgstr "dec"
 
-#: utils/translation.py:350
-msgid "DATE_FORMAT"
-msgstr "Y-m-d"
-
-#: utils/translation.py:351
-msgid "DATETIME_FORMAT"
-msgstr "Y-m-d, H:i"
-
-#: utils/translation.py:352
-msgid "TIME_FORMAT"
-msgstr "H:i:s"
-
 #: utils/timesince.py:12
 msgid "year"
 msgid_plural "years"
@@ -1562,10 +1242,7 @@ msgstr "hemsidor"
 msgid "label"
 msgstr "etikett"
 
-#: models/core.py:29
-#: models/core.py:40
-#: models/auth.py:6
-#: models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
 msgid "name"
 msgstr "namn"
 
@@ -1617,8 +1294,7 @@ msgstr "kodnamn"
 msgid "Permission"
 msgstr "Rättighet"
 
-#: models/auth.py:11
-#: models/auth.py:58
+#: models/auth.py:11 models/auth.py:58
 msgid "Permissions"
 msgstr "Rättigheter"
 
@@ -1626,8 +1302,7 @@ msgstr "Rättigheter"
 msgid "Group"
 msgstr "Grupp"
 
-#: models/auth.py:23
-#: models/auth.py:60
+#: models/auth.py:23 models/auth.py:60
 msgid "Groups"
 msgstr "Grupper"
 
@@ -1680,8 +1355,12 @@ msgid "date joined"
 msgstr "registreringsdatum"
 
 #: models/auth.py:44
-msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
-msgstr "Förutom de rättigheterna som utdelas manuellt så kommer användaren dessutom få samma rättigheter som de grupper där han/hon är medlem."
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Förutom de rättigheterna som utdelas manuellt så kommer användaren dessutom "
+"få samma rättigheter som de grupper där han/hon är medlem."
 
 #: models/auth.py:48
 msgid "Users"
@@ -1699,7 +1378,422 @@ msgstr "Viktiga datum"
 msgid "Message"
 msgstr "Meddelande"
 
+#: conf/global_settings.py:37
+msgid "Bengali"
+msgstr "Bengaliska"
+
+#: conf/global_settings.py:38
+msgid "Czech"
+msgstr "Tjeckiska"
+
+#: conf/global_settings.py:39
+msgid "Welsh"
+msgstr "Walesiska"
+
+#: conf/global_settings.py:40
+msgid "Danish"
+msgstr "Danska"
+
+#: conf/global_settings.py:41
+msgid "German"
+msgstr "Tyska"
+
+#: conf/global_settings.py:42
+msgid "English"
+msgstr "Engelska"
+
+#: conf/global_settings.py:43
+msgid "Spanish"
+msgstr "Spanska"
+
+#: conf/global_settings.py:44
+msgid "French"
+msgstr "Franska"
+
+#: conf/global_settings.py:45
+msgid "Galician"
+msgstr "Galisiska"
+
+#: conf/global_settings.py:46
+msgid "Icelandic"
+msgstr "Isländska"
+
+#: conf/global_settings.py:47
+msgid "Italian"
+msgstr "Italienska"
+
+#: conf/global_settings.py:48
+msgid "Norwegian"
+msgstr "Norska"
+
+#: conf/global_settings.py:49
+msgid "Brazilian"
+msgstr "Brasilianska"
+
+#: conf/global_settings.py:50
+msgid "Romanian"
+msgstr "Rumänska"
+
+#: conf/global_settings.py:51
+msgid "Russian"
+msgstr "Ryska"
+
+#: conf/global_settings.py:52
+msgid "Slovak"
+msgstr "Slovakiska"
+
+#: conf/global_settings.py:53
+msgid "Serbian"
+msgstr "Serbiska"
+
+#: conf/global_settings.py:54
+msgid "Swedish"
+msgstr "Svenska"
+
+#: conf/global_settings.py:55
+msgid "Simplified Chinese"
+msgstr "Förenklad kinesiska"
+
+#: 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 "Det här fältet är obligatoriskt."
+
+#: core/formfields.py:336
+#, python-format
+msgid "Ensure your text is less than %s character."
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Se till att din text är kortare än %s tecken."
+msgstr[1] "Se till att din text är kortare än %s tecken."
+
+#: core/formfields.py:341
+msgid "Line breaks are not allowed here."
+msgstr "Radbrytningar är inte tillåtna här."
+
+#: 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 "Välj ett giltigt alternativ. '%(data)s' finns inte bland %(choices)s"
+
+#: core/formfields.py:601
+msgid "The submitted file is empty."
+msgstr "Den insända filen är tom."
+
+#: core/formfields.py:655
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Fyll i ett heltal mellan -32 768 och 32 767."
+
+#: core/formfields.py:664
+msgid "Enter a positive number."
+msgstr "Fyll i ett positivt heltal."
+
+#: core/formfields.py:673
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Fyll i ett heltal mellan 0 och 32 767."
+
+#: core/validators.py:62
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Det här värdet får bara innehålla bokstäver, tal och understräck."
+
+#: core/validators.py:66
+msgid "This value must contain only letters, numbers, underscores and slashes."
+msgstr ""
+"Det här värdet får bara innehålla bokstäver, tal, understräck och snedsträck"
+
+#: core/validators.py:74
+msgid "Uppercase letters are not allowed here."
+msgstr "Stora bokstäver är inte tillåtna här."
+
+#: core/validators.py:78
+msgid "Lowercase letters are not allowed here."
+msgstr "Små bokstäver är inte tillåtna här."
+
+#: core/validators.py:85
+msgid "Enter only digits separated by commas."
+msgstr "Fyll enbart i siffror avskillda med kommatecken."
+
+#: core/validators.py:97
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "Fyll i giltiga e-postadresser avskillda med kommatecken."
+
+#: core/validators.py:101
+msgid "Please enter a valid IP address."
+msgstr "Var god fyll i ett giltigt IP-nummer."
+
+#: core/validators.py:105
+msgid "Empty values are not allowed here."
+msgstr "Tomma värden är inte tillåtna här."
+
+#: core/validators.py:109
+msgid "Non-numeric characters aren't allowed here."
+msgstr "Icke-numeriska tecken är inte tillåtna här."
+
+#: core/validators.py:113
+msgid "This value can't be comprised solely of digits."
+msgstr "Det här värdet kan inte enbart bestå av siffror."
+
+#: core/validators.py:118
+msgid "Enter a whole number."
+msgstr "Fyll i ett heltal."
+
+#: core/validators.py:122
+msgid "Only alphabetical characters are allowed here."
+msgstr "Endast alfabetiska bokstäver är tillåtna här."
+
+#: core/validators.py:126
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Fyll i ett giltigt datum i formatet ÅÅÅÅ-MM-DD."
+
+#: core/validators.py:130
+msgid "Enter a valid time in HH:MM format."
+msgstr "Fyll i en giltig tid i formatet TT:MM"
+
+#: core/validators.py:134
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr "Fyll i en giltig tidpunkt i formatet ÅÅÅÅ-MM-DD TT:MM"
+
+#: core/validators.py:138
+msgid "Enter a valid e-mail address."
+msgstr "Fyll i en giltig e-postadress."
+
+#: core/validators.py:150
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Ladda upp en giltig bild. Filen du laddade upp var antingen inte en bild, "
+"eller så var det en korrupt bild."
+
+#: core/validators.py:157
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr "Adressen %s pekar inte till en giltig bild."
+
+#: core/validators.py:161
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr ""
+"Telefonnummer måste vara i det amerikanska formatet XXX-XXX-XXXX. \"%s\" är "
+"ogiltigt."
+
+#: core/validators.py:169
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr "Adressen %s pekar inte till en giltig QuickTime-video."
+
+#: core/validators.py:173
+msgid "A valid URL is required."
+msgstr "En giltig adress krävs."
+
+#: core/validators.py:187
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+"Giltig HTML krävs. Specifika fel är:\n"
+"%s"
+
+#: core/validators.py:194
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr "Missformad XML: %s"
+
+#: core/validators.py:204
+#, python-format
+msgid "Invalid URL: %s"
+msgstr "Felaktig URL: %s"
+
+#: core/validators.py:208 core/validators.py:210
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "URL:en %s är en trasig länk."
+
+#: core/validators.py:216
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "Fyll i en giltig förkortning för en amerikansk delstat"
+
+#: core/validators.py:231
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] "Håll i tungan! Ordet %s är inte tillåtet här."
+msgstr[1] "Håll i tungan! Orden %s är inte tillåtna här."
+
+#: core/validators.py:238
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr "Det här fältet måste matcha fältet '%s'."
+
+#: core/validators.py:257
+msgid "Please enter something for at least one field."
+msgstr "Fyll i något i minst ett fält."
+
+#: core/validators.py:266 core/validators.py:277
+msgid "Please enter both fields or leave them both empty."
+msgstr "Fyll antingen i båda fälten, eller lämna båda tomma"
+
+#: core/validators.py:284
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr "Det är fältet måste anges om %(field)s är %(value)s"
+
+#: core/validators.py:296
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr "Det här fältet måste anges om %(field)s inte är %(value)s"
+
+#: core/validators.py:315
+msgid "Duplicate values are not allowed."
+msgstr "Upprepade värden är inte tillåtna."
+
+#: core/validators.py:338
+#, python-format
+msgid "This value must be a power of %s."
+msgstr "Det här värdet måste vara en multipel av %s."
+
+#: core/validators.py:349
+msgid "Please enter a valid decimal number."
+msgstr "Fyll i ett giltigt decimaltal."
+
+#: core/validators.py:351
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] "Fyll i ett giltigt decimaltal med mindre än %s siffra totalt."
+msgstr[1] "Fyll i ett giltigt decimaltal med mindre än %s siffror totalt."
+
+#: core/validators.py:354
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] "Fyll i ett giltigt decimaltal med som mest %s decimalsiffra."
+msgstr[1] "Fyll i ett giltigt decimaltal med som mest %s decimalsiffror."
+
+#: core/validators.py:364
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr "Se till att filen du laddade upp är minst %s bytes stor."
+
+#: core/validators.py:365
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr "Se till att filen du laddade upp är max %s bytes stor."
+
+#: core/validators.py:378
+msgid "The format for this field is wrong."
+msgstr "Formatet på det här fältet är fel."
+
+#: core/validators.py:393
+msgid "This field is invalid."
+msgstr "Det här fältet är ogiltigt."
+
+#: core/validators.py:428
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "Kunde inte hämta något från %s."
+
+#: core/validators.py:431
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+"Adressen %(url)s returnerade det ogiltiga innehållstyphuvudet (Content-Type "
+"header) '%(contenttype)s'"
+
+#: core/validators.py:464
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Var god avsluta den oavslutade taggen %(tag)s på rad %(line)s. (Raden börjar "
+"med \"%(start)s\".)"
+
+#: core/validators.py:468
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"En del text från rad %(line)s är inte tillåtet i det sammanhanget. (Raden "
+"börjar med \"%(start)s\".)"
+
+#: core/validators.py:473
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"%(attr)s\" på rad %(line)s är inte ett gilltigt attribut. (Raden startar "
+"med \"%(start)s\".)"
+
+#: core/validators.py:478
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"<%(tag)s>\" på rad %(line)s är inte en giltig tagg. (Raden börjar med \"%"
+"(start)s\".)"
+
+#: core/validators.py:482
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"En tagg på rad %(line)s saknar en eller flera nödvändiga attribut. (Raden "
+"börjar med \"%(start)s\".)"
+
+#: core/validators.py:487
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Attributet \"%(attr)s\" på rad %(line)s har ett ogiltigt värde. (Raden "
+"börjar med \"%(start)s\".)"
+
+#: core/meta/fields.py:46
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Var god fyll i ett giltigt %s."
+
+#: core/meta/fields.py:60
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "%(optname)s med det här %(fieldname)s finns redan."
+
+#: core/meta/fields.py:129
+msgid " Separate multiple IDs with commas."
+msgstr " Separera flera ID:n med kommatecken."
+
+#: 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:508
+msgid "Enter a valid filename."
+msgstr "Fyll i ett giltigt filnamn."
+
+#: 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."
+msgstr[0] "Var god och fyll giltiga %(self)s ID. Värdet %(value)r är ogiltigt."
+msgstr[1] ""
+"Var god och fyll giltiga %(self)s ID. Värdena %(value)r är ogiltigt."
+
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr "ja,nej,kanske"
+
 #, fuzzy
 #~ msgid "count"
 #~ msgstr "innehåll"
-
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index f4915dbefb..498856c21c 100644
Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index 6454cab7a5..45e82bb17e 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-12-04 14:55+0100\n"
+"POT-Creation-Date: 2005-12-09 11:44+0100\n"
 "PO-Revision-Date: 2005-12-04 22:08+0800\n"
 "Last-Translator: limodou <limodou@gmail.com>\n"
 "Language-Team: Simplified Chinese <limodou@gmail.com>\n"
@@ -79,8 +79,7 @@ msgstr "日期/时间已提交"
 msgid "is public"
 msgstr "公开"
 
-#: contrib/comments/models/comments.py:26
-#: contrib/admin/views/doc.py:256
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256
 msgid "IP address"
 msgstr "IP地址"
 
@@ -89,8 +88,11 @@ msgid "is removed"
 msgstr "被删除"
 
 #: contrib/comments/models/comments.py:27
-msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
-msgstr "如果评论不适合选中这个检查框。评论将被一条\"此评论已经被删除\"的消息所替换。"
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"如果评论不适合选中这个检查框。评论将被一条\"此评论已经被删除\"的消息所替换。"
 
 #: contrib/comments/models/comments.py:31
 msgid "Comment"
@@ -219,17 +221,20 @@ msgid "No voting for yourself"
 msgstr "不能给自已投票"
 
 #: contrib/comments/views/comments.py:25
-msgid "This rating is required because you've entered at least one other rating."
+msgid ""
+"This rating is required because you've entered at least one other rating."
 msgstr "要求此等级,因为你已经输入了至少一个等级。"
 
 #: contrib/comments/views/comments.py:109
 #, python-format
 msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
 "\n"
 "%(text)s"
 msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
 "\n"
 "%(text)s"
 msgstr[0] ""
@@ -265,7 +270,9 @@ msgstr "有人篡改了评论表格(安全侵害)"
 
 #: contrib/comments/views/comments.py:204
 #: contrib/comments/views/comments.py:289
-msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
 msgstr "评论表格有一个无效的 'target' 参数 -- 对象 ID 无效"
 
 #: contrib/comments/views/comments.py:254
@@ -282,8 +289,7 @@ msgstr ""
 "<h3>由 %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:70
-#: contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
 #: contrib/admin/filterspecs.py:143
 msgid "All"
 msgstr "全部"
@@ -358,12 +364,18 @@ msgid "Log in"
 msgstr "登录"
 
 #: contrib/admin/views/decorators.py:56
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
 msgstr "请重新登录,因为你的会话已经过期。不用担心:你的提交已经被保存。"
 
 #: contrib/admin/views/decorators.py:63
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "看上去你的浏览器没有配置成接受 cookie 。请允许 cookie,重新装入本页面,再试一次。"
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"看上去你的浏览器没有配置成接受 cookie 。请允许 cookie,重新装入本页面,再试一"
+"次。"
 
 #: contrib/admin/views/decorators.py:77
 msgid "Usernames cannot contain the '@' character."
@@ -374,111 +386,106 @@ msgstr "用户名不能包含 '@' 字符。"
 msgid "Your e-mail address is not your username. Try '%s' instead."
 msgstr "你的邮箱地址不是你的用户名。换 '%s' 试试。"
 
-#: contrib/admin/views/main.py:49
+#: contrib/admin/views/main.py:52
 msgid "Site administration"
 msgstr "站点管理员"
 
-#: contrib/admin/views/main.py:64
+#: contrib/admin/views/main.py:67
 #, python-format
 msgid "Select %s"
 msgstr "选择 %s"
 
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:68
 #, python-format
 msgid "Select %s to change"
 msgstr "选择 %s 来修改"
 
-#: contrib/admin/views/main.py:407
+#: contrib/admin/views/main.py:410
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" 添加成功。"
 
-#: contrib/admin/views/main.py:412
-#: contrib/admin/views/main.py:488
+#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491
 msgid "You may edit it again below."
 msgstr "你可以在下面再次编辑它。"
 
-#: contrib/admin/views/main.py:420
-#: contrib/admin/views/main.py:497
+#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:500
 #, python-format
 msgid "You may add another %s below."
 msgstr "你可以在下面增加另一个 %s 。"
 
-#: contrib/admin/views/main.py:437
+#: contrib/admin/views/main.py:440
 #, python-format
 msgid "Add %s"
 msgstr "增加 %s"
 
-#: contrib/admin/views/main.py:453
+#: contrib/admin/views/main.py:456
 #, python-format
 msgid "Added %s."
 msgstr "%s 已增加。"
 
-#: contrib/admin/views/main.py:453
-#: contrib/admin/views/main.py:455
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:460
 msgid "and"
 msgstr "和"
 
-#: contrib/admin/views/main.py:455
+#: contrib/admin/views/main.py:458
 #, python-format
 msgid "Changed %s."
 msgstr "已修改 %s 。"
 
-#: contrib/admin/views/main.py:457
+#: contrib/admin/views/main.py:460
 #, python-format
 msgid "Deleted %s."
 msgstr "%s 已删除。"
 
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:463
 msgid "No fields changed."
 msgstr "没有字段被修改。"
 
-#: contrib/admin/views/main.py:485
+#: contrib/admin/views/main.py:488
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" 修改成功。"
 
-#: contrib/admin/views/main.py:494
+#: contrib/admin/views/main.py:497
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。"
 
-#: contrib/admin/views/main.py:532
+#: contrib/admin/views/main.py:535
 #, python-format
 msgid "Change %s"
 msgstr "修改 %s"
 
-#: contrib/admin/views/main.py:610
+#: contrib/admin/views/main.py:613
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
 msgstr "一个或多个 %(fieldname)s 在 %(name)s 中: %(obj)s"
 
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:618
 #, python-format
 msgid "One or more %(fieldname)s in %(name)s:"
 msgstr "一个或多个 %(fieldname)s 在 %(name)s 中:"
 
-#: contrib/admin/views/main.py:644
+#: contrib/admin/views/main.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
 msgstr "%(name)s \"%(obj)s\" 删除成功。"
 
-#: contrib/admin/views/main.py:647
+#: contrib/admin/views/main.py:650
 msgid "Are you sure?"
 msgstr "你确信吗?"
 
-#: contrib/admin/views/main.py:662
+#: contrib/admin/views/main.py:665
 #, python-format
 msgid "Change history: %s"
 msgstr "修改历史: %s"
 
-#: contrib/admin/views/doc.py:244
-#: contrib/admin/views/doc.py:253
-#: contrib/admin/views/doc.py:255
-#: contrib/admin/views/doc.py:261
-#: contrib/admin/views/doc.py:262
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253
+#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261
+#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264
 msgid "Integer"
 msgstr "整数"
 
@@ -507,8 +514,7 @@ msgstr "日期(带时间)"
 msgid "E-mail address"
 msgstr "邮箱地址"
 
-#: contrib/admin/views/doc.py:251
-#: contrib/admin/views/doc.py:254
+#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254
 msgid "File path"
 msgstr "文件路径"
 
@@ -540,8 +546,7 @@ msgstr "文本"
 msgid "Time"
 msgstr "时间"
 
-#: contrib/admin/views/doc.py:267
-#: contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6
 msgid "URL"
 msgstr "URL"
 
@@ -612,8 +617,7 @@ msgstr "历史"
 msgid "Date/time"
 msgstr "日期/时间"
 
-#: contrib/admin/templates/admin/object_history.html:19
-#: models/auth.py:47
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
 msgid "User"
 msgstr "用户"
 
@@ -626,7 +630,9 @@ msgid "DATE_WITH_TIME_FULL"
 msgstr "N j, Y, P"
 
 #: contrib/admin/templates/admin/object_history.html:36
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
 msgstr "此对象没有修改历史。可能不能通过这个管理站点来增加。"
 
 #: contrib/admin/templates/admin/base_site.html:4
@@ -650,8 +656,12 @@ 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 "存在一个错误。它已经通过电子邮件被报告给站点管理员了,并且应该很快被改正。谢谢你的关心。"
+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
@@ -710,13 +720,21 @@ msgstr "欢迎,"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:6
 #, python-format
-msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "删除 %(object_name)s  '%(object)s' 会导致删除相关的对象,但你的帐号无权删除下列类型的对象:"
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"删除 %(object_name)s  '%(object)s' 会导致删除相关的对象,但你的帐号无权删除下"
+"列类型的对象:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:13
 #, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
-msgstr "你确信相要删除 %(object_name)s \"%(object)s\"?所有相关的项目都将被删除:"
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"你确信相要删除 %(object_name)s \"%(object)s\"?所有相关的项目都将被删除:"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:17
 msgid "Yes, I'm sure"
@@ -792,8 +810,12 @@ msgid "Password reset"
 msgstr "口令重设"
 
 #: contrib/admin/templates/registration/password_reset_form.html:12
-msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
-msgstr "忘记你的口令?在下面输入你的邮箱地址,我们将重设你的口令并且将新的口令通过邮件发送给你。"
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"忘记你的口令?在下面输入你的邮箱地址,我们将重设你的口令并且将新的口令通过邮"
+"件发送给你。"
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
@@ -817,12 +839,19 @@ msgid "Password reset successful"
 msgstr "口令重设成功"
 
 #: contrib/admin/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。"
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。"
 
 #: contrib/admin/templates/registration/password_change_form.html:12
-msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
-msgstr "请输入你的旧口令,为了安全起见,接着要输入你的新口令两遍,这样我们可以校验你输入的是否正确。"
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"请输入你的旧口令,为了安全起见,接着要输入你的新口令两遍,这样我们可以校验你"
+"输入的是否正确。"
 
 #: contrib/admin/templates/registration/password_change_form.html:17
 msgid "Old password:"
@@ -906,7 +935,9 @@ msgid "Documentation for this page"
 msgstr "本页面的文档"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid "Jumps you from any page to the documentation for the view that generates that page."
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
 msgstr "对于任何页面跳转到生成这个页面的view所在的文件。"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:22
@@ -914,7 +945,9 @@ msgid "Show object ID"
 msgstr "显示对象ID"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid "Shows the content-type and unique ID for pages that represent a single object."
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
 msgstr "用于那些表现单个对象的页面显示 content-type 和唯一ID。"
 
 #: contrib/admin/templates/admin_doc/bookmarklets.html:25
@@ -946,7 +979,9 @@ msgid "redirect from"
 msgstr "重定向自"
 
 #: contrib/redirects/models/redirects.py:8
-msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr "应该是一个绝对路径,不包括域名。例如:'/events/search/'。"
 
 #: contrib/redirects/models/redirects.py:9
@@ -954,7 +989,9 @@ msgid "redirect to"
 msgstr "重定向到"
 
 #: contrib/redirects/models/redirects.py:10
-msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
 msgstr "可以是绝对路径(同上)或以'http://'开始的全URL。"
 
 #: contrib/redirects/models/redirects.py:12
@@ -966,7 +1003,8 @@ msgid "redirects"
 msgstr "重定向"
 
 #: contrib/flatpages/models/flatpages.py:7
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr "例如:'/about/contact/'。请确保前导和结尾的除号。"
 
 #: contrib/flatpages/models/flatpages.py:8
@@ -986,8 +1024,11 @@ msgid "template name"
 msgstr "模板名称"
 
 #: contrib/flatpages/models/flatpages.py:12
-msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'."
-msgstr "例如:'flatfiles/contact_page'。如果未提供,系统将使用'flatfiles/default'。"
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"例如:'flatfiles/contact_page'。如果未提供,系统将使用'flatfiles/default'。"
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "registration required"
@@ -1053,28 +1094,23 @@ msgstr "一月"
 msgid "February"
 msgstr "二月"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "March"
 msgstr "三月"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "April"
 msgstr "四月"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "May"
 msgstr "五月"
 
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
 msgid "June"
 msgstr "六月"
 
-#: utils/dates.py:15
-#: utils/dates.py:27
+#: utils/dates.py:15 utils/dates.py:27
 msgid "July"
 msgstr "七月"
 
@@ -1171,10 +1207,7 @@ msgstr "站点"
 msgid "label"
 msgstr "标签"
 
-#: models/core.py:29
-#: models/core.py:40
-#: models/auth.py:6
-#: models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
 msgid "name"
 msgstr "名称"
 
@@ -1226,8 +1259,7 @@ msgstr "代码名称"
 msgid "Permission"
 msgstr "许可"
 
-#: models/auth.py:11
-#: models/auth.py:58
+#: models/auth.py:11 models/auth.py:58
 msgid "Permissions"
 msgstr "许可"
 
@@ -1235,8 +1267,7 @@ msgstr "许可"
 msgid "Group"
 msgstr "组"
 
-#: models/auth.py:23
-#: models/auth.py:60
+#: models/auth.py:23 models/auth.py:60
 msgid "Groups"
 msgstr "组"
 
@@ -1289,8 +1320,11 @@ msgid "date joined"
 msgstr "加入日期"
 
 #: models/auth.py:44
-msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
-msgstr "除了手动设置权限以外,用户也会从他(她)所在的小组获得所赋组小组的所有权限。"
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"除了手动设置权限以外,用户也会从他(她)所在的小组获得所赋组小组的所有权限。"
 
 #: models/auth.py:48
 msgid "Users"
@@ -1384,9 +1418,7 @@ msgstr "瑞典语"
 msgid "Simplified Chinese"
 msgstr "简体中文"
 
-#: core/formfields.py:59
-#: core/meta/fields.py:285
-#: core/meta/fields.py:488
+#: 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 "这个字段是必输项。"
@@ -1401,9 +1433,7 @@ msgstr[0] "确定你输入的文本少于 %s 个字符。"
 msgid "Line breaks are not allowed here."
 msgstr "这里不允许换行符。"
 
-#: core/formfields.py:436
-#: core/formfields.py:507
-#: core/formfields.py:545
+#: 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 "选择一个有效的选项: '%(data)s' 不在 %(choices)s 中。"
@@ -1489,7 +1519,9 @@ msgid "Enter a valid e-mail address."
 msgstr "输入一个有效的邮件地址。"
 
 #: core/validators.py:150
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
 msgstr "上传一个有效的图片。您所上传的文件或者不是图片或是一个破坏的图片。"
 
 #: core/validators.py:157
@@ -1530,8 +1562,7 @@ msgstr "格式错误的 XML: %s"
 msgid "Invalid URL: %s"
 msgstr "无效 URL: %s"
 
-#: core/validators.py:208
-#: core/validators.py:210
+#: core/validators.py:208 core/validators.py:210
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL %s 是一个断开的链接。"
@@ -1555,8 +1586,7 @@ msgstr "这个字段必须与 '%s' 字段相匹配。"
 msgid "Please enter something for at least one field."
 msgstr "请至少在一个字段上输入些什么。"
 
-#: core/validators.py:266
-#: core/validators.py:277
+#: core/validators.py:266 core/validators.py:277
 msgid "Please enter both fields or leave them both empty."
 msgstr "请要么两个字段都输入或者两个字段都空着。"
 
@@ -1586,13 +1616,15 @@ msgstr "请输入一个有效的小数。"
 #: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural "Please enter a valid decimal number with at most %s total digits."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
 msgstr[0] "请输入一个有效的小数,最多 %s 个数字。 "
 
 #: core/validators.py:354
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural "Please enter a valid decimal number with at most %s decimal places."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
 msgstr[0] "请输入一个有效的小数,最多 %s 个小数位。 "
 
 #: core/validators.py:364
@@ -1620,38 +1652,57 @@ msgstr "不能从 %s 得到任何东西。"
 
 #: core/validators.py:431
 #, python-format
-msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr "URL %(url)s 返回了无效的 Content-Type 头 '%(contenttype)s'。"
 
 #: core/validators.py:464
 #, python-format
-msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
-msgstr "请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)"
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)"
 
 #: core/validators.py:468
 #, python-format
-msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
-msgstr "在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)"
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)"
 
 #: core/validators.py:473
 #, python-format
-msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
-msgstr "在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)"
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)"
 
 #: core/validators.py:478
 #, python-format
-msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
-msgstr "在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)"
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)"
 
 #: core/validators.py:482
 #, python-format
-msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
-msgstr "在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)"
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)"
 
 #: core/validators.py:487
 #, python-format
-msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
-msgstr "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
 
 #: core/meta/fields.py:46
 #, python-format
@@ -1668,7 +1719,8 @@ msgid " Separate multiple IDs with commas."
 msgstr " 用逗号分隔多个ID。"
 
 #: core/meta/fields.py:132
-msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr " 按下 \"Control\",或者在Mac上按 \"Command\" 来选择一个或多个值。"
 
 #: core/meta/fields.py:508
@@ -1678,7 +1730,8 @@ msgstr "输入一个有效的文件名。"
 #: 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."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
 msgstr[0] "请输入有效的 %(self)s ID。值 %(value)r 无效。"
 
 #: core/template/defaultfilters.py:354
@@ -1688,4 +1741,3 @@ msgstr "是、否、也许"
 #, fuzzy
 #~ msgid "count"
 #~ msgstr "内容"
-
diff --git a/django/contrib/admin/media/js/SelectFilter2.js b/django/contrib/admin/media/js/SelectFilter2.js
index 380ae72c91..a34f80ad03 100644
--- a/django/contrib/admin/media/js/SelectFilter2.js
+++ b/django/contrib/admin/media/js/SelectFilter2.js
@@ -33,7 +33,7 @@ var SelectFilter = {
         // <div class="selector-available">
         var selector_available = quickElement('div', selector_div, '');
         selector_available.className = 'selector-available';
-        quickElement('h2', selector_available, 'Available ' + field_name);
+        quickElement('h2', selector_available, interpolate(gettext('Available %s'), [field_name]));
         var filter_p = quickElement('p', selector_available, '');
         filter_p.className = 'selector-filter';
         quickElement('img', filter_p, '', 'src', admin_media_prefix + 'img/admin/selector-search.gif');
@@ -41,27 +41,27 @@ var SelectFilter = {
         var filter_input = quickElement('input', filter_p, '', 'type', 'text');
         filter_input.id = field_id + '_input';
         selector_available.appendChild(from_box);
-        var choose_all = quickElement('a', selector_available, 'Choose all', 'href', 'javascript: (function(){ SelectBox.move_all("' + field_id + '_from", "' + field_id + '_to"); })()');
+        var choose_all = quickElement('a', selector_available, gettext('Choose all'), 'href', 'javascript: (function(){ SelectBox.move_all("' + field_id + '_from", "' + field_id + '_to"); })()');
         choose_all.className = 'selector-chooseall';
 
         // <ul class="selector-chooser">
         var selector_chooser = quickElement('ul', selector_div, '');
         selector_chooser.className = 'selector-chooser';
-        var add_link = quickElement('a', quickElement('li', selector_chooser, ''), 'Add', 'href', 'javascript: (function(){ SelectBox.move("' + field_id + '_from","' + field_id + '_to");})()');
+        var add_link = quickElement('a', quickElement('li', selector_chooser, ''), gettext('Add'), 'href', 'javascript: (function(){ SelectBox.move("' + field_id + '_from","' + field_id + '_to");})()');
         add_link.className = 'selector-add';
-        var remove_link = quickElement('a', quickElement('li', selector_chooser, ''), 'Remove', 'href', 'javascript: (function(){ SelectBox.move("' + field_id + '_to","' + field_id + '_from");})()');
+        var remove_link = quickElement('a', quickElement('li', selector_chooser, ''), gettext('Remove'), 'href', 'javascript: (function(){ SelectBox.move("' + field_id + '_to","' + field_id + '_from");})()');
         remove_link.className = 'selector-remove';
 
         // <div class="selector-chosen">
         var selector_chosen = quickElement('div', selector_div, '');
         selector_chosen.className = 'selector-chosen';
-        quickElement('h2', selector_chosen, 'Chosen ' + field_name);
-        var selector_filter = quickElement('p', selector_chosen, 'Select your choice(s) and click ');
+        quickElement('h2', selector_chosen, interpolate(gettext('Chosen %s'), [field_name]));
+        var selector_filter = quickElement('p', selector_chosen, gettext('Select your choice(s) and click '));
         selector_filter.className = 'selector-filter';
         quickElement('img', selector_filter, '', 'src', admin_media_prefix + 'img/admin/selector-add.gif', 'alt', 'Add');
         var to_box = quickElement('select', selector_chosen, '', 'id', field_id + '_to', 'multiple', 'multiple', 'size', from_box.size, 'name', from_box.getAttribute('name'));
         to_box.className = 'filtered';
-        var clear_all = quickElement('a', selector_chosen, 'Clear all', 'href', 'javascript: (function() { SelectBox.move_all("' + field_id + '_to", "' + field_id + '_from");})()');
+        var clear_all = quickElement('a', selector_chosen, gettext('Clear all'), 'href', 'javascript: (function() { SelectBox.move_all("' + field_id + '_to", "' + field_id + '_from");})()');
         clear_all.className = 'selector-clearall';
 
         from_box.setAttribute('name', from_box.getAttribute('name') + '_old');