diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index d7e8ce269e..e7dad034f6 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 dcf121d928..7d13196217 100644
--- a/django/conf/locale/bn/LC_MESSAGES/django.po
+++ b/django/conf/locale/bn/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django CVS\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-11-28 11:32+0100\n"
"PO-Revision-Date: 2005-11-12 20:05+0530\n"
"Last-Translator: Baishampayan Ghose \n"
"Language-Team: Ankur Bangla \n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
#, fuzzy
msgid "IP address"
msgstr "ই-মেল ঠিকানা"
@@ -352,7 +352,7 @@ msgstr "কার্যবিবরণী এন্ট্রি"
msgid "log entries"
msgstr "কার্যবিবরণী এন্ট্রি সমুহ"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr ""
@@ -397,170 +397,170 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "যোগ করুন"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "পরিবর্তন"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "পরিবর্তন"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "পাসওয়ার্ড পরিবর্তন করুন"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
#, fuzzy
msgid "Date (without time)"
msgstr "কাজের সময়"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
#, fuzzy
msgid "Date (with time)"
msgstr "তারিখ/সময়"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "E-mail address"
msgstr "ই-মেল ঠিকানা:"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "Decimal number"
msgstr "ডিসেম্বর"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
#, fuzzy
msgid "Phone number"
msgstr "একটি গোটা সংখ্যা ঢোকান।"
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "ইউ.আর.এল"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr ""
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -571,7 +571,7 @@ msgid "Home"
msgstr "বাড়ি"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "ইতিহাস"
@@ -637,7 +637,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "আমরা দুঃখিত, কিন্তু আবেদনকৃত পাতা খুঁজে পাওয়া গেল না।"
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "যোগ করুন"
@@ -661,7 +661,7 @@ msgstr "আমার কাজ"
msgid "None available"
msgstr "কিছুই পাওয়া যাচ্ছে না"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "যোগ করুন"
@@ -713,26 +713,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "হ্যাঁ, আমি নিশ্চিত"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr ""
@@ -1727,6 +1731,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "অভ্যন্তরস্থ বস্তু"
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index dd19914fd3..c7a70b0ee5 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 d0bc41827a..7dbfd0d512 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@@ -7,14 +7,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Django Czech translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-23 00:05+0100\n"
+"POT-Creation-Date: 2005-11-28 11:31+0100\n"
"PO-Revision-Date: 2005-11-23 19:58+0100\n"
"Last-Translator: Radek Svarz \n"
"Language-Team: Czech\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: Czech\n"
"X-Poedit-Country: CZECH REPUBLIC\n"
@@ -78,8 +79,7 @@ msgstr "datum/čas byl zaslán"
msgid "is public"
msgstr "je veřejné"
-#: contrib/comments/models/comments.py:26
-#: contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
msgid "IP address"
msgstr "IP adresa"
@@ -88,8 +88,12 @@ msgid "is removed"
msgstr "je odstraněno"
#: 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 "Zaškrtněte tento box, pokud komentář není vhodný. Místo něj bude zobrazena zpráva \"Tento komentář byl smazán\"."
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Zaškrtněte tento box, pokud komentář není vhodný. Místo něj bude zobrazena "
+"zpráva \"Tento komentář byl smazán\"."
#: contrib/comments/models/comments.py:31
msgid "Comment"
@@ -218,29 +222,37 @@ msgid "No voting for yourself"
msgstr "Nelze hlasovat pro sebe"
#: contrib/comments/views/comments.py:25
-msgid "This rating is required because you've entered at least one other rating."
-msgstr "Toto hodnocení je povinné, protože jste zadal(a) alespoň jedno jiné hodnocení."
+msgid ""
+"This rating is required because you've entered at least one other rating."
+msgstr ""
+"Toto hodnocení je povinné, protože jste zadal(a) alespoň jedno jiné "
+"hodnocení."
#: 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] ""
-"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %(count)s komentář:\n"
+"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %"
+"(count)s komentář:\n"
"\n"
"%(text)s"
msgstr[1] ""
-"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %(count)s komentáře:\n"
+"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %"
+"(count)s komentáře:\n"
"\n"
"%(text)s"
msgstr[2] ""
-"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %(count)s komentářů:\n"
+"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %"
+"(count)s komentářů:\n"
"\n"
"%(text)s"
@@ -272,15 +284,18 @@ msgstr "Někdo falšoval formulář komentáře (bezpečnostní narušení)"
#: 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 "Formulář komentáře měl neplatný parametr 'target' -- ID objektu nebylo platné"
+msgid ""
+"The comment form had an invalid 'target' parameter -- the object ID was "
+"invalid"
+msgstr ""
+"Formulář komentáře měl neplatný parametr 'target' -- ID objektu nebylo platné"
#: contrib/comments/views/comments.py:254
#: contrib/comments/views/comments.py:318
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr "Formulář komentáře neobsahoval buď 'preview' nebo 'post'"
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
#, python-format
msgid ""
"By %s:
\n"
@@ -289,41 +304,40 @@ msgstr ""
"Od %s:
\n"
"\n"
-#: contrib/admin/filterspecs.py:62
-#: contrib/admin/filterspecs.py:79
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
msgid "All"
msgstr "Vše"
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
msgid "Any date"
msgstr "Libovolné datum"
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
msgid "Today"
msgstr "Dnes"
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
msgid "Past 7 days"
msgstr "Posledních 7 dní"
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
msgid "This month"
msgstr "Tento měsíc"
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
msgid "This year"
msgstr "Tento rok"
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
msgid "Yes"
msgstr "Ano"
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
msgid "No"
msgstr "Ne"
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
msgid "Unknown"
msgstr "Neznámé"
@@ -355,7 +369,7 @@ msgstr "log záznam"
msgid "log entries"
msgstr "log záznamy"
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr "Všechna data"
@@ -365,12 +379,20 @@ msgid "Log in"
msgstr "Přihlášení"
#: 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 "Prosíme, znovu se přihlašte, Vaše sezení vypršelo. Nemusíte se obávat, Vaše podání je uloženo."
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Prosíme, znovu se přihlašte, Vaše sezení vypršelo. Nemusíte se obávat, Vaše "
+"podání je uloženo."
#: 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 "Vypadá to, že Váš prohlížeč není nastaven, aby akceptoval cookies. Prosíme, zapněte cookies, obnovte tuto stránku a zkuste znovu."
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Vypadá to, že Váš prohlížeč není nastaven, aby akceptoval cookies. Prosíme, "
+"zapněte cookies, obnovte tuto stránku a zkuste znovu."
#: contrib/admin/views/decorators.py:77
msgid "Usernames cannot contain the '@' character."
@@ -379,188 +401,183 @@ msgstr "Uživatelská jména nemohou obsahovat znak '@'."
#: contrib/admin/views/decorators.py:79
#, python-format
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'."
+msgstr ""
+"Vaše e-mailová adresa není Vaše uživatelské jméno. Zkuste místo toho '%s'."
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
msgid "Site administration"
msgstr "Django správa"
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
#, python-format
msgid "Select %s"
msgstr "Vybrat %s"
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
#, python-format
msgid "Select %s to change"
msgstr "Vyberte %s pro změnu"
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně přidán."
-#: contrib/admin/views/main.py:426
-#: contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr "Můžete to opět upravit níže."
-#: contrib/admin/views/main.py:434
-#: contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr "Můžete přidat další %s níže."
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr "%s: přidat"
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr "Záznam %s byl přidán."
-#: contrib/admin/views/main.py:467
-#: contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr "a"
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr "%s: změněno"
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr "Záznam %s byl smazán."
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr "Nebyly změněny žádné pole."
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" byl úspěšně změněn."
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:498
#, 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."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"The %(name)s \"%(obj)s\" byl úspěšně přidán. Můžete to opět upravit níže."
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr "%s: změnit"
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr "Jedno nebo více %(fieldname)s z %(name)s: %(obj)s"
-#: contrib/admin/views/main.py:631
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Jedno nebo více %(fieldname)s z %(name)s:"
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně smazán."
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr "Jste si jist(á)?"
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:666
#, python-format
msgid "Change history: %s"
msgstr "Historie změn: %s"
-#: contrib/admin/views/doc.py:262
-#: contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273
-#: contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279
-#: contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr "Celé číslo"
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr "Boolean (buď Ano (True), nebo Ne (False))"
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr "Text (maximálně %(maxlength)s znaků)"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr "Celá čísla oddělená čárkou"
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
msgid "Date (without time)"
msgstr "Datum (bez času)"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
msgid "Date (with time)"
msgstr "Datum (s časem)"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
msgid "E-mail address"
msgstr "E-mailová adresa"
-#: contrib/admin/views/doc.py:269
-#: contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr "Cesta k souboru"
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
msgid "Decimal number"
msgstr "Desetiné číslo"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (buď Ano (True), Ne (False), nebo Nic (None))"
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
msgid "Phone number"
msgstr "Telefonní číslo"
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr "Text (max. 50 znaků)"
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr "Text"
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr "Čas"
-#: contrib/admin/views/doc.py:284
-#: contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr "Stát US (2 velké znaky)"
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr "text XML"
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:10
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -570,13 +587,74 @@ msgstr "text XML"
msgid "Home"
msgstr "Domů"
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr "%(name)s: přidat"
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:17
+msgid "History"
+msgstr "Historie"
+
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "Date/time"
+msgstr "Datum/čas"
+
+#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
+msgid "User"
+msgstr "Uživatel"
+
+#: contrib/admin/templates/admin/object_history.html:20
+msgid "Action"
+msgstr "Akce"
+
+#: contrib/admin/templates/admin/object_history.html:26
+msgid "DATE_WITH_TIME_FULL"
+msgstr "N, 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 ""
+"Tento objekt nemá historii změn. Pravděpodobně nebyl přidán přes "
+"administrátorské rozhraní."
+
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Django správa webu"
+
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Django správa"
+
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Chyba serveru"
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Chyba serveru (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error (500)"
+msgstr "Chyba serveru (500)"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Nastala chyba. Ta byla oznámena administrátorovi serveru pomocí e-mailu a "
+"měla by být brzy odstraněna. Děkujeme za trpělivost."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Stránka nenalezena"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena."
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Přidat"
@@ -600,55 +678,10 @@ msgstr "Mé akce"
msgid "None available"
msgstr "Nic"
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Chyba serveru"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Chyba serveru (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error (500)"
-msgstr "Chyba serveru (500)"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
-msgstr "Nastala chyba. Ta byla oznámena administrátorovi serveru pomocí e-mailu a měla by být brzy odstraněna. Děkujeme za trpělivost."
-
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
-msgid "History"
-msgstr "Historie"
-
-#: contrib/admin/templates/admin/object_history.html:18
-msgid "Date/time"
-msgstr "Datum/čas"
-
-#: contrib/admin/templates/admin/object_history.html:19
-#: models/auth.py:47
-msgid "User"
-msgstr "Uživatel"
-
-#: contrib/admin/templates/admin/object_history.html:20
-msgid "Action"
-msgstr "Akce"
-
-#: contrib/admin/templates/admin/object_history.html:26
-msgid "DATE_WITH_TIME_FULL"
-msgstr "N, 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 "Tento objekt nemá historii změn. Pravděpodobně nebyl přidán přes administrátorské rozhraní."
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Django správa webu"
-
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Django správa"
+#: contrib/admin/templates/admin/change_list.html:9
+#, python-format
+msgid "Add %(name)s"
+msgstr "%(name)s: přidat"
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
@@ -662,48 +695,6 @@ msgstr "Heslo:"
msgid "Have you forgotten your password?"
msgstr "Zapomněl(a) jste své heslo?"
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Stránka nenalezena"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena."
-
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr "Pohled na stránku"
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Prosíme, odstraňte chybu uvedenou níže."
-msgstr[1] "Prosíme, odstraňte chyby uvedené níže."
-msgstr[2] "Prosíme, odstraňte chyby uvedené níže."
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr "Objednávání"
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr "Objednávka:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:7
-#, python-format
-msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "Mazání %(object_name)s '%(object)s' by vyústilo ve vymazání souvisejících objektů, ale Váš účet nemá oprávnění pro mazání následujících typů objektů:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
-msgstr "Jste si jist(á), že chcete smazat %(object_name)s \"%(object)s\"? Všechny následující související položky budou smazány:"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Ano, jsem si jist"
-
#: contrib/admin/templates/admin/base.html:23
msgid "Welcome,"
msgstr "Vítejte,"
@@ -716,6 +707,57 @@ msgstr "Změnit heslo"
msgid "Log out"
msgstr "Odhlásit se"
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Mazání %(object_name)s '%(object)s' by vyústilo ve vymazání souvisejících "
+"objektů, ale Váš účet nemá oprávnění pro mazání následujících typů objektů:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Jste si jist(á), že chcete smazat %(object_name)s \"%(object)s\"? Všechny "
+"následující související položky budou smazány:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Ano, jsem si jist"
+
+#: 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 ""
+
+#: contrib/admin/templates/admin/change_form.html:18
+msgid "View on site"
+msgstr "Pohled na stránku"
+
+#: contrib/admin/templates/admin/change_form.html:26
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Prosíme, odstraňte chybu uvedenou níže."
+msgstr[1] "Prosíme, odstraňte chyby uvedené níže."
+msgstr[2] "Prosíme, odstraňte chyby uvedené níže."
+
+#: contrib/admin/templates/admin/change_form.html:43
+msgid "Ordering"
+msgstr "Objednávání"
+
+#: contrib/admin/templates/admin/change_form.html:46
+msgid "Order:"
+msgstr "Objednávka:"
+
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Delete"
msgstr "Smazat"
@@ -736,11 +778,6 @@ msgstr "Uložit a pokračovat v úpravách"
msgid "Save"
msgstr "Uložit"
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr "Od %(title)s"
-
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
#: contrib/admin/templates/registration/password_change_form.html:6
@@ -759,13 +796,18 @@ msgstr "Vaše heslo bylo změněno."
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
#: contrib/admin/templates/registration/password_reset_done.html:4
msgid "Password reset"
msgstr "Obnovení hesla"
#: 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 "Zapomněl(a) jste heslo? Vložte níže Vaši e-mailovou adresu a my Vaše heslo obnovíme a zašleme Vám e-mailem nové."
+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 ""
+"Zapomněl(a) jste heslo? Vložte níže Vaši e-mailovou adresu a my Vaše heslo "
+"obnovíme a zašleme Vám e-mailem nové."
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
@@ -789,12 +831,20 @@ msgid "Password reset successful"
msgstr "Obnovení hesla bylo úspěšné"
#: 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 "Poslali jsme Vám e-mailem nové heslo na adresu, kterou jste zadal(a). Měl(a) byste ji dostat během okamžiku."
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Poslali jsme Vám e-mailem nové heslo na adresu, kterou jste zadal(a). Měl(a) "
+"byste ji dostat během okamžiku."
#: 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 "Prosíme, pro zabezpečení vložte svoje staré heslo a poté vložte dvakrát nové heslo, takže můžeme ověřit, že jste ho napsal(a) správně."
+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 ""
+"Prosíme, pro zabezpečení vložte svoje staré heslo a poté vložte dvakrát nové "
+"heslo, takže můžeme ověřit, že jste ho napsal(a) správně."
#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
@@ -866,10 +916,13 @@ msgid ""
"your computer is \"internal\").
\n"
msgstr ""
"\n"
-"Pro nainstalování bookmarkletů, přetáhněte odkaz na Vaše záložky (oblíbené),\n"
-"nebo klikněte pravým tlačítkem na odkaz a přidejte ho k Vašim záložkám (oblíbeným). Nyní můžete\n"
+"
Pro nainstalování bookmarkletů, přetáhněte odkaz na Vaše "
+"záložky (oblíbené),\n"
+"nebo klikněte pravým tlačítkem na odkaz a přidejte ho k Vašim záložkám "
+"(oblíbeným). Nyní můžete\n"
"zvolit bookmarklet z libovolné stránky. Poznámka: Některé tyto\n"
-"bookmarklety vyžadují, abyste prohlížel(a) stránky z počítače, který je nastaven jako\n"
+"bookmarklety vyžadují, abyste prohlížel(a) stránky z počítače, který je "
+"nastaven jako\n"
"\"interní\" (promluvte si s Vaším administrátorem, jestli si nejste jisti,\n"
"zda je Váš počítač \"interní\").
\n"
@@ -878,16 +931,24 @@ msgid "Documentation for this page"
msgstr "Dokumentace pro tuto stránku"
#: 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 "Z libovolné stránky otevře dokumentaci pro pohled, který vygeneroval tuto stránku."
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Z libovolné stránky otevře dokumentaci pro pohled, který vygeneroval tuto "
+"stránku."
#: contrib/admin/templates/admin_doc/bookmarklets.html:22
msgid "Show object ID"
msgstr "Ukázat id objektu"
#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "Ukáže content-type a unikátní ID pro stránky, které reprezentují jeden objekt."
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Ukáže content-type a unikátní ID pro stránky, které reprezentují jeden "
+"objekt."
#: contrib/admin/templates/admin_doc/bookmarklets.html:25
msgid "Edit this object (current window)"
@@ -910,16 +971,23 @@ msgid "redirect from"
msgstr "přesměrovat z"
#: contrib/redirects/models/redirects.py:8
-msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
-msgstr "Toto by měla být absolutní cesta, bez domény. Např. '/udalosti/hledat/'."
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Toto by měla být absolutní cesta, bez domény. Např. '/udalosti/hledat/'."
#: contrib/redirects/models/redirects.py:9
msgid "redirect to"
msgstr "přesměrovat 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 "Toto může být buď absolutní cesta (jako nahoře) nebo plné URL začínající na 'http://'."
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Toto může být buď absolutní cesta (jako nahoře) nebo plné URL začínající na "
+"'http://'."
#: contrib/redirects/models/redirects.py:12
msgid "redirect"
@@ -930,8 +998,10 @@ msgid "redirects"
msgstr "přesměrování"
#: contrib/flatpages/models/flatpages.py:7
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "Příklad: '/o/kontakt/'. Ujistěte se, že máte počáteční a konečná lomítka."
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Příklad: '/o/kontakt/'. Ujistěte se, že máte počáteční a konečná lomítka."
#: contrib/flatpages/models/flatpages.py:8
msgid "title"
@@ -950,8 +1020,12 @@ msgid "template name"
msgstr "jméno šablony"
#: contrib/flatpages/models/flatpages.py:12
-msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'."
-msgstr "Například: 'flatfiles/kontaktni_stranka'. Pokud toto není zadáno, systém použije 'flatfiles/default'."
+msgid ""
+"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
+"use 'flatpages/default'."
+msgstr ""
+"Například: 'flatfiles/kontaktni_stranka'. Pokud toto není zadáno, systém "
+"použije 'flatfiles/default'."
#: contrib/flatpages/models/flatpages.py:13
msgid "registration required"
@@ -959,7 +1033,9 @@ msgstr "nutná registrace"
#: contrib/flatpages/models/flatpages.py:13
msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "Pokud je zaškrtnuto, pouze přihlášení uživatelé budou moci prohlížet tuto stránku."
+msgstr ""
+"Pokud je zaškrtnuto, pouze přihlášení uživatelé budou moci prohlížet tuto "
+"stránku."
#: contrib/flatpages/models/flatpages.py:17
msgid "flat page"
@@ -1017,28 +1093,23 @@ msgstr "Leden"
msgid "February"
msgstr "Únor"
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
msgid "March"
msgstr "Březen"
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
msgid "April"
msgstr "Duben"
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
msgid "May"
msgstr "Květen"
-#: utils/dates.py:14
-#: utils/dates.py:27
+#: utils/dates.py:14 utils/dates.py:27
msgid "June"
msgstr "Červen"
-#: utils/dates.py:15
-#: utils/dates.py:27
+#: utils/dates.py:15 utils/dates.py:27
msgid "July"
msgstr "Červenec"
@@ -1145,10 +1216,7 @@ msgstr "weby"
msgid "label"
msgstr "nadpis"
-#: 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 "jméno"
@@ -1200,8 +1268,7 @@ msgstr "codename"
msgid "Permission"
msgstr "Oprávnění"
-#: models/auth.py:11
-#: models/auth.py:58
+#: models/auth.py:11 models/auth.py:58
msgid "Permissions"
msgstr "Oprávnění"
@@ -1209,8 +1276,7 @@ msgstr "Oprávnění"
msgid "Group"
msgstr "Skupina"
-#: models/auth.py:23
-#: models/auth.py:60
+#: models/auth.py:23 models/auth.py:60
msgid "Groups"
msgstr "Skupiny"
@@ -1235,7 +1301,8 @@ msgid "password"
msgstr "heslo"
#: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+#, fuzzy
+msgid "Use '[algo]$[salt]$[hexdigest]'"
msgstr "Použijte '[algo]$[salt]$[hexdigest]"
#: models/auth.py:38
@@ -1263,8 +1330,12 @@ msgid "date joined"
msgstr "datum zaregistrování"
#: 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 "Kromě manuálně přidělených oprávnění uživatel dostane všechna oprávnění pro každou skupinu, ve které je."
+msgid ""
+"In addition to the permissions manually assigned, this user will also get "
+"all permissions granted to each group he/she is in."
+msgstr ""
+"Kromě manuálně přidělených oprávnění uživatel dostane všechna oprávnění pro "
+"každou skupinu, ve které je."
#: models/auth.py:48
msgid "Users"
@@ -1358,45 +1429,41 @@ msgstr "Švédsky"
msgid "Simplified Chinese"
msgstr "Jednoduchá čínština"
-#: core/formfields.py:59
-#: core/meta/fields.py:287
-#: core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
msgid "This field is required."
msgstr "Toto pole je povinné."
-#: core/formfields.py:339
-#, python-format
-msgid "Ensure your text is less than %s character"
+#: core/formfields.py:336
+#, fuzzy, python-format
+msgid "Ensure your text is less than %s character."
msgid_plural "Ensure your text is less than %s characters."
msgstr[0] "Ujistěte se, že Váš text má méně než %s znak."
msgstr[1] "Ujistěte se, že Váš text má méně, než %s znaky."
msgstr[2] "Ujistěte se, že Váš text má méně, než %s znaků."
-#: core/formfields.py:344
+#: core/formfields.py:341
msgid "Line breaks are not allowed here."
msgstr "Zalomení řádky zde nenjsou povolená."
-#: core/formfields.py:440
-#: core/formfields.py:511
-#: core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "Vyberte platnou volbu. '%(data)s' není mezi %(choices)s."
-#: core/formfields.py:605
+#: core/formfields.py:601
msgid "The submitted file is empty."
msgstr "Odevzdaný soubor je prázdný."
-#: core/formfields.py:659
+#: core/formfields.py:655
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Vložte celé číslo mezi -32,768 a 32,767."
-#: core/formfields.py:668
+#: core/formfields.py:664
msgid "Enter a positive number."
msgstr "Vložte celé kladné číslo."
-#: core/formfields.py:677
+#: core/formfields.py:673
msgid "Enter a whole number between 0 and 32,767."
msgstr "Vložte celé číslo mezi 0 a 32,767."
@@ -1406,7 +1473,8 @@ msgstr "Tato hodnota musí obsahovat pouze znaky, čísla nebo podtržítka."
#: core/validators.py:66
msgid "This value must contain only letters, numbers, underscores and slashes."
-msgstr "Tato hodnota musí obsahovat pouze znaky, čísla, podtržítka nebo lomítka."
+msgstr ""
+"Tato hodnota musí obsahovat pouze znaky, čísla, podtržítka nebo lomítka."
#: core/validators.py:74
msgid "Uppercase letters are not allowed here."
@@ -1465,8 +1533,12 @@ msgid "Enter a valid e-mail address."
msgstr "Vložte platnou e-mailovou adresu."
#: core/validators.py:150
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Nahrajte na server platný obrázek. Soubor, který jste nahrál(a) nebyl obrázek, nebo byl porušen."
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Nahrajte na server platný obrázek. Soubor, který jste nahrál(a) nebyl "
+"obrázek, nebo byl porušen."
#: core/validators.py:157
#, python-format
@@ -1506,8 +1578,7 @@ msgstr "Špatně formované XML: %s"
msgid "Invalid URL: %s"
msgstr "Neplatné 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 "Odkaz na URL %s je rozbitý."
@@ -1533,8 +1604,7 @@ msgstr "Toto pole se musí shodovat s polem '%s'."
msgid "Please enter something for at least one field."
msgstr "Prosíme, vložte něco alespoň pro jedno pole."
-#: 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 "Prosíme, vložte obě pole, nebo je nechte obě prázdná."
@@ -1564,7 +1634,8 @@ msgstr "Prosíme, vložte platné číslo."
#: 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] "Prosíme, vložte platné číslo s nejvíce %s cifrou celkem."
msgstr[1] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem."
msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem."
@@ -1572,10 +1643,16 @@ msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem."
#: 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] "Prosíme, vložte platné číslo s nejvíce %s cifrou za desetinnou čárkou celkem."
-msgstr[1] "Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou celkem."
-msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou celkem."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] ""
+"Prosíme, vložte platné číslo s nejvíce %s cifrou za desetinnou čárkou celkem."
+msgstr[1] ""
+"Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou "
+"celkem."
+msgstr[2] ""
+"Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou "
+"celkem."
#: core/validators.py:364
#, python-format
@@ -1602,38 +1679,63 @@ msgstr "Nemohl jsem získat nic z %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 vrátilo neplatnou hlavičku 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 "Prosíme, zavřete nezavřenou značku %(tag)s z řádky %(line)s. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Prosíme, zavřete nezavřenou značku %(tag)s z řádky %(line)s. (Řádka začíná 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 "Nějaký text začínající na řádce %(line)s není povolen v tomto kontextu. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Nějaký text začínající na řádce %(line)s není povolen v tomto kontextu. "
+"(Řádka začíná s \"%(start)s\".)"
#: core/validators.py:473
#, python-format
-msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
-msgstr "\"%(attr)s\" na řádce %(line)s je neplatný atribut. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"%(attr)s\" na řádce %(line)s je neplatný atribut. (Řádka začíná 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 "\"<%(tag)s>\" na řádce %(line)s je neplatná značka. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"\"<%(tag)s>\" na řádce %(line)s je neplatná značka. (Řádka začíná 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 "Značce na řádce %(line)s schází jeden nebo více požadovaných atributů. (Řádka začíná s \"%(start)s\".)"
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Značce na řádce %(line)s schází jeden nebo více požadovaných atributů. "
+"(Řádka začíná s \"%(start)s\".)"
#: core/validators.py: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\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s \"%(start)s\".)"
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s "
+"\"%(start)s\".)"
#: core/meta/fields.py:46
#, python-format
@@ -1645,28 +1747,39 @@ msgstr "Prosíme, zadejte %s správně."
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "%(optname)s s tímto %(fieldname)s již existuje."
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
msgid " Separate multiple IDs with commas."
msgstr "Oddělte více identifikátorů čárkami."
-#: core/meta/fields.py:134
-msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr "Podržte \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné položky."
+#: core/meta/fields.py:132
+msgid ""
+" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Podržte \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné "
+"položky."
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
msgid "Enter a valid filename."
msgstr "Vložte platný název souboru."
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid"
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
msgstr[0] "Prosíme, vložte platná %(self)s ID. Hodnota %(value)r není platná."
-msgstr[1] "Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
-msgstr[2] "Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
+msgstr[1] ""
+"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
+msgstr[2] ""
+"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné."
+
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
#~ msgid "Error in Template"
#~ msgstr "Chyba v šabloně"
+
#~ msgid ""
#~ "\n"
#~ "In template %(name)s, error at line %(line)s:\n"
@@ -1677,4 +1790,3 @@ msgstr[2] "Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platn
#, fuzzy
#~ msgid "count"
#~ msgstr "počet"
-
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index 679b9c1a49..aa63656635 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 b79aa55253..48dc0c8e8f 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-11-28 11:32+0100\n"
"PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
"Last-Translator: Jason Davies \n"
"Language-Team: Cymraeg \n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
#, fuzzy
msgid "IP address"
msgstr "cyfeiriad e-bost"
@@ -352,7 +352,7 @@ msgstr "cofnod"
msgid "log entries"
msgstr "cofnodion"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr ""
@@ -397,170 +397,170 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Ychwanegu"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Newidio"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Newidio"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Newid cyfrinair"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
#, fuzzy
msgid "Date (without time)"
msgstr "amser gweithred"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
#, fuzzy
msgid "Date (with time)"
msgstr "Dyddiad/amser"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "E-mail address"
msgstr "Cyfeiriad e-bost:"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "Decimal number"
msgstr "Rhagfyr"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
#, fuzzy
msgid "Phone number"
msgstr "Rhowch rhif cyfan."
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr ""
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -571,7 +571,7 @@ msgid "Home"
msgstr "Adref"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Hanes"
@@ -637,7 +637,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Mae'n ddrwg gennym, ond nid darganfwyd y dudalen a dymunwyd"
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Ychwanegu"
@@ -661,7 +661,7 @@ msgstr "Fy Ngweithredau"
msgid "None available"
msgstr "Dim ar gael"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Ychwanegu"
@@ -713,26 +713,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "Yndw, rwy'n sicr"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr ""
@@ -1735,6 +1739,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "cynnwys"
diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo
index ef0fcc7e97..289182240a 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 3f49a14b17..91ff704071 100644
--- a/django/conf/locale/da/LC_MESSAGES/django.po
+++ b/django/conf/locale/da/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-11-28 11:32+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Morten Bagai \n"
"Language-Team: Danish\n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
#, fuzzy
msgid "IP address"
msgstr "e-mail adresse"
@@ -352,7 +352,7 @@ msgstr "logmeddelelse"
msgid "log entries"
msgstr "logmeddelelser"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr ""
@@ -397,170 +397,170 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Tilføj"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Ændre"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Ændre"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Ændre adgangskode"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
#, fuzzy
msgid "Date (without time)"
msgstr "handlingstid"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
#, fuzzy
msgid "Date (with time)"
msgstr "Dato/tid"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "E-mail address"
msgstr "E-mail adresse:"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "Decimal number"
msgstr "December"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
#, fuzzy
msgid "Phone number"
msgstr "Indtast et heltal."
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "Internetadresse"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr ""
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -571,7 +571,7 @@ msgid "Home"
msgstr "Hjem"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Historik"
@@ -637,7 +637,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Vi Beklager, men den ønskede side kunne ikke findes"
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Tilføj"
@@ -661,7 +661,7 @@ msgstr "Mine handlinger"
msgid "None available"
msgstr "Ingen tilgængelige"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, python-format
msgid "Add %(name)s"
msgstr ""
@@ -713,26 +713,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "Ja, jeg er sikker"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr ""
@@ -1735,5 +1739,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#~ msgid "Traditional Chinese"
#~ msgstr "Traditionel Kinesisk"
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index e11050075d..396036cb1a 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 db070944b8..fef01a7a56 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-11-28 11:31+0100\n"
"PO-Revision-Date: 2005-10-08 00:03+0200\n"
"Last-Translator: Georg Bauer \n"
"MIME-Version: 1.0\n"
@@ -74,7 +74,7 @@ msgstr "Datum/Zeit Erstellung"
msgid "is public"
msgstr "ist ffentlich"
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
msgid "IP address"
msgstr "IP-Adresse"
@@ -362,7 +362,7 @@ msgstr "Logeintrag"
msgid "log entries"
msgstr "Logeintrge"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr "Alle Tage"
@@ -412,55 +412,55 @@ msgstr "%s ausw
msgid "Select %s to change"
msgstr "%s zur nderung auswhlen"
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefgt."
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr "Das Element kann jetzt weiter gendert werden."
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, 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:442
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr "%s zufgen"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr "%s hinzugefgt."
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr "und"
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr "%s gendert"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr "%s gelscht."
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr "Keine Felder gendert."
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gendert."
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@@ -468,111 +468,111 @@ msgstr ""
"%(name)s \"%(obj)s\" wurde erfolgreich zugefgt. Das Element kann jetzt "
"gendert werden."
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr "%s ndern"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, 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:620
+#: contrib/admin/views/main.py:619
#, 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:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelscht."
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr "Sicher? Ganz sicher?"
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, python-format
msgid "Change history: %s"
msgstr "nderungsgeschichte: %s"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr "Ganzzahl"
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr "Wahrheitswert (Wahr oder Falsch)"
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr "Zeichenkette (bis zu %(maxlength)s Zeichen)"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr "Kommaseparierte Liste von Zahlen"
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
msgid "Date (without time)"
msgstr "Datum (ohne Zeit)"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
msgid "Date (with time)"
msgstr "Datum (mit Zeit)"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
msgid "E-mail address"
msgstr "E-mail-Adresse"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr "Dateipfad"
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
msgid "Decimal number"
msgstr "Dezimalzahl"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr "Wahrheitswert (Wahr, Falsch oder Nichts)"
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
msgid "Phone number"
msgstr "Telefonnummer"
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr "Zeichenkette (bis zu 50 Zeichen)"
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr "Text"
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr "Zeit"
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)"
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr "XML Text"
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -583,7 +583,7 @@ msgid "Home"
msgstr "Start"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Geschichte"
@@ -651,7 +651,7 @@ msgstr ""
"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden."
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Zufgen"
@@ -675,7 +675,7 @@ msgstr "Meine Aktionen"
msgid "None available"
msgstr "Keine vorhanden"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, python-format
msgid "Add %(name)s"
msgstr "%(name)s zufgen"
@@ -728,26 +728,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "Ja, ich bin sicher"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr " Nach %(title)s "
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr "Los"
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr "Im Web Anzeigen"
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Bitte den Fehler korrigieren."
msgstr[1] "Bitte die Fehler korrigieren."
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr "Sortierung"
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr "Reihenfolge:"
@@ -1766,3 +1770,7 @@ msgstr[0] ""
msgstr[1] ""
"Bitte gltige IDs fr %(self)s eingeben. Die Werte %(value)r sind ungltig."
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr "Ja,Nein,Vielleicht"
+
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index 21cff98d44..34f114e052 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 39d75a0330..e21ea3651d 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:26-0600\n"
+"POT-Creation-Date: 2005-11-28 11:31+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -76,7 +76,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
msgid "IP address"
msgstr ""
@@ -335,7 +335,7 @@ msgstr ""
msgid "log entries"
msgstr ""
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr ""
@@ -379,165 +379,165 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr ""
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr ""
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr ""
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, python-format
msgid "Change history: %s"
msgstr ""
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
msgid "Date (without time)"
msgstr ""
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
msgid "Date (with time)"
msgstr ""
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
msgid "E-mail address"
msgstr ""
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
msgid "Decimal number"
msgstr ""
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
msgid "Phone number"
msgstr ""
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr ""
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr ""
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -548,7 +548,7 @@ msgid "Home"
msgstr ""
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr ""
@@ -610,7 +610,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr ""
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr ""
@@ -634,7 +634,7 @@ msgstr ""
msgid "None available"
msgstr ""
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, python-format
msgid "Add %(name)s"
msgstr ""
@@ -682,26 +682,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr ""
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr ""
@@ -1652,3 +1656,7 @@ msgid_plural ""
"Please enter valid %(self)s IDs. The values %(value)r are invalid."
msgstr[0] ""
msgstr[1] ""
+
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index 148615dca3..01715109b5 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 03687c9dde..8d9cf7757b 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-11-28 11:31+0100\n"
"PO-Revision-Date: 2005-10-04 20:59GMT\n"
"Last-Translator: Ricardo Javier Crdenes Medina \n"
@@ -77,7 +77,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
#, fuzzy
msgid "IP address"
msgstr "Direccin de correo:"
@@ -341,7 +341,7 @@ msgstr ""
msgid "log entries"
msgstr ""
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr ""
@@ -386,168 +386,168 @@ msgstr ""
msgid "Select %s to change"
msgstr "Cambie para modificar"
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Agregar"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Modificar"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Modificar"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Cambiar clave"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
#, fuzzy
msgid "Date (without time)"
msgstr "Fecha/hora"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
#, fuzzy
msgid "Date (with time)"
msgstr "Fecha/hora"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "E-mail address"
msgstr "Direccin de correo:"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
msgid "Decimal number"
msgstr ""
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
msgid "Phone number"
msgstr ""
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr ""
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr ""
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -558,7 +558,7 @@ msgid "Home"
msgstr "Inicio"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Histrico"
@@ -626,7 +626,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Lo sentimos, pero no se encuentra la pgina solicitada."
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Agregar"
@@ -650,7 +650,7 @@ msgstr "Mis acciones"
msgid "None available"
msgstr "Ninguno disponible"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Agregar"
@@ -703,26 +703,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "S, estoy seguro"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr ""
@@ -1689,5 +1693,9 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#~ msgid "Server error (500)"
#~ msgstr "Error del servidor (500)"
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 0b059f944a..a413704a00 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 e1ddd2286d..c225138afd 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-11-28 11:31+0100\n"
"PO-Revision-Date: 2005-10-18 12:27+0200\n"
"Last-Translator: Laurent Rahuel \n"
"Language-Team: franais \n"
@@ -77,7 +77,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
#, fuzzy
msgid "IP address"
msgstr "courriel"
@@ -351,7 +351,7 @@ msgstr "entr
msgid "log entries"
msgstr "entres de log"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr ""
@@ -396,170 +396,170 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Ajouter"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Modifier"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Modifier"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Modifier votre mot de passe"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
#, fuzzy
msgid "Date (without time)"
msgstr "heure de l'action"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
#, fuzzy
msgid "Date (with time)"
msgstr "Date/Heure"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "E-mail address"
msgstr "Courriel:"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "Decimal number"
msgstr "Dcembre"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
#, fuzzy
msgid "Phone number"
msgstr "Entrez un nombre entier."
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr ""
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -570,7 +570,7 @@ msgid "Home"
msgstr "Accueil"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Historique"
@@ -638,7 +638,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Nous sommes dsols, mais la page demande est introuvable."
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Ajouter"
@@ -662,7 +662,7 @@ msgstr "Mes actions"
msgid "None available"
msgstr "Aucun(e) disponible"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Ajouter"
@@ -715,26 +715,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "Oui, je suis certain"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr ""
@@ -1754,6 +1758,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#~ msgid "Traditional Chinese"
#~ msgstr "Chinois traditionnel"
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index ea9a66606b..bc36cb6452 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 de6f404442..cc834b4330 100644
--- a/django/conf/locale/gl/LC_MESSAGES/django.po
+++ b/django/conf/locale/gl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:26-0600\n"
+"POT-Creation-Date: 2005-11-28 11:31+0100\n"
"PO-Revision-Date: 2005-10-16 14:29+0100\n"
"Last-Translator: Afonso Fernández Nogueira \n"
"Language-Team: Galego\n"
@@ -77,7 +77,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
#, fuzzy
msgid "IP address"
msgstr "Enderezo de correo electrónico:"
@@ -341,7 +341,7 @@ msgstr ""
msgid "log entries"
msgstr ""
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr ""
@@ -386,168 +386,168 @@ msgstr ""
msgid "Select %s to change"
msgstr "Faga clic para modificar"
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Engadir"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Modificar"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Modificar"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Cambiar contrasinal"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
#, fuzzy
msgid "Date (without time)"
msgstr "Data/hora"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
#, fuzzy
msgid "Date (with time)"
msgstr "Data/hora"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "E-mail address"
msgstr "Enderezo de correo electrónico:"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
msgid "Decimal number"
msgstr ""
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
msgid "Phone number"
msgstr ""
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr ""
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr ""
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -558,7 +558,7 @@ msgid "Home"
msgstr "Inicio"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Histórico"
@@ -625,7 +625,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Sentímolo, pero non se atopou a páxina solicitada."
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Engadir"
@@ -649,7 +649,7 @@ msgstr "As miñas accións"
msgid "None available"
msgstr "Ningunha dispoñíbel"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Engadir"
@@ -702,26 +702,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "Si, estou seguro"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr ""
@@ -1687,3 +1691,7 @@ msgid_plural ""
"Please enter valid %(self)s IDs. The values %(value)r are invalid."
msgstr[0] ""
msgstr[1] ""
+
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index 4030c1bd35..c43ff20d17 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 8a12af4d7e..12b923dc52 100644
--- a/django/conf/locale/is/LC_MESSAGES/django.po
+++ b/django/conf/locale/is/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-11-28 11:32+0100\n"
"PO-Revision-Date: 2005-11-13 18:08-0000\n"
"Last-Translator: Dagur Páll Ammendrup \n"
"Language-Team: \n"
@@ -80,7 +80,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
#, fuzzy
msgid "IP address"
msgstr "tölvupóstfang"
@@ -354,7 +354,7 @@ msgstr "kladdafærsla"
msgid "log entries"
msgstr "kladdafærslur"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr ""
@@ -399,170 +399,170 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Bæta við"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Breyta"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Breyta"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Breyta lykilorði"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
#, fuzzy
msgid "Date (without time)"
msgstr "tími aðgerðar"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
#, fuzzy
msgid "Date (with time)"
msgstr "Dagsetning/tími"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "E-mail address"
msgstr "Tölvupóstfang:"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "Decimal number"
msgstr "desember"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
#, fuzzy
msgid "Phone number"
msgstr "Settu inn heila tölu."
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "veffang"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr ""
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -573,7 +573,7 @@ msgid "Home"
msgstr "Heim"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Saga"
@@ -639,7 +639,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Því miður fannst umbeðin síða ekki."
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Bæta við"
@@ -663,7 +663,7 @@ msgstr "Aðgerðir mínar"
msgid "None available"
msgstr "Engin fáanleg"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Bæta við"
@@ -715,26 +715,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "Já ég er viss."
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr ""
@@ -1733,6 +1737,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "innihald"
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 773a38fac5..791fbc69af 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 9ea1fc8e1c..a14316be4e 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-11-28 11:31+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
#, fuzzy
msgid "IP address"
msgstr "indirizzo e-mail"
@@ -352,7 +352,7 @@ msgstr "voce di log"
msgid "log entries"
msgstr "voci di log"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr ""
@@ -397,170 +397,170 @@ msgstr ""
msgid "Select %s to change"
msgstr "Clicca per cambiare"
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Aggiungi"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Cambia"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Cambia"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Cambia la password"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
#, fuzzy
msgid "Date (without time)"
msgstr "data azione"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
#, fuzzy
msgid "Date (with time)"
msgstr "Data/ora"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "E-mail address"
msgstr "Indirizzo e-mail:"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "Decimal number"
msgstr "Dicembre"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
#, fuzzy
msgid "Phone number"
msgstr "Inserire un numero."
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr ""
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -571,7 +571,7 @@ msgid "Home"
msgstr "Pagina iniziale"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Storia"
@@ -638,7 +638,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Spiacente, ma la pagina richiesta non esiste."
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Aggiungi"
@@ -662,7 +662,7 @@ msgstr "Azioni Proprie"
msgid "None available"
msgstr "Nessuna disponibile"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Aggiungi"
@@ -715,26 +715,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "S, sono sicuro"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr ""
@@ -1733,6 +1737,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "contenuto"
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index b76367ee90..939d8fd376 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 4025dfc0aa..c771a292cf 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.po
+++ b/django/conf/locale/no/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-11-28 11:32+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Espen Grndhaug \n"
"Language-Team: Norwegian\n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
msgid "IP address"
msgstr "IP adresse"
@@ -369,7 +369,7 @@ msgstr "logg notis"
msgid "log entries"
msgstr "logg innlegg"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr "Alle datoer"
@@ -419,167 +419,167 @@ msgstr "Velg %s"
msgid "Select %s to change"
msgstr "Velg %s for å endre"
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, 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:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr "Du kan endre under"
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr "Du kan legge til en ny %s under."
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr "Ny %s"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr "La til %s"
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr "og"
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr "Endret %s."
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr "Slettet %s."
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr "Ingen felt endret."
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" ble endret."
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, 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:537
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr "Endre %s"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, 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:620
+#: contrib/admin/views/main.py:619
#, 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:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" ble slettet."
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr "Er du sikker?"
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Endre historien: %s"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr "Heltall"
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
#, fuzzy
msgid "Boolean (Either True or False)"
msgstr "Boolean (Enten \"True\" eller \"False\")"
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr "Tekst (opp til %(maxlength)s tegn)"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr "Heltall skilt med kommaer"
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
msgid "Date (without time)"
msgstr "Dato (uten tid)"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
msgid "Date (with time)"
msgstr "Dato/tid"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
msgid "E-mail address"
msgstr "Epost adresse"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr "Sti til fil"
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
msgid "Decimal number"
msgstr "Desimal tall"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
#, fuzzy
msgid "Boolean (Either True, False or None)"
msgstr "Boolean (enten \"True\", \"False\" eller \"None\")"
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
msgid "Phone number"
msgstr "Telefonnummer"
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr "Tekst (opp til 50 tegn)"
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr "Tekst"
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr "Tid"
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "Internettadresse"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr "Stat (i USA, to store bokstaver)"
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr "XML tekst"
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -590,7 +590,7 @@ msgid "Home"
msgstr "Hjem"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Historie"
@@ -656,7 +656,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Beklager, men siden du spør etter finnest ikke."
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Legg til"
@@ -680,7 +680,7 @@ msgstr "Mine handlinger"
msgid "None available"
msgstr "Ingen tilgjengelige"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, python-format
msgid "Add %(name)s"
msgstr "Legg til %(name)s"
@@ -732,26 +732,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "Ja, jeg er sikker"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr "Av %(title)s "
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr "Vis på siden"
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Vennligst fiks feilen under."
msgstr[1] "Vennligst fiks feilene under."
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr "Rekkefølge"
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr "Rekkefølge:"
@@ -1754,6 +1758,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#~ msgid "Error in Template"
#~ msgstr "Feil i mal"
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index bd74a9d34f..326de6d8f6 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 438788d13b..ff6bc59794 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-11-28 11:31+0100\n"
"PO-Revision-Date: 2005-10-11 09:12GMT-3\n"
"Last-Translator: João Paulo Farias \n"
"Language-Team: Português do Brasil \n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
#, fuzzy
msgid "IP address"
msgstr "endereço de e-mail:"
@@ -352,7 +352,7 @@ msgstr "entrada de log"
msgid "log entries"
msgstr "entradas de log"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr ""
@@ -397,170 +397,170 @@ msgstr ""
msgid "Select %s to change"
msgstr "Clique para alterar"
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Adicionar"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Modificar"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Modificar"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Alterar senha"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
#, fuzzy
msgid "Date (without time)"
msgstr "hora da ação"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
#, fuzzy
msgid "Date (with time)"
msgstr "Data/hora"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "E-mail address"
msgstr "Endereço de e-mail:"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "Decimal number"
msgstr "Dezembro"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
#, fuzzy
msgid "Phone number"
msgstr "Informe um número inteiro."
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr ""
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -571,7 +571,7 @@ msgid "Home"
msgstr "Início"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Histórico"
@@ -638,7 +638,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Desculpe, mas a página requisitada não pode ser encontrada."
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Adicionar"
@@ -662,7 +662,7 @@ msgstr "Minhas Ações"
msgid "None available"
msgstr "Nenhuma disponível"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Adicionar"
@@ -715,26 +715,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "Sim, tenho certeza"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr ""
@@ -1739,6 +1743,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "conteúdo"
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index 6fb17fe14f..78ec18dcb9 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 46e51ef1ee..d483abae7f 100644
--- a/django/conf/locale/ro/LC_MESSAGES/django.po
+++ b/django/conf/locale/ro/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-26 00:26+0100\n"
+"POT-Creation-Date: 2005-11-28 11:31+0100\n"
"PO-Revision-Date: 2005-11-08 19:06+GMT+2\n"
"Last-Translator: Tiberiu Micu \n"
"Language-Team: Romanian \n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
#, fuzzy
msgid "IP address"
msgstr "adresa email"
@@ -352,7 +352,7 @@ msgstr "intrare log"
msgid "log entries"
msgstr "intrări log"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr ""
@@ -397,170 +397,170 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Adaugă"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Schimbă"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Schimbă"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Schimbă parola"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
#, fuzzy
msgid "Date (without time)"
msgstr "timp acţiune"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
#, fuzzy
msgid "Date (with time)"
msgstr "Dată/oră"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "E-mail address"
msgstr "Adresa email:"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "Decimal number"
msgstr "Decembrie"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
#, fuzzy
msgid "Phone number"
msgstr "Introduceţi un număr întreg."
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr ""
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -571,7 +571,7 @@ msgid "Home"
msgstr "Acasă"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Istoric"
@@ -637,7 +637,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Ne pare rău, dar pagina cerută nu există."
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Adaugă"
@@ -661,7 +661,7 @@ msgstr "Acţiunile Mele"
msgid "None available"
msgstr "Indisponibil"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Adaugă"
@@ -714,26 +714,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "Da, sînt sigur"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr ""
@@ -1739,6 +1743,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "conţinut"
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 9b2f510342..f97e5e45bf 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 1befbcf2fb..79afe47d93 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-23 00:05+0100\n"
+"POT-Creation-Date: 2005-11-28 11:31+0100\n"
"PO-Revision-Date: 2005-11-26 00:00\n"
"Last-Translator: Dmitry Sorokin \n"
"Language-Team: LANGUAGE \n"
@@ -75,7 +75,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
msgid "IP address"
msgstr "IP "
@@ -269,47 +269,47 @@ msgstr ""
msgid "The comment form didn't provide either 'preview' or 'post'"
msgstr ""
-#: contrib/admin/filterspecs.py:32
+#: contrib/admin/filterspecs.py:40
#, python-format
msgid ""
"By %s:
\n"
"\n"
msgstr ""
-#: contrib/admin/filterspecs.py:62 contrib/admin/filterspecs.py:79
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
msgid "All"
msgstr ""
-#: contrib/admin/filterspecs.py:100
+#: contrib/admin/filterspecs.py:109
msgid "Any date"
msgstr " "
-#: contrib/admin/filterspecs.py:101
+#: contrib/admin/filterspecs.py:110
msgid "Today"
msgstr ""
-#: contrib/admin/filterspecs.py:104
+#: contrib/admin/filterspecs.py:113
msgid "Past 7 days"
msgstr " 7 "
-#: contrib/admin/filterspecs.py:106
+#: contrib/admin/filterspecs.py:115
msgid "This month"
msgstr " "
-#: contrib/admin/filterspecs.py:108
+#: contrib/admin/filterspecs.py:117
msgid "This year"
msgstr " "
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
msgid "Yes"
msgstr ""
-#: contrib/admin/filterspecs.py:134
+#: contrib/admin/filterspecs.py:143
msgid "No"
msgstr ""
-#: contrib/admin/filterspecs.py:142
+#: contrib/admin/filterspecs.py:150
msgid "Unknown"
msgstr ""
@@ -341,7 +341,7 @@ msgstr "
msgid "log entries"
msgstr " "
-#: contrib/admin/templatetags/admin_list.py:244
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr " "
@@ -354,7 +354,8 @@ msgstr "
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
-msgstr " , . :"
+msgstr ""
+" , . :"
" ."
#: contrib/admin/views/decorators.py:63
@@ -374,179 +375,179 @@ msgstr "
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
-#: contrib/admin/views/main.py:50
+#: contrib/admin/views/main.py:49
msgid "Site administration"
msgstr " "
-#: contrib/admin/views/main.py:65
+#: contrib/admin/views/main.py:64
#, python-format
msgid "Select %s"
msgstr " %s"
-#: contrib/admin/views/main.py:66
+#: contrib/admin/views/main.py:65
#, python-format
msgid "Select %s to change"
msgstr " %s "
-#: contrib/admin/views/main.py:421
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" ."
-#: contrib/admin/views/main.py:426 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr " "
-#: contrib/admin/views/main.py:434 contrib/admin/views/main.py:511
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr " % ."
-#: contrib/admin/views/main.py:451
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr " %s"
-#: contrib/admin/views/main.py:467
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr " %s"
-#: contrib/admin/views/main.py:467 contrib/admin/views/main.py:469
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:469
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr " %s."
-#: contrib/admin/views/main.py:471
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr " %s."
-#: contrib/admin/views/main.py:474
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:508
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:546
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr " %s"
-#: contrib/admin/views/main.py:626
+#: contrib/admin/views/main.py:614
#, 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:631
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr " %(fieldname)s %(name)s:"
-#: contrib/admin/views/main.py:660
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" ."
-#: contrib/admin/views/main.py:663
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr " ?"
-#: contrib/admin/views/main.py:678
+#: contrib/admin/views/main.py:666
#, python-format
msgid "Change history: %s"
msgstr " : %s"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr " (True False)"
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr " ( %(maxlength)s )"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ", "
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
msgid "Date (without time)"
msgstr " ( )"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
msgid "Date (with time)"
msgstr " ( )"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
msgid "E-mail address"
msgstr "E-mail "
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr " "
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
msgid "Decimal number"
msgstr " "
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr " (True, False None)"
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
msgid "Phone number"
msgstr " "
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr " ( 50 )"
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr " ( )"
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr "XML "
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -556,58 +557,8 @@ msgstr "XML
msgid "Home"
msgstr ""
-#: contrib/admin/templates/admin/change_list.html:10
-#, python-format
-msgid "Add %(name)s"
-msgstr " %(name)s"
-
-#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
-msgid "Add"
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:33
-msgid "Change"
-msgstr ""
-
-#: contrib/admin/templates/admin/index.html:43
-msgid "You don't have permission to edit anything."
-msgstr " ."
-
-#: contrib/admin/templates/admin/index.html:51
-msgid "Recent Actions"
-msgstr " "
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "My Actions"
-msgstr " "
-
-#: contrib/admin/templates/admin/index.html:56
-msgid "None available"
-msgstr ""
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr " "
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr " (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error (500)"
-msgstr " (500)"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid ""
-"There's been an error. It's been reported to the site administrators via e-"
-"mail and should be fixed shortly. Thanks for your patience."
-msgstr ""
-" . e-mail "
-" . ."
-
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr ""
@@ -643,6 +594,65 @@ msgstr "
msgid "Django administration"
msgstr " Django"
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr " "
+
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr " (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error (500)"
+msgstr " (500)"
+
+#: contrib/admin/templates/admin/500.html:10
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+" . e-mail "
+" . ."
+
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr " "
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr " , ."
+
+#: contrib/admin/templates/admin/index.html:27
+#: contrib/admin/templates/admin/change_form.html:12
+msgid "Add"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:33
+msgid "Change"
+msgstr ""
+
+#: contrib/admin/templates/admin/index.html:43
+msgid "You don't have permission to edit anything."
+msgstr " ."
+
+#: contrib/admin/templates/admin/index.html:51
+msgid "Recent Actions"
+msgstr " "
+
+#: contrib/admin/templates/admin/index.html:52
+msgid "My Actions"
+msgstr " "
+
+#: contrib/admin/templates/admin/index.html:56
+msgid "None available"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_list.html:9
+#, python-format
+msgid "Add %(name)s"
+msgstr " %(name)s"
+
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
msgstr ":"
@@ -655,32 +665,17 @@ msgstr "
msgid "Have you forgotten your password?"
msgstr " ?"
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr " "
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr " ,"
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr " , ."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr " "
-#: contrib/admin/templates/admin/change_form.html:20
-msgid "View on site"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:28
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] " ."
-msgstr[1] " ."
-
-#: contrib/admin/templates/admin/change_form.html:45
-msgid "Ordering"
-msgstr ""
-
-#: contrib/admin/templates/admin/change_form.html:48
-msgid "Order:"
-msgstr ":"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr ""
#: contrib/admin/templates/admin/delete_confirmation.html:7
#, python-format
@@ -689,9 +684,9 @@ msgid ""
"objects, but your account doesn't have permission to delete the following "
"types of objects:"
msgstr ""
-" %(object_name)s '%(object)s' "
-" , "
-":"
+" %(object_name)s '%(object)s' "
+", "
+" :"
#: contrib/admin/templates/admin/delete_confirmation.html:14
#, python-format
@@ -706,17 +701,32 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr ", "
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr " ,"
+#: contrib/admin/templates/admin/filter.html:2
+#, python-format
+msgid " By %(title)s "
+msgstr ""
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr " "
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr ""
+#: contrib/admin/templates/admin/change_form.html:18
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:26
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] " ."
+msgstr[1] " ."
+
+#: contrib/admin/templates/admin/change_form.html:43
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:46
+msgid "Order:"
+msgstr ":"
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Delete"
@@ -738,11 +748,6 @@ msgstr "
msgid "Save"
msgstr ""
-#: contrib/admin/templates/admin/filter.html:1
-#, python-format
-msgid " By %(title)s "
-msgstr ""
-
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
#: contrib/admin/templates/registration/password_change_form.html:6
@@ -761,6 +766,7 @@ msgstr "
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/password_reset_form.html:6
+#: contrib/admin/templates/registration/password_reset_form.html:10
#: contrib/admin/templates/registration/password_reset_done.html:4
msgid "Password reset"
msgstr " "
@@ -1243,7 +1249,7 @@ msgid "password"
msgstr ""
#: models/auth.py:37
-msgid "Use '[algo]$[salt]$[hexdigest]"
+msgid "Use '[algo]$[salt]$[hexdigest]'"
msgstr ""
#: models/auth.py:38
@@ -1370,40 +1376,40 @@ msgstr ""
msgid "Simplified Chinese"
msgstr ""
-#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:491
-#: core/meta/fields.py:502
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
msgid "This field is required."
msgstr " ."
-#: core/formfields.py:339
+#: core/formfields.py:336
#, python-format
-msgid "Ensure your text is less than %s character"
+msgid "Ensure your text is less than %s character."
msgid_plural "Ensure your text is less than %s characters."
msgstr[0] ""
msgstr[1] ""
-#: core/formfields.py:344
+#: core/formfields.py:341
msgid "Line breaks are not allowed here."
msgstr " ."
-#: core/formfields.py:440 core/formfields.py:511 core/formfields.py:549
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr ""
-#: core/formfields.py:605
+#: core/formfields.py:601
msgid "The submitted file is empty."
msgstr " - ."
-#: core/formfields.py:659
+#: core/formfields.py:655
msgid "Enter a whole number between -32,768 and 32,767."
msgstr ""
-#: core/formfields.py:668
+#: core/formfields.py:664
msgid "Enter a positive number."
msgstr " ."
-#: core/formfields.py:677
+#: core/formfields.py:673
msgid "Enter a whole number between 0 and 32,767."
msgstr " 0 32767."
@@ -1675,29 +1681,33 @@ msgstr ""
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr ""
-#: core/meta/fields.py:131
+#: core/meta/fields.py:129
msgid " Separate multiple IDs with commas."
msgstr " ID ."
-#: core/meta/fields.py:134
+#: core/meta/fields.py:132
msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
" \"Control\", \"Command\" , "
"."
-#: core/meta/fields.py:511
+#: core/meta/fields.py:508
msgid "Enter a valid filename."
msgstr " ."
-#: core/meta/fields.py:780
+#: core/meta/fields.py:777
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
-"Please enter valid %(self)s IDs. The values %(value)r are invalid"
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
msgstr[0] ""
msgstr[1] ""
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#~ msgid ""
#~ "Example: 'flatfiles/contact_page'. If this isn't provided, the system "
#~ "will use 'flatfiles/default'."
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index bf462d4d39..9ec7fc6801 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 19e39fc2ae..b2cd10357a 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 14:27-0500\n"
+"POT-Creation-Date: 2005-11-28 11:32+0100\n"
"PO-Revision-Date: 2005-11-10 23:22-0500\n"
"Last-Translator: Vladimir Labath \n"
"Language-Team: Slovak \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"
@@ -107,7 +76,7 @@ msgstr "dátum/čas poslania"
msgid "is public"
msgstr "je zveréjnený"
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
msgid "IP address"
msgstr "IP adresa"
@@ -137,6 +106,7 @@ msgid "Content object"
msgstr "Obsah objektu"
#: contrib/comments/models/comments.py:113
+#, python-format
msgid ""
"Posted by %(user)s at %(date)s\n"
"\n"
@@ -187,6 +157,7 @@ msgid "Karma scores"
msgstr "Karma údaje"
#: contrib/comments/models/comments.py:223
+#, python-format
msgid "%(score)d rating by %(user)s"
msgstr "%(score)d hodnotiteľ %(user)s"
@@ -203,10 +174,12 @@ msgid "User flags"
msgstr "Návestia užívateľa"
#: contrib/comments/models/comments.py:256
+#, python-format
msgid "Flag by %r"
msgstr " %r návestie"
#: contrib/comments/models/comments.py:271
+#, python-format
msgid ""
"This comment was flagged by %(user)s:\n"
"\n"
@@ -229,6 +202,7 @@ msgid "Moderator deletions"
msgstr "Moderátor odstránení"
#: contrib/comments/models/comments.py:286
+#, python-format
msgid "Moderator deletion by %r"
msgstr "Moderátor odstránenia %r"
@@ -250,6 +224,7 @@ msgid ""
msgstr "Toto hlasovanie je nevyhnutné, lebo súvisí s predchádzjúcou voľbou."
#: 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"
@@ -272,6 +247,7 @@ msgstr[1] ""
"%(text)s"
#: contrib/comments/views/comments.py:114
+#, python-format
msgid ""
"This comment was posted by a sketchy user:\n"
"\n"
@@ -310,57 +286,53 @@ 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:284
-msgid "URL"
-msgstr "URL"
-
-#: contrib/flatpages/models/flatpages.py:7
+#: contrib/admin/filterspecs.py:40
+#, python-format
msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+"By %s:
\n"
+"\n"
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'."
+#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:143
+msgid "All"
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."
+#: contrib/admin/filterspecs.py:109
+msgid "Any date"
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/admin/filterspecs.py:110
+#, fuzzy
+msgid "Today"
+msgstr "ďeň"
-#: contrib/flatpages/models/flatpages.py:18
-msgid "flat pages"
-msgstr "ploché stránky"
+#: contrib/admin/filterspecs.py:113
+msgid "Past 7 days"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:115
+#, fuzzy
+msgid "This month"
+msgstr "mesiac"
+
+#: contrib/admin/filterspecs.py:117
+#, fuzzy
+msgid "This year"
+msgstr "rok"
+
+#: contrib/admin/filterspecs.py:143
+msgid "Yes"
+msgstr ""
+
+#: contrib/admin/filterspecs.py:143
+#, fuzzy
+msgid "No"
+msgstr "Nov."
+
+#: contrib/admin/filterspecs.py:150
+msgid "Unknown"
+msgstr ""
#: contrib/admin/models/admin.py:6
msgid "action time"
@@ -390,6 +362,11 @@ msgstr "záznam priebehu"
msgid "log entries"
msgstr "záznamy priebehu"
+#: contrib/admin/templatetags/admin_list.py:245
+#, fuzzy
+msgid "All dates"
+msgstr "dátumové návestie"
+
#: contrib/admin/views/decorators.py:22
#: contrib/admin/templates/admin/login.html:24
msgid "Log in"
@@ -416,87 +393,195 @@ msgid "Usernames cannot contain the '@' character."
msgstr "Meno užívateľa nemože obsahovať znak '@' ."
#: contrib/admin/views/decorators.py:79
+#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "Vaša e-mailova adresa nie je vaše užívateľské meno. Skúste '%s'."
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/main.py:49
+#, fuzzy
+msgid "Site administration"
+msgstr "Administrácia Django"
+
+#: contrib/admin/views/main.py:64
+#, python-format
+msgid "Select %s"
+msgstr ""
+
+#: contrib/admin/views/main.py:65
+#, python-format
+msgid "Select %s to change"
+msgstr ""
+
+#: contrib/admin/views/main.py:411
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
+msgid "You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
+#, python-format
+msgid "You may add another %s below."
+msgstr ""
+
+#: contrib/admin/views/main.py:441
+#, fuzzy, python-format
+msgid "Add %s"
+msgstr "Pridaj"
+
+#: contrib/admin/views/main.py:457
+#, python-format
+msgid "Added %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
+msgid "and"
+msgstr ""
+
+#: contrib/admin/views/main.py:459
+#, fuzzy, python-format
+msgid "Changed %s."
+msgstr "Zmeň"
+
+#: contrib/admin/views/main.py:461
+#, python-format
+msgid "Deleted %s."
+msgstr ""
+
+#: contrib/admin/views/main.py:464
+msgid "No fields changed."
+msgstr ""
+
+#: contrib/admin/views/main.py:489
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:498
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+
+#: contrib/admin/views/main.py:536
+#, fuzzy, python-format
+msgid "Change %s"
+msgstr "Zmeň"
+
+#: contrib/admin/views/main.py:614
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr ""
+
+#: contrib/admin/views/main.py:619
+#, python-format
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr ""
+
+#: contrib/admin/views/main.py:648
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr ""
+
+#: contrib/admin/views/main.py:651
+msgid "Are you sure?"
+msgstr ""
+
+#: contrib/admin/views/main.py:666
+#, fuzzy, python-format
+msgid "Change history: %s"
+msgstr "Zmena hesla"
+
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr "Celočíselná hodnota"
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr "Logická hodnota (buď True alebo False)"
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
+#, python-format
msgid "String (up to %(maxlength)s)"
msgstr "Dĺžka reťazca (maximálne do %(maxlength)s)"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr "Čiarka oddeľuje celé čísla"
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
msgid "Date (without time)"
msgstr "Dátum (bez času)"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
msgid "Date (with time)"
msgstr "Dátum ( a čas)"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
msgid "E-mail address"
msgstr "E-mailová adresa"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr "Cesta k súboru"
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
msgid "Decimal number"
msgstr "Desiatkové číslo"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr "Logická hodnota (buď True, False alebo None)"
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
msgid "Phone number"
msgstr "Číslo telefónu"
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr "Reťazec (do 50 )"
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr "Text"
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr "Čas"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
+msgid "URL"
+msgstr "URL"
+
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr "U.S. štát (dve veľké písmena)"
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr "XML text"
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/change_form.html:10
#: 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 "Začiatok"
#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "História"
@@ -562,6 +647,7 @@ 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:12
msgid "Add"
msgstr "Pridaj"
@@ -585,6 +671,11 @@ msgstr "Moje udalosti"
msgid "None available"
msgstr "Nepovolené"
+#: contrib/admin/templates/admin/change_list.html:9
+#, python-format
+msgid "Add %(name)s"
+msgstr ""
+
#: contrib/admin/templates/admin/login.html:15
msgid "Username:"
msgstr "Meno:"
@@ -610,6 +701,7 @@ msgid "Log out"
msgstr "Odhlásenie"
#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, python-format
msgid ""
"Deleting the %(object_name)s '%(object)s' would result in deleting related "
"objects, but your account doesn't have permission to delete the following "
@@ -620,6 +712,7 @@ msgstr ""
"typov objektov:"
#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
msgid ""
"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
"the following related items will be deleted:"
@@ -631,6 +724,54 @@ 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 ""
+
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
+msgid "View on site"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:26
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] ""
+msgstr[1] ""
+
+#: contrib/admin/templates/admin/change_form.html:43
+msgid "Ordering"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:46
+msgid "Order:"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr ""
+
+#: contrib/admin/templates/admin/submit_line.html:7
+#, fuzzy
+msgid "Save"
+msgstr "aktívny"
+
#: 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
@@ -720,10 +861,12 @@ msgid "You're receiving this e-mail because you requested a password reset"
msgstr "Dostali ste túto správu preto, lebo ste požadovali obnoviť vaše heslo"
#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
msgid "for your user account at %(site_name)s"
msgstr "pre váš užívateľský účet na %(site_name)s"
#: contrib/admin/templates/registration/password_reset_email.html:5
+#, python-format
msgid "Your new password is: %(new_password)s"
msgstr "Vaše nové heslo je: %(new_password)s"
@@ -740,9 +883,149 @@ msgid "Thanks for using our site!"
msgstr "Ďakujeme, že používate naše stránky!"
#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
msgid "The %(site_name)s team"
msgstr "Skupina %(site_name)s"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:5
+msgid "Documentation bookmarklets"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:9
+msgid ""
+"\n"
+"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\").
\n"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+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."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+#, fuzzy
+msgid "Show object ID"
+msgstr "objekt 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 ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr ""
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+
+#: 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:335
msgid "DATE_FORMAT"
msgstr "DATUM_FORMAT"
@@ -1121,38 +1404,40 @@ msgstr "Švédsky"
msgid "Simplified Chinese"
msgstr "Zjednodušená činština "
-#: core/formfields.py:59 core/meta/fields.py:267 core/meta/fields.py:421
-#: core/meta/fields.py:432
+#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488
+#: core/meta/fields.py:499
msgid "This field is required."
msgstr "Toto pole je nevyhnutné."
-#: core/formfields.py:241
+#: 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] "Zabezpečte aby váš text bol menší ako %s znak."
msgstr[1] "Zabezpečte aby váš text bol menší ako %s znakov."
-#: core/formfields.py:246
+#: core/formfields.py:341
msgid "Line breaks are not allowed here."
msgstr "Nový riadok tu nieje povolený."
-#: core/formfields.py:339 core/formfields.py:408 core/formfields.py:446
+#: core/formfields.py:436 core/formfields.py:507 core/formfields.py:545
+#, python-format
msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
msgstr "Vyberte si platnú voľbu; '%(data)s' nie je v %(choices)s."
-#: core/formfields.py:502
+#: core/formfields.py:601
msgid "The submitted file is empty."
msgstr "Poslaný súbor je prázdný."
-#: core/formfields.py:554
+#: core/formfields.py:655
msgid "Enter a whole number between -32,768 and 32,767."
msgstr "Vložte celé číslo s hodnotou medzi -32768 a 32767."
-#: core/formfields.py:563
+#: core/formfields.py:664
msgid "Enter a positive number."
msgstr "Vložte celé kladné číslo."
-#: core/formfields.py:572
+#: core/formfields.py:673
msgid "Enter a whole number between 0 and 32,767."
msgstr "Vložte celé číslo s hodnotou medzi 0 a 32767."
@@ -1229,14 +1514,18 @@ msgstr ""
"nahratý poškodený obrázok."
#: core/validators.py:157
+#, python-format
msgid "The URL %s does not point to a valid image."
msgstr "URL %s neukazuje na platný obrázok."
#: core/validators.py:161
+#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "Telefónne číslo musí mať formát XXX-XXX-XXXX. Číslo \"%s\" je neplatné."
+msgstr ""
+"Telefónne číslo musí mať formát XXX-XXX-XXXX. Číslo \"%s\" je neplatné."
#: core/validators.py:169
+#, python-format
msgid "The URL %s does not point to a valid QuickTime video."
msgstr "URL %s neukazuje na platné QuickTime video."
@@ -1245,6 +1534,7 @@ msgid "A valid URL is required."
msgstr "Platné URL je požadované."
#: core/validators.py:187
+#, python-format
msgid ""
"Valid HTML is required. Specific errors are:\n"
"%s"
@@ -1253,14 +1543,17 @@ msgstr ""
"%s"
#: core/validators.py:194
+#, python-format
msgid "Badly formed XML: %s"
msgstr "Chybne formované XML: %s"
#: core/validators.py:204
+#, python-format
msgid "Invalid URL: %s"
msgstr "Neplatné URL: %s"
#: core/validators.py:208 core/validators.py:210
+#, python-format
msgid "The URL %s is a broken link."
msgstr "Odkaz na URL %s je neplatný."
@@ -1269,12 +1562,14 @@ msgid "Enter a valid U.S. state abbreviation."
msgstr "Vložte platnú skratku U.S. štátu."
#: 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] "Vyjadrujte sa slušne! Slovo %s tu nie je dovolené použivať."
msgstr[1] "Vyjadrujte sa slušne! Slová %s tu nie je dovolené použivať."
#: core/validators.py:238
+#, python-format
msgid "This field must match the '%s' field."
msgstr "Toto pole sa musí zhodovať s poľom '%s'. "
@@ -1287,10 +1582,12 @@ msgid "Please enter both fields or leave them both empty."
msgstr "Prosím vložte obidve polia, alebo nechajte ich obe prázdne. "
#: core/validators.py:284
+#, python-format
msgid "This field must be given if %(field)s is %(value)s"
msgstr "Toto pole musí byť vyplnené tak, že %(field)s obsahuje %(value)s"
#: core/validators.py:296
+#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
msgstr ""
"Toto pole musí byť vyplnené tak, že %(field)s nesmie obsahovať %(value)s"
@@ -1300,6 +1597,7 @@ msgid "Duplicate values are not allowed."
msgstr "Duplicitné hodnoty nie sú povolené."
#: core/validators.py:338
+#, python-format
msgid "This value must be a power of %s."
msgstr "Táto hodnota musí byť mocninou %s."
@@ -1308,6 +1606,7 @@ msgid "Please enter a valid decimal number."
msgstr "Prosím vložte platné desiatkové číslo. "
#: 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."
@@ -1315,6 +1614,7 @@ msgstr[0] "Prosím vložte platné desiatkové číslo s najviac %s číslicou."
msgstr[1] "Prosím vložte platné desiatkové číslo s najviac %s číslicami."
#: core/validators.py: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."
@@ -1324,10 +1624,12 @@ msgstr[1] ""
"Prosím vložte platné desatinné číslo s najviac %s desatinnými miestami."
#: core/validators.py:364
+#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr "Presvedčte sa, že posielaný súbor nemá menej ako %s bytov."
#: core/validators.py:365
+#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr "Presvedčte sa, že posielaný súbor nemá viac ako %s bytov."
@@ -1340,16 +1642,19 @@ msgid "This field is invalid."
msgstr "Toto pole nie je platné."
#: core/validators.py:428
+#, python-format
msgid "Could not retrieve anything from %s."
msgstr "Nič som nemohol získať z %s."
#: core/validators.py:431
+#, python-format
msgid ""
"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
msgstr ""
" URL %(url)s vrátilo neplatnú hlavičku Content-Type '%(contenttype)s'."
#: core/validators.py:464
+#, python-format
msgid ""
"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
"\"%(start)s\".)"
@@ -1358,6 +1663,7 @@ msgstr ""
"začína 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\".)"
@@ -1366,6 +1672,7 @@ msgstr ""
"(Riadok začína 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\".)"
@@ -1374,6 +1681,7 @@ msgstr ""
"(start)s\".)"
#: core/validators.py:478
+#, python-format
msgid ""
"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
"(start)s\".)"
@@ -1382,6 +1690,7 @@ msgstr ""
"(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\".)"
@@ -1390,6 +1699,7 @@ msgstr ""
"začína 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\".)"
@@ -1398,31 +1708,38 @@ msgstr ""
"s \"%(start)s\".)"
#: core/meta/fields.py:46
+#, python-format
msgid "Please enter a valid %s."
msgstr "Prosím vložte platné %s."
#: core/meta/fields.py:60
+#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "%(optname)s s %(fieldname)s už existuje."
-#: core/meta/fields.py:111
+#: core/meta/fields.py:129
msgid " Separate multiple IDs with commas."
msgstr "Identifikátory oddeľte čiarkami."
-#: core/meta/fields.py:114
+#: core/meta/fields.py:132
msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
" Podržte \"Control\", alebo \"Command\" na Mac_u, na výber viac ako jednej "
"položky."
-#: core/meta/fields.py:441
+#: core/meta/fields.py:508
msgid "Enter a valid filename."
msgstr "Vložte platné meno súboru."
-#: core/meta/fields.py:685
+#: 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] "Prosím vložte platné %(self)s IDs. Hodnota %(value)r je neplatná."
msgstr[1] "Prosím vložte platné %(self)s IDs. Hodnoty %(value)r sú neplatné."
+
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index 6cc1b287cc..2485f5f46e 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 8cdfe87da6..51311b12ba 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -2,14 +2,16 @@ msgid ""
msgstr ""
"Project-Id-Version: Django Serbian (latin) translation v1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-11-28 11:31+0100\n"
"PO-Revision-Date: 2005-11-26 17:10+0100\n"
"Last-Translator: Nebojša Đorđević \n"
-"Language-Team: Nesh & Petar \n"
+"Language-Team: Nesh & Petar \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Poedit-Language: Serbian\n"
"X-Poedit-Country: YUGOSLAVIA\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -75,8 +77,7 @@ msgstr "datum/vreme slanja"
msgid "is public"
msgstr "da li je javni"
-#: contrib/comments/models/comments.py:26
-#: contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
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 ""
"Od %s:
\n"
"\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"
@@ -354,7 +367,7 @@ msgstr "unos u dnevnik izmena"
msgid "log entries"
msgstr "unosi u dnevnik izmena"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr "Svi datumi"
@@ -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."
@@ -394,174 +415,167 @@ msgstr "Izaberi %s"
msgid "Select %s to change"
msgstr "Izaberi %s za izmenu"
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "Uspešno dodat %(name)s \"%(obj)s\"."
-#: contrib/admin/views/main.py:417
-#: contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr "Ispod ga možete ponovo izmeniti."
-#: contrib/admin/views/main.py:425
-#: contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr "Ispod možete dodati još jedan %s."
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr "Dodaj %s"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr "Dodat %s"
-#: contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr "i"
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr "Izmenjen %s."
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr "Obrisan %s"
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr "Nijedno polje nije promenjeno."
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "Uspešno izmenjen: %(name)s \"%(obj)s\"."
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, 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:537
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr "Izmeni %s"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, 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:620
+#: contrib/admin/views/main.py:619
#, 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:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "Uspešno obrisan: %(name)s \"%(obj)s\"."
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr "Da li ste sigurni?"
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, python-format
msgid "Change history: %s"
msgstr "Istorija izmena: %s"
-#: contrib/admin/views/doc.py:262
-#: contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273
-#: contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279
-#: contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr "Ceo broj"
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr "Logička vrednost (Tačno ili Netačno)"
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr "Niz karaktera (maksimalno %(maxlength)s karaktera)"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr "Brojevi razdvojeni zarezima"
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
msgid "Date (without time)"
msgstr "Datum (bez vremena)"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
msgid "Date (with time)"
msgstr "Datum (sa vremenom)"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
msgid "E-mail address"
msgstr "E-mail adresa"
-#: contrib/admin/views/doc.py:269
-#: contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr "Putanja do fajla"
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
msgid "Decimal number"
msgstr "Decimalni broj"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr "Logička vrednost (Tačno, Netačno ili prazno)"
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
msgid "Phone number"
msgstr "Telefonski broj"
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr "Niz karaktera (maksimalno 50 karaktera)"
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr "Tekst"
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr "Vreme"
# nesh: ovo se valjda ne prevodi
# petar: ne prevodi se
-#: contrib/admin/views/doc.py:284
-#: contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr "U.S. država (dva VELIKA slova)"
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr "XML tekst"
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/logged_out.html:4
@@ -572,7 +586,7 @@ msgid "Home"
msgstr "Početna strana"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Istorija"
@@ -580,8 +594,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"
@@ -594,8 +607,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"
@@ -618,8 +635,12 @@ msgid "Server Error (500)"
msgstr "Greška na serveru (500)"
#: 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
@@ -631,7 +652,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "Tražena strana ne postoji."
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Dodaj"
@@ -655,7 +676,7 @@ msgstr "Moje akcije"
msgid "None available"
msgstr "Nema dostupnih"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, python-format
msgid "Add %(name)s"
msgstr "Dodaj %(name)s"
@@ -686,39 +707,52 @@ msgstr "Odjavi se"
#: contrib/admin/templates/admin/delete_confirmation.html:7
#, python-format
-msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "Brisanjem %(object_name)s '%(object)s' došlo bi do brisanja dodatnih podataka, ali nemate prava da brišete sledeće tipove podataka:"
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Brisanjem %(object_name)s '%(object)s' došlo bi do brisanja dodatnih "
+"podataka, ali nemate prava da brišete sledeće tipove podataka:"
#: contrib/admin/templates/admin/delete_confirmation.html:14
#, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
-msgstr "Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće obrisani i sledeći pridruženi objekti:"
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće "
+"obrisani i sledeći pridruženi objekti:"
#: contrib/admin/templates/admin/delete_confirmation.html:18
msgid "Yes, I'm sure"
msgstr "Da, siguran sam"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr "Po %(title)s "
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr "Pogledaj na sajtu"
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "Ispravite dole navedenu grešku."
msgstr[1] "Ispravite dole navedene greške."
msgstr[2] "Ispravite dole navedene greške."
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr "Redosled"
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr "Red:"
@@ -766,8 +800,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:"
@@ -791,12 +829,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:"
@@ -868,23 +914,36 @@ msgid ""
"your computer is \"internal\").\n"
msgstr ""
"\n"
-"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\").
\n"
+"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\").
\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)"
@@ -907,16 +966,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"
@@ -927,8 +994,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"
@@ -947,8 +1017,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"
@@ -956,7 +1030,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"
@@ -1014,28 +1090,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"
@@ -1142,10 +1213,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"
@@ -1197,8 +1265,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"
@@ -1206,8 +1273,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"
@@ -1260,8 +1326,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"
@@ -1355,9 +1424,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."
@@ -1374,9 +1441,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."
@@ -1404,7 +1469,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."
@@ -1463,8 +1529,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
@@ -1475,7 +1545,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
@@ -1505,8 +1576,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."
@@ -1533,8 +1603,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."
@@ -1564,7 +1633,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."
@@ -1572,7 +1642,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."
@@ -1602,38 +1673,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
@@ -1650,8 +1746,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."
@@ -1660,13 +1759,19 @@ 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."
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#~ msgid "Error in Template"
#~ msgstr "Greška u templejtu"
+
#~ msgid ""
#~ "\n"
#~ "In template %(name)s, error at line %(line)s:\n"
@@ -1677,4 +1782,3 @@ msgstr[2] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna."
#, 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 728a8cc181..a763ad36e0 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 50f71090a3..9255281e17 100644
--- a/django/conf/locale/sv/LC_MESSAGES/django.po
+++ b/django/conf/locale/sv/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:27-0600\n"
+"POT-Creation-Date: 2005-11-28 11:32+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -78,7 +78,7 @@ msgstr ""
msgid "is public"
msgstr ""
-#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
#, fuzzy
msgid "IP address"
msgstr "e-postadress"
@@ -352,7 +352,7 @@ msgstr "loggpost"
msgid "log entries"
msgstr "loggpost"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
msgstr ""
@@ -397,170 +397,170 @@ msgstr ""
msgid "Select %s to change"
msgstr ""
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr ""
-#: contrib/admin/views/main.py:417 contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:425 contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr ""
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, fuzzy, python-format
msgid "Add %s"
msgstr "Lägg till"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr ""
-#: contrib/admin/views/main.py:458 contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr ""
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, fuzzy, python-format
msgid "Changed %s."
msgstr "Ändra"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr ""
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr ""
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr ""
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
-#: contrib/admin/views/main.py:537
+#: contrib/admin/views/main.py:536
#, fuzzy, python-format
msgid "Change %s"
msgstr "Ändra"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
msgstr ""
-#: contrib/admin/views/main.py:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr ""
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr ""
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr ""
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, fuzzy, python-format
msgid "Change history: %s"
msgstr "Ändra lösenord"
-#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273 contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr ""
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr ""
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr ""
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr ""
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
#, fuzzy
msgid "Date (without time)"
msgstr "tid för händelse"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
#, fuzzy
msgid "Date (with time)"
msgstr "Datum/tid"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
#, fuzzy
msgid "E-mail address"
msgstr "E-postadress:"
-#: contrib/admin/views/doc.py:269 contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr ""
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
#, fuzzy
msgid "Decimal number"
msgstr "december"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr ""
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
#, fuzzy
msgid "Phone number"
msgstr "Fyll i ett heltal."
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr ""
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr ""
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr ""
-#: contrib/admin/views/doc.py:284 contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr ""
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr ""
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -571,7 +571,7 @@ msgid "Home"
msgstr "Hem"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "Historik"
@@ -637,7 +637,7 @@ 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
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "Lägg till"
@@ -661,7 +661,7 @@ msgstr "Mina händelser"
msgid "None available"
msgstr "Inga tillgängliga"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, fuzzy, python-format
msgid "Add %(name)s"
msgstr "Lägg till"
@@ -714,26 +714,30 @@ msgstr ""
msgid "Yes, I'm sure"
msgstr "Ja, jag är säker"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] ""
msgstr[1] ""
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr ""
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr ""
@@ -1737,6 +1741,10 @@ msgid_plural ""
msgstr[0] ""
msgstr[1] ""
+#: core/template/defaultfilters.py:354
+msgid "yes,no,maybe"
+msgstr ""
+
#, 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 525585b7b7..d39050e06f 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 293ea1ce2e..074e5f8c5a 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: django v1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-25 17:26-0600\n"
+"POT-Creation-Date: 2005-11-28 11:31+0100\n"
"PO-Revision-Date: 2005-11-26 23:02+0800\n"
"Last-Translator: limodou \n"
"Language-Team: Simplified Chinese \n"
@@ -79,8 +79,7 @@ msgstr "日期/时间已提交"
msgid "is public"
msgstr "公开"
-#: contrib/comments/models/comments.py:26
-#: contrib/admin/views/doc.py:274
+#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:254
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 ""
"由 %s:
\n"
"\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 "全部"
@@ -348,7 +354,7 @@ msgstr "日志记录"
msgid "log entries"
msgstr "日志记录"
-#: contrib/admin/templatetags/admin_list.py:243
+#: contrib/admin/templatetags/admin_list.py:245
msgid "All dates"
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."
@@ -388,172 +400,165 @@ msgstr "选择 %s"
msgid "Select %s to change"
msgstr "选择 %s 来修改"
-#: contrib/admin/views/main.py:412
+#: contrib/admin/views/main.py:411
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "%(name)s \"%(obj)s\" 添加成功。"
-#: contrib/admin/views/main.py:417
-#: contrib/admin/views/main.py:493
+#: contrib/admin/views/main.py:416 contrib/admin/views/main.py:492
msgid "You may edit it again below."
msgstr "你可以在下面再次编辑它。"
-#: contrib/admin/views/main.py:425
-#: contrib/admin/views/main.py:502
+#: contrib/admin/views/main.py:424 contrib/admin/views/main.py:501
#, python-format
msgid "You may add another %s below."
msgstr "你可以在下面增加另一个 %s 。"
-#: contrib/admin/views/main.py:442
+#: contrib/admin/views/main.py:441
#, python-format
msgid "Add %s"
msgstr "增加 %s"
-#: contrib/admin/views/main.py:458
+#: contrib/admin/views/main.py:457
#, python-format
msgid "Added %s."
msgstr "%s 已增加。"
-#: contrib/admin/views/main.py:458
-#: contrib/admin/views/main.py:460
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459
+#: contrib/admin/views/main.py:461
msgid "and"
msgstr "和"
-#: contrib/admin/views/main.py:460
+#: contrib/admin/views/main.py:459
#, python-format
msgid "Changed %s."
msgstr "已修改 %s 。"
-#: contrib/admin/views/main.py:462
+#: contrib/admin/views/main.py:461
#, python-format
msgid "Deleted %s."
msgstr "%s 已删除。"
-#: contrib/admin/views/main.py:465
+#: contrib/admin/views/main.py:464
msgid "No fields changed."
msgstr "没有字段被修改。"
-#: contrib/admin/views/main.py:490
+#: contrib/admin/views/main.py:489
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "%(name)s \"%(obj)s\" 修改成功。"
-#: contrib/admin/views/main.py:499
+#: contrib/admin/views/main.py:498
#, 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:537
+#: contrib/admin/views/main.py:536
#, python-format
msgid "Change %s"
msgstr "修改 %s"
-#: contrib/admin/views/main.py:615
+#: contrib/admin/views/main.py:614
#, 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:620
+#: contrib/admin/views/main.py:619
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "一个或多个 %(fieldname)s 在 %(name)s 中:"
-#: contrib/admin/views/main.py:649
+#: contrib/admin/views/main.py:648
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "%(name)s \"%(obj)s\" 删除成功。"
-#: contrib/admin/views/main.py:652
+#: contrib/admin/views/main.py:651
msgid "Are you sure?"
msgstr "你确信吗?"
-#: contrib/admin/views/main.py:667
+#: contrib/admin/views/main.py:666
#, python-format
msgid "Change history: %s"
msgstr "修改历史: %s"
-#: contrib/admin/views/doc.py:262
-#: contrib/admin/views/doc.py:271
-#: contrib/admin/views/doc.py:273
-#: contrib/admin/views/doc.py:278
-#: contrib/admin/views/doc.py:279
-#: contrib/admin/views/doc.py:281
+#: contrib/admin/views/doc.py:242 contrib/admin/views/doc.py:251
+#: contrib/admin/views/doc.py:253 contrib/admin/views/doc.py:258
+#: contrib/admin/views/doc.py:259 contrib/admin/views/doc.py:261
msgid "Integer"
msgstr "整数"
-#: contrib/admin/views/doc.py:263
+#: contrib/admin/views/doc.py:243
msgid "Boolean (Either True or False)"
msgstr "布尔(True或False)"
-#: contrib/admin/views/doc.py:264
+#: contrib/admin/views/doc.py:244
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr "字符串(最长 %(maxlength)s)"
-#: contrib/admin/views/doc.py:265
+#: contrib/admin/views/doc.py:245
msgid "Comma-separated integers"
msgstr "逗号分隔的整数"
-#: contrib/admin/views/doc.py:266
+#: contrib/admin/views/doc.py:246
msgid "Date (without time)"
msgstr "日期(无时间)"
-#: contrib/admin/views/doc.py:267
+#: contrib/admin/views/doc.py:247
msgid "Date (with time)"
msgstr "日期(带时间)"
-#: contrib/admin/views/doc.py:268
+#: contrib/admin/views/doc.py:248
msgid "E-mail address"
msgstr "邮箱地址"
-#: contrib/admin/views/doc.py:269
-#: contrib/admin/views/doc.py:272
+#: contrib/admin/views/doc.py:249 contrib/admin/views/doc.py:252
msgid "File path"
msgstr "文件路径"
-#: contrib/admin/views/doc.py:270
+#: contrib/admin/views/doc.py:250
msgid "Decimal number"
msgstr "小数"
-#: contrib/admin/views/doc.py:276
+#: contrib/admin/views/doc.py:256
msgid "Boolean (Either True, False or None)"
msgstr "布尔(True, False或None)"
-#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:257
msgid "Phone number"
msgstr "电话号码"
-#: contrib/admin/views/doc.py:280
+#: contrib/admin/views/doc.py:260
msgid "String (up to 50)"
msgstr "整数(最长50)"
-#: contrib/admin/views/doc.py:282
+#: contrib/admin/views/doc.py:262
msgid "Text"
msgstr "文本"
-#: contrib/admin/views/doc.py:283
+#: contrib/admin/views/doc.py:263
msgid "Time"
msgstr "时间"
-#: contrib/admin/views/doc.py:284
-#: contrib/flatpages/models/flatpages.py:6
+#: contrib/admin/views/doc.py:264 contrib/flatpages/models/flatpages.py:6
msgid "URL"
msgstr "URL"
-#: contrib/admin/views/doc.py:285
+#: contrib/admin/views/doc.py:265
msgid "U.S. state (two uppercase letters)"
msgstr "美国州名(两个大写字母)"
-#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:266
msgid "XML text"
msgstr "XML文本"
#: 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/change_list.html:4
#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_form.html:10
#: 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
@@ -564,7 +569,7 @@ msgid "Home"
msgstr "首页"
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/change_form.html:19
+#: contrib/admin/templates/admin/change_form.html:17
msgid "History"
msgstr "历史"
@@ -572,8 +577,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 "用户"
@@ -586,7 +590,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
@@ -610,8 +616,12 @@ msgid "Server Error (500)"
msgstr "服务器错误 (500)"
#: 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
@@ -623,7 +633,7 @@ msgid "We're sorry, but the requested page could not be found."
msgstr "很报歉,请求页面无法找到。"
#: contrib/admin/templates/admin/index.html:27
-#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/change_form.html:12
msgid "Add"
msgstr "增加"
@@ -647,7 +657,7 @@ msgstr "我的动作"
msgid "None available"
msgstr "无可用的"
-#: contrib/admin/templates/admin/change_list.html:10
+#: contrib/admin/templates/admin/change_list.html:9
#, python-format
msgid "Add %(name)s"
msgstr "增加 %(name)s"
@@ -678,37 +688,49 @@ msgstr "注销"
#: contrib/admin/templates/admin/delete_confirmation.html:7
#, python-format
-msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "删除 %(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:14
#, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
-msgstr "你确信相要删除 %(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:18
msgid "Yes, I'm sure"
msgstr "是的,我确定"
-#: contrib/admin/templates/admin/filter.html:1
+#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
msgstr " 由 %(title)s"
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/search_form.html:7
+msgid "Go"
+msgstr ""
+
+#: contrib/admin/templates/admin/change_form.html:18
msgid "View on site"
msgstr "在站点上查看"
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:26
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
msgstr[0] "请改正下面的错误。"
-#: contrib/admin/templates/admin/change_form.html:45
+#: contrib/admin/templates/admin/change_form.html:43
msgid "Ordering"
msgstr "排序中"
-#: contrib/admin/templates/admin/change_form.html:48
+#: contrib/admin/templates/admin/change_form.html:46
msgid "Order:"
msgstr "排序:"
@@ -756,8 +778,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:"
@@ -781,12 +807,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:"
@@ -870,7 +903,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
@@ -878,7 +913,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
@@ -902,7 +939,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
@@ -910,7 +949,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
@@ -922,7 +963,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
@@ -942,8 +984,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"
@@ -1009,28 +1054,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 "七月"
@@ -1127,10 +1167,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 "名称"
@@ -1182,8 +1219,7 @@ msgstr "代码名称"
msgid "Permission"
msgstr "许可"
-#: models/auth.py:11
-#: models/auth.py:58
+#: models/auth.py:11 models/auth.py:58
msgid "Permissions"
msgstr "许可"
@@ -1191,8 +1227,7 @@ msgstr "许可"
msgid "Group"
msgstr "组"
-#: models/auth.py:23
-#: models/auth.py:60
+#: models/auth.py:23 models/auth.py:60
msgid "Groups"
msgstr "组"
@@ -1245,8 +1280,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"
@@ -1340,9 +1378,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 "这个字段是必输项。"
@@ -1357,9 +1393,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 中。"
@@ -1445,7 +1479,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
@@ -1486,8 +1522,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 是一个断开的链接。"
@@ -1511,8 +1546,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 "请要么两个字段都输入或者两个字段都空着。"
@@ -1542,13 +1576,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
@@ -1576,38 +1612,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
@@ -1624,7 +1679,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
@@ -1634,10 +1690,14 @@ 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
+msgid "yes,no,maybe"
+msgstr ""
+
#, fuzzy
#~ msgid "count"
#~ msgstr "内容"
-
diff --git a/django/contrib/admin/templates/admin/search_form.html b/django/contrib/admin/templates/admin/search_form.html
index e398028fe6..5e868a06b0 100644
--- a/django/contrib/admin/templates/admin/search_form.html
+++ b/django/contrib/admin/templates/admin/search_form.html
@@ -1,9 +1,10 @@
{% load adminmedia %}
+{% load i18n %}
{% if cl.lookup_opts.admin.search_fields %}