diff --git a/INSTALL b/INSTALL index 6ec16a2158..fc21a61b47 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ Thanks for downloading Django. -To install it, make sure you have Python 2.3+ installed. Then run this command: +To install it, make sure you have Python 2.3 or greater installed. Then run this command: -python2.3 setup.py install +python setup.py install -For more detailed instructions, see docs/install.txt. \ No newline at end of file +For more detailed instructions, see docs/install.txt. diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 496a8bc5b7..e30157dc7d 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -46,6 +46,7 @@ LANGUAGES = ( ('is', _('Icelandic')), ('it', _('Italian')), ('ja', _('Japanese')), + ('nl', _('Dutch')), ('no', _('Norwegian')), ('pt-br', _('Brazilian')), ('ro', _('Romanian')), diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo index 880bcba5c9..6964e7aee0 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 166bbb6401..7c0396ae1e 100644 --- a/django/conf/locale/bn/LC_MESSAGES/django.po +++ b/django/conf/locale/bn/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django CVS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:04+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: 2005-11-12 20:05+0530\n" "Last-Translator: Baishampayan Ghose \n" "Language-Team: Ankur Bangla \n" @@ -567,6 +567,15 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -757,7 +766,7 @@ msgstr "হ্যাঁ, আমি নিশ্চিত" msgid " By %(title)s " msgstr "" -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "" @@ -915,10 +924,6 @@ msgstr "আমাদের স্থান ব্যবহার করার msgid "The %(site_name)s team" msgstr "%(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 "" @@ -1423,38 +1428,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "নরওয়েজিয়" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "ব্রাজিলীয়" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "রোমানীয়" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "রুশ" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "স্লোভাক" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "সার্বিয়ান" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "সরলীকৃত চীনা" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1800,7 +1809,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "" diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index 94195a3dd9..f4188d83ac 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 7cdef17d3a..d1b1f0f855 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Czech translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:04+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: 2005-12-18 18:36+0100\n" "Last-Translator: Radek Švarz \n" "Language-Team: Czech\n" @@ -584,6 +584,15 @@ msgstr "Stát US (2 velké znaky)" msgid "XML text" msgstr "text XML" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Dokumentace" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -774,7 +783,7 @@ msgstr "Ano, jsem si jist" msgid " By %(title)s " msgstr "Od %(title)s" -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Provést" @@ -932,10 +941,6 @@ msgstr "Děkujeme za používání našeho webu!" msgid "The %(site_name)s team" msgstr "Tým %(site_name)s" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "Dokumentace" - #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "Bookmarklety" @@ -1456,38 +1461,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "Norsky" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Brazilsky" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "Rumunsky" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Rusky" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "Slovensky" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "Srbsky" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "Švédsky" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "Jednoduchá čínština" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1840,7 +1849,7 @@ msgstr[1] "" msgstr[2] "" "Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné." -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "ano, ne, možná" diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo index 78722454ab..9a36894291 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 708e151758..2fee563fb7 100644 --- a/django/conf/locale/cy/LC_MESSAGES/django.po +++ b/django/conf/locale/cy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:05+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n" "Last-Translator: Jason Davies \n" "Language-Team: Cymraeg \n" @@ -549,6 +549,15 @@ msgstr "Talaith U.D. (dwy briflythyren)" msgid "XML text" msgstr "Testun XML" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Dogfennaeth" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -739,7 +748,7 @@ msgstr "Yndw, rwy'n sicr" msgid " By %(title)s " msgstr " Gan %(title)s" -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Ewch" @@ -894,10 +903,6 @@ msgstr "Diolch am ddefnyddio ein safle!" msgid "The %(site_name)s team" msgstr "Y tîm %(site_name)s" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "Dogfennaeth" - #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "Dalennau gofnod" @@ -1406,38 +1411,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "Norwyeg" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Brasileg" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "Romaneg" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Rwsieg" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "Slofaceg" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "Serbeg" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "Swedeg" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "Tsieinëeg Symledig" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1781,7 +1790,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "ie,na,efallai" diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo index 4bd0b45b69..9a103502f0 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 f956ed6828..d66428d67d 100644 --- a/django/conf/locale/da/LC_MESSAGES/django.po +++ b/django/conf/locale/da/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:05+0100\n" +"POT-Creation-Date: 2006-01-12 23:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Morten Bagai \n" "Language-Team: Danish\n" @@ -567,6 +567,15 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -757,7 +766,7 @@ msgstr "Ja, jeg er sikker" msgid " By %(title)s " msgstr "" -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "" @@ -917,10 +926,6 @@ msgstr "Tak, fordi du brugte vores site!" msgid "The %(site_name)s team" msgstr "Med venlig hilsen %(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 "" @@ -1430,38 +1435,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "Norsk" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Brasiliansk" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "Rumænsk" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Russisk" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "Slovakisk" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "Serbisk" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "Svensk" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "Simpel Kinesisk" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "Traditionel Kinesisk" @@ -1808,7 +1817,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "" diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index 43eefaba2f..9654bd087b 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 5259ddf7c9..38b3f19345 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:04+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: 2005-10-08 00:03+0200\n" "Last-Translator: Georg Bauer \n" "MIME-Version: 1.0\n" @@ -581,6 +581,15 @@ msgstr "U.S. Bundesstaat (zwei Grossbuchstaben)" msgid "XML text" msgstr "XML Text" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Dokumentation" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -774,7 +783,7 @@ msgstr "Ja, ich bin sicher" msgid " By %(title)s " msgstr " Nach %(title)s " -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Los" @@ -932,10 +941,6 @@ msgstr "Vielen Dank, das Sie unsere Seiten benutzen!" msgid "The %(site_name)s team" msgstr "Das Team von %(site_name)s" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "Dokumentation" - #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "Bookmarklets" @@ -1454,38 +1459,42 @@ msgid "Japanese" msgstr "Japanisch" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "Hollndisch" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "Norwegisch" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Brasilianisch" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "Rumnisch" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Russisch" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "Slowakisch" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "Serbisch" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "Schwedisch" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "Traditionelles Chinesisch" @@ -1842,7 +1851,7 @@ msgstr[0] "" msgstr[1] "" "Bitte gltige IDs fr %(self)s eingeben. Die Werte %(value)r sind ungltig." -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 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 541650153e..c76eea564b 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 d2299ed2fc..05126d01c1 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:04+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -544,6 +544,15 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -726,7 +735,7 @@ msgstr "" msgid " By %(title)s " msgstr "" -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "" @@ -877,10 +886,6 @@ msgstr "" msgid "The %(site_name)s team" msgstr "" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "" - #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "" @@ -1372,38 +1377,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 -msgid "Norwegian" +msgid "Dutch" msgstr "" #: conf/global_settings.py:50 -msgid "Brazilian" +msgid "Norwegian" msgstr "" #: conf/global_settings.py:51 -msgid "Romanian" +msgid "Brazilian" msgstr "" #: conf/global_settings.py:52 -msgid "Russian" +msgid "Romanian" msgstr "" #: conf/global_settings.py:53 -msgid "Slovak" +msgid "Russian" msgstr "" #: conf/global_settings.py:54 -msgid "Serbian" +msgid "Slovak" msgstr "" #: conf/global_settings.py:55 -msgid "Swedish" +msgid "Serbian" msgstr "" #: conf/global_settings.py:56 -msgid "Simplified Chinese" +msgid "Swedish" msgstr "" #: conf/global_settings.py:57 +msgid "Simplified Chinese" +msgstr "" + +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1725,7 +1734,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 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 70aff1c011..50f14bb72f 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 3b256dde29..c14c2c367e 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:04+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: 2005-11-28 15:28+0000\n" "Last-Translator: Ricardo Javier Cardenes Medina \n" @@ -579,6 +579,15 @@ msgstr "Estado de los EEUU (dos letras may msgid "XML text" msgstr "Texto XML" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Documentacin" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -771,7 +780,7 @@ msgstr "S msgid " By %(title)s " msgstr " Por %(title)s " -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Buscar" @@ -928,10 +937,6 @@ msgstr " msgid "The %(site_name)s team" msgstr "El equipo de %(site_name)s" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "Documentacin" - #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "Bookmarklets" @@ -1451,38 +1456,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "Noruego" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Brasileo" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "Rumano" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Ruso" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "Eslovaco" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "Serbio" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "Sueco" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "Chino simplificado" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1837,7 +1846,7 @@ msgstr[1] "" "Por favor, introduzca IDs de %(self)s vlidos. Los valores %(value)r no son " "vlidos." -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "si,no,tal vez" diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo index 7a5d2dcfcc..8d5abb1377 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 51047ef31e..44ba7e9998 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:04+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: 2005-10-18 12:27+0200\n" "Last-Translator: Mikal Barbero \n" "Language-Team: franais \n" @@ -606,6 +606,15 @@ msgstr " msgid "XML text" msgstr "Texte XML" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Documentation" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -799,7 +808,7 @@ msgstr "Oui, j'en suis certain" msgid " By %(title)s " msgstr " Par %(title)s " -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Envoyer" @@ -960,10 +969,6 @@ msgstr "Merci d'utiliser notre site !" msgid "The %(site_name)s team" msgstr "L'quipe %(site_name)s" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "Documentation" - #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "Signets" @@ -1482,39 +1487,43 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "Norvgien" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Brsilien" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "Roumain" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Russe" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "Slovaque" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 #, fuzzy msgid "Serbian" msgstr "Serbe" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "Sudois" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "Chinois simplifi" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "Chinois traditionnel" @@ -1876,7 +1885,7 @@ msgstr[0] "Entrez un ID %(self)s valide. La valeur %(value)r est invalide." msgstr[1] "" "Entrez des ID %(self)s valides. Les valeurs %(value)r sont invalides." -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "oui,non,peut-tre" diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo index 5805a2aa81..d0f086af47 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 c938b54c0e..70c7c916e3 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.po +++ b/django/conf/locale/gl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:04+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: 2005-12-20 10:48+0100\n" "Last-Translator: Afonso Fernández Nogueira \n" "Language-Team: Galego\n" @@ -573,6 +573,15 @@ msgstr "Estado dos Estados Unidos (dúas letras maíusculas)" msgid "XML text" msgstr "Texto XML" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Documentación" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -764,7 +773,7 @@ msgstr "Si, estou seguro" msgid " By %(title)s " msgstr " Por %(title)s " -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Ir" @@ -921,10 +930,6 @@ msgstr "Grazas por usar o noso sitio web!" msgid "The %(site_name)s team" msgstr "O equipo de %(site_name)s" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "Documentación" - #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "Bookmarklets" @@ -1438,38 +1443,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "noruegués" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "brasileiro" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "romanés" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "ruso" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "eslovaco" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "serbio" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "sueco" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "chinés simplificado" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1815,7 +1824,7 @@ msgstr[0] "Insira IDs de %(self)s válidas. O valor %(value)r non é válido." msgstr[1] "" "Insira IDs de %(self)s válidas. Os valores %(value)r non son válidos." -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "si,non,quizais" diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo index 7492cc6336..00754d1263 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 17fdaa69bb..18914d3b13 100644 --- a/django/conf/locale/is/LC_MESSAGES/django.po +++ b/django/conf/locale/is/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:05+0100\n" +"POT-Creation-Date: 2006-01-12 23:12+0100\n" "PO-Revision-Date: 2005-11-13 18:08-0000\n" "Last-Translator: Dagur Páll Ammendrup \n" "Language-Team: \n" @@ -569,6 +569,15 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -759,7 +768,7 @@ msgstr "Já ég er viss." msgid " By %(title)s " msgstr "" -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "" @@ -920,10 +929,6 @@ msgstr "Takk fyrir að nota vefinn okkar!" msgid "The %(site_name)s team" msgstr "%(site_name)s hópurinn" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "" - #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "" @@ -1428,38 +1433,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "Norska" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Brasilíska" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "Rúmenska" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Rússneska" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "Slóvanska" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "Serbíska" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "Einfölduð Kínverska " -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1806,7 +1815,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "" diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo index 1174968316..e023fd2d48 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 3b6eecc1cf..1307d39a13 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:04+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -567,6 +567,15 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -759,7 +768,7 @@ msgstr "S msgid " By %(title)s " msgstr "" -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "" @@ -918,10 +927,6 @@ msgstr "Ti ringraziamo per l'utilizzo del nostro sito!" msgid "The %(site_name)s team" msgstr "Il team di %(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 "" @@ -1427,39 +1432,43 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 -msgid "Norwegian" +msgid "Dutch" msgstr "" #: conf/global_settings.py:50 +msgid "Norwegian" +msgstr "" + +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Brasiliano" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Russo" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 #, fuzzy msgid "Serbian" msgstr "Serbo" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1806,7 +1815,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "" diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo index 3b6683d82e..bd24eec980 100644 Binary files a/django/conf/locale/ja/LC_MESSAGES/django.mo and b/django/conf/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po index e6689e7977..39777d22dd 100644 --- a/django/conf/locale/ja/LC_MESSAGES/django.po +++ b/django/conf/locale/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:05+0100\n" +"POT-Creation-Date: 2006-01-13 15:53+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -423,7 +423,7 @@ msgstr "この下で再び変更可能です。" #: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501 #, python-format msgid "You may add another %s below." -msgstr "この下で他を追加可能です。" +msgstr "この下で他の%sを追加可能です。" #: contrib/admin/views/main.py:441 #, python-format @@ -569,6 +569,15 @@ msgstr "アメリカの州(大文字二文字で)" msgid "XML text" msgstr "XMLテキスト" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "文書" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -759,7 +768,7 @@ msgstr "はい。" msgid " By %(title)s " msgstr "%(title)s で絞る" -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "移動" @@ -916,10 +925,6 @@ msgstr "ご利用ありがとうございました！" msgid "The %(site_name)s team" msgstr " %(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 "ブックマークレット" @@ -1421,38 +1426,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "ノルウェー語" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "ブラジル語" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "ルーマニア語" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "ロシア語" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "スロバキア語" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "セルビア語" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "スウェーデン語" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "簡体字中国語" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1792,7 +1801,7 @@ msgid_plural "" msgstr[0] "有効な %(self)s IDを入力してください。 %(value)r は無効です。" msgstr[1] "有効な %(self)s IDを入力してください。 %(value)r は無効です。" -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "はい（たぶん）" diff --git a/django/conf/locale/nl/LC_MESSAGES/django.mo b/django/conf/locale/nl/LC_MESSAGES/django.mo index 1a3f344820..634d3c49d7 100644 Binary files a/django/conf/locale/nl/LC_MESSAGES/django.mo and b/django/conf/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/nl/LC_MESSAGES/django.po b/django/conf/locale/nl/LC_MESSAGES/django.po index 324244b1b2..024ac606e9 100644 --- a/django/conf/locale/nl/LC_MESSAGES/django.po +++ b/django/conf/locale/nl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 19:46+0000\n" +"POT-Creation-Date: 2006-01-12 23:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Johan C. Stöver \n" "Language-Team: \n" @@ -16,38 +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 "omgeleid van" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Dit moet een absoluut pad zijn, zonder de domein naam. Bijvoorbeeld: '/" -"events/search/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "omleiden naar" - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Dit kan een absoluut pad (zoals boven) of een volledige URL beginnend met " -"'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "omleiding" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "omleidingen" - #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 msgid "object ID" @@ -320,57 +288,6 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "Het opmerkingenformulier heeft geen 'voorbeeld' of 'post'" -#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 -msgid "URL" -msgstr "" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "Voorbeeld: '/about/contact/'. Zorg voor slashes aan begin en eind" - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "titel" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "inhoud" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "opmerkingen toestaan" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "Naam sjabloon" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Voorbeeld: 'flatpages/contact_page'. Als deze niet is opgegeven, dan wordt " -"'flatpages/default' gebruikt." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "registratie verplicht" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Alleen ingelogde gebruikers kunnen deze pagina zien, indien dit is " -"aangekruist." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "platte pagina" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "platte pagina's" - #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -457,8 +374,8 @@ msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -"Geef een correcte gebruikersnaam en wachtwoord. Let op de velden zijn hoofdletter-" -"gevoelig" +"Geef een correcte gebruikersnaam en wachtwoord. Let op de velden zijn " +"hoofdletter-gevoelig" #: contrib/admin/views/decorators.py:23 #: contrib/admin/templates/admin/login.html:24 @@ -470,16 +387,16 @@ msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." msgstr "" -"Uw sessie is verlopen, meldt u opnieuw aan. Maakt u geen zorgen: Uw " -"bijdrage is opgeslagen." +"Uw sessie is verlopen, meldt u opnieuw aan. Maakt u geen zorgen: Uw bijdrage " +"is opgeslagen." #: contrib/admin/views/decorators.py:64 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." msgstr "" -"Lijkt erop dat uw browser geen cookies accepteerd. Accepteer cookies, en laad " -"deze pagina nogmaals en probeer het opnieuw" +"Lijkt erop dat uw browser geen cookies accepteerd. Accepteer cookies, en " +"laad deze pagina nogmaals en probeer het opnieuw" #: contrib/admin/views/decorators.py:78 msgid "Usernames cannot contain the '@' character." @@ -557,8 +474,7 @@ msgstr "Wijzigen %(name)s \"%(obj)s\" is geslaagd." #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." -msgstr "" -"De %(name)s \"%(obj)s\" toegevoegd. U mag het hieronder wijzigen." +msgstr "De %(name)s \"%(obj)s\" toegevoegd. U mag het hieronder wijzigen." #: contrib/admin/views/main.py:536 #, fuzzy, python-format @@ -652,6 +568,10 @@ msgstr "Tekst" msgid "Time" msgstr "Tijd" +#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "" + #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "US Staat (twee hoofdletters)" @@ -660,6 +580,15 @@ msgstr "US Staat (twee hoofdletters)" msgid "XML text" msgstr "XML Tekst" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Documentatie" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -1007,10 +936,6 @@ msgstr "Bedankt voor het gebruik van onze stek!" msgid "The %(site_name)s team" msgstr "Het %(site_name)s team" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "Documentatie" - #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "" @@ -1030,11 +955,16 @@ msgid "" "your computer is \"internal\").

\n" msgstr "" "\n" -"

Om bookamrklets te installereb, sleep de link naar uw bladwijzers\n" -"werkbalk, of rechtermuis klik op de link en voeg het toe aan de bladwijzer. Nu kan\n" -"de bookmarklet vanuit elke pagina op de stek worden gekozen. Let erop dat het soms\n" -"noodzakelijk is dat de computer vanwaaruit de pagina wordt bekeken intern is\n" -"Raadpleeg uw systeembeheerder of uw computer zich op het interne netwerk bevind.

\n" +"

Om bookamrklets te installereb, sleep de link naar uw " +"bladwijzers\n" +"werkbalk, of rechtermuis klik op de link en voeg het toe aan de bladwijzer. " +"Nu kan\n" +"de bookmarklet vanuit elke pagina op de stek worden gekozen. Let erop dat " +"het soms\n" +"noodzakelijk is dat de computer vanwaaruit de pagina wordt bekeken intern " +"is\n" +"Raadpleeg uw systeembeheerder of uw computer zich op het interne netwerk " +"bevind.

\n" #: contrib/admin/templates/admin_doc/bookmarklets.html:19 msgid "Documentation for this page" @@ -1094,6 +1024,85 @@ msgstr "Huidige:" msgid "Change:" msgstr "Wijzigen:" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "omgeleid van" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Dit moet een absoluut pad zijn, zonder de domein naam. Bijvoorbeeld: '/" +"events/search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "omleiden naar" + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Dit kan een absoluut pad (zoals boven) of een volledige URL beginnend met " +"'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "omleiding" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "omleidingen" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "Voorbeeld: '/about/contact/'. Zorg voor slashes aan begin en eind" + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "titel" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "inhoud" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "opmerkingen toestaan" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "Naam sjabloon" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Voorbeeld: 'flatpages/contact_page'. Als deze niet is opgegeven, dan wordt " +"'flatpages/default' gebruikt." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "registratie verplicht" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Alleen ingelogde gebruikers kunnen deze pagina zien, indien dit is " +"aangekruist." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "platte pagina" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "platte pagina's" + #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1445,38 +1454,42 @@ msgid "Japanese" msgstr "Japans" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "Noors" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Braziliaans" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "Roemeens" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Russisch" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "Slovaaks" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "Servisch" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "Zweeds" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "Vereenvoudigd Chinees" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "Traditioneel Chinees" @@ -1826,7 +1839,7 @@ msgid_plural "" msgstr[0] "Geef een geldig %(self)s IDs. De waarde %(value)r is ongeldig." msgstr[1] "Geef een geldig %(self)s IDs. de waarden %(value)r zijn ongeldig." -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "ja,nee,misschien" @@ -1835,5 +1848,5 @@ msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" -"Lijkt erop dat uw browser geen cookies accepteerd. Om aan te melden " -"moeten cookies worden geaccepteerd." +"Lijkt erop dat uw browser geen cookies accepteerd. Om aan te melden moeten " +"cookies worden geaccepteerd." diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo index 711e766efd..b64af505f3 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 aa234f99e1..d2c59763c3 100644 --- a/django/conf/locale/no/LC_MESSAGES/django.po +++ b/django/conf/locale/no/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:05+0100\n" +"POT-Creation-Date: 2006-01-12 23:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Espen Grndhaug \n" "Language-Team: Norwegian\n" @@ -586,6 +586,15 @@ msgstr "Stat (i USA, to store bokstaver)" msgid "XML text" msgstr "XML tekst" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Dokumentasjon" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -776,7 +785,7 @@ msgstr "Ja, jeg er sikker" msgid " By %(title)s " msgstr "Av %(title)s " -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "" @@ -934,10 +943,6 @@ msgstr "Takk for at du bruker vår side!" msgid "The %(site_name)s team" msgstr "Hilsen %(site_name)s" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "Dokumentasjon" - #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "Bokmerker" @@ -1450,38 +1455,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "Norsk" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Brasiliansk" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "Romansk" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Russisk" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "Slovakisk" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "Serbisk" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "Svensk" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "Simplifisert Kinesisk" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1828,7 +1837,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "" diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo index cef8f410f3..87c819e91f 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 144bebb39b..b1ed0d7811 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:04+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+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" @@ -567,6 +567,15 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -759,7 +768,7 @@ msgstr "Sim, tenho certeza" msgid " By %(title)s " msgstr "" -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "" @@ -917,10 +926,6 @@ msgstr "Obrigado por usar nosso site!" msgid "The %(site_name)s team" msgstr "Time do %(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 "" @@ -1431,39 +1436,43 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 -msgid "Norwegian" +msgid "Dutch" msgstr "" #: conf/global_settings.py:50 +msgid "Norwegian" +msgstr "" + +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Brazileiro" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Russo" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 #, fuzzy msgid "Serbian" msgstr "Sérvio" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1812,7 +1821,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "" diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo index 35eea425c6..f2459c8fcb 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 462339b2bf..913e2fdf62 100644 --- a/django/conf/locale/ro/LC_MESSAGES/django.po +++ b/django/conf/locale/ro/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:04+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: 2005-11-08 19:06+GMT+2\n" "Last-Translator: Tiberiu Micu \n" "Language-Team: Romanian \n" @@ -567,6 +567,15 @@ msgstr "" msgid "XML text" msgstr "" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -758,7 +767,7 @@ msgstr "Da, sînt sigur" msgid " By %(title)s " msgstr "" -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "" @@ -916,10 +925,6 @@ msgstr "Mulţumesc pentru folosirea saitului nostru!" msgid "The %(site_name)s team" msgstr "Echipa %(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 "" @@ -1428,38 +1433,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "Norvegiană" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Braziliană" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Rusă" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "Sîrbă" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "Chineză simplificată" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1812,7 +1821,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo index ce5ab98a20..3f59887de8 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 0de10a3bb8..47133d6bba 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:04+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: 2005-11-26 00:00\n" "Last-Translator: Dmitry Sorokin \n" "Language-Team: LANGUAGE \n" @@ -555,6 +555,15 @@ msgstr " msgid "XML text" msgstr "XML " +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -746,7 +755,7 @@ msgstr " msgid " By %(title)s " msgstr "" -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "" @@ -903,10 +912,6 @@ msgstr " msgid "The %(site_name)s team" msgstr " di %(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 "" @@ -1405,38 +1410,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 -msgid "Norwegian" +msgid "Dutch" msgstr "" #: conf/global_settings.py:50 -msgid "Brazilian" +msgid "Norwegian" msgstr "" #: conf/global_settings.py:51 -msgid "Romanian" +msgid "Brazilian" msgstr "" #: conf/global_settings.py:52 +msgid "Romanian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Russian" msgstr "" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1773,7 +1782,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr ",, " diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo index 492849a4b4..e7c5dbbc5d 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 9b9ef9080c..49d37530c7 100644 --- a/django/conf/locale/sk/LC_MESSAGES/django.po +++ b/django/conf/locale/sk/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-30 23:37-0500\n" +"POT-Creation-Date: 2006-01-12 23:12+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" @@ -317,58 +286,6 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "Formulár komentára neposkytuje odpoveď buď 'prezri' alebo 'pošli'" -#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 -msgid "URL" -msgstr "URL" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj " -"záverečné lomítka." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "názov" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "obsah" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "povolené komentáre" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "meno predlohy" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije " -"'flatpages/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "musíte byť zaregistrovaný" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "plochá stránka" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "ploché stránky" - #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -646,6 +563,10 @@ msgstr "Text" msgid "Time" msgstr "Čas" +#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 +msgid "URL" +msgstr "URL" + #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "U.S. štát (dve veľké písmena)" @@ -654,27 +575,20 @@ msgstr "U.S. štát (dve veľké písmena)" msgid "XML text" msgstr "XML text" -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "Čas" - -#: contrib/admin/templates/widget/file.html:2 -msgid "Currently:" -msgstr "" - -#: contrib/admin/templates/widget/file.html:3 -msgid "Change:" -msgstr "Zmeň:" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Dokumentácia" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -690,9 +604,9 @@ msgstr "Zmena hesla" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin_doc/bookmarklets.html:4 #: contrib/admin/templates/admin_doc/view_detail.html:4 #: contrib/admin/templates/admin_doc/template_tag_index.html:5 @@ -707,10 +621,10 @@ msgid "Log out" msgstr "Odhlásenie" #: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/change_list.html:5 #: contrib/admin/templates/admin/500.html:4 -#: contrib/admin/templates/admin/change_form.html:12 +#: contrib/admin/templates/admin/change_list.html:5 #: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/change_form.html:12 #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/registration/logged_out.html:4 @@ -749,15 +663,13 @@ msgstr "" "Tento object nemá históriu zmien. Možno nebol pridaný prostredníctvom tohoto " "web admina" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr "" +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Django web admin" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr " Od %(title)s " +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Administrácia Django" #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -779,17 +691,14 @@ msgstr "" "Vznikla chyba. Prostredníctvom e-mailu bol o nej informovaný správca a " "chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť." -#: contrib/admin/templates/admin/search_form.html:8 -msgid "Go" -msgstr "Choď" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Stránka nebola nájdená" -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django web admin" - -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administrácia Django" +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Ľutujeme, ale požadovaná stránka nebola nájdená." #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -816,14 +725,10 @@ msgstr "Moje udalosti" msgid "None available" msgstr "Nepovolené" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Stránka nebola nájdená" - -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Ľutujeme, ale požadovaná stránka nebola nájdená." +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr "" #: contrib/admin/templates/admin/login.html:15 msgid "Username:" @@ -837,24 +742,6 @@ msgstr "Heslo:" msgid "Have you forgotten your password?" msgstr "Zabudli ste vaše heslo?" -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "Pozri na webe" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "Opravte chybu, čo je nižšie, prosím." -msgstr[1] "Opravte chyby, čo sú nižšie, prosím." - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "Určenie" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "Poradie:" - #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Vítajte," @@ -883,6 +770,33 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Ano, som si istý" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr " Od %(title)s " + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Go" +msgstr "Choď" + +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "Pozri na webe" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Opravte chybu, čo je nižšie, prosím." +msgstr[1] "Opravte chyby, čo sú nižšie, prosím." + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "Určenie" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "Poradie:" + #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Vymazať" @@ -1018,10 +932,6 @@ msgstr "Ďakujeme, že používate naše stránky!" msgid "The %(site_name)s team" msgstr "Skupina %(site_name)s" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "Dokumentácia" - #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "Záložky" @@ -1091,6 +1001,101 @@ msgstr "Editujte tento objekt (nové okno)" msgid "As above, but opens the admin page in a new window." msgstr "Ako vyššie, ale stranka admina sa otvorí v novom okne." +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "Čas" + +#: contrib/admin/templates/widget/file.html:2 +msgid "Currently:" +msgstr "" + +#: contrib/admin/templates/widget/file.html:3 +msgid "Change:" +msgstr "Zmeň:" + +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "presmerovaný z" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "presmerovaný na " + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Tu môže byť buď absolútna cesta (ako hore) alebo plné URL začínajúce s " +"'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "presmerovanie" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "presmerovania" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj " +"záverečné lomítka." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "názov" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "obsah" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "povolené komentáre" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "meno predlohy" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije " +"'flatpages/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "musíte byť zaregistrovaný" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "plochá stránka" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "ploché stránky" + #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1442,38 +1447,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "Nórsky" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Brazílsky" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "Rumúnsky" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Ruský" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "Slovenský" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "Srbský" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "Švédsky" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "Zjednodušená činština " -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1818,7 +1827,7 @@ msgid_plural "" 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:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "ano,nie,možno" @@ -1827,5 +1836,5 @@ msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" -"Vyzerá, že váš web prehliadač nedovoľuje prístup ku cookies. Cookies sú " -" nevýhnutné aby ste sa mohli prilásiť." +"Vyzerá, že váš web prehliadač nedovoľuje prístup ku cookies. Cookies sú " +"nevýhnutné aby ste sa mohli prilásiť." diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo index ea3c0c3c48..2e38430d5f 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 76d08421c4..b9fbaeb98b 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Serbian (latin) translation v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:04+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: 2005-12-05 15:00+0100\n" "Last-Translator: Nebojša Đorđević \n" "Language-Team: Nesh & Petar \n" "Language-Team: Django translators \n" @@ -575,6 +575,15 @@ msgstr "Stat i USA (två stora bokstäver)" msgid "XML text" msgstr "XML-text" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Dokumentation" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -766,7 +775,7 @@ msgstr "Ja, jag är säker" msgid " By %(title)s " msgstr " Efter %(title)s " -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Utför" @@ -925,10 +934,6 @@ msgstr "Tack för att du använder vår sida!" msgid "The %(site_name)s team" msgstr "%(site_name)s-laget" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "Dokumentation" - #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "Smarta bokmärken" @@ -1443,38 +1448,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "Norska" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "Brasilianska" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "Rumänska" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "Ryska" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "Slovakiska" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "Serbiska" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "Svenska" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "Förenklad kinesiska" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "" @@ -1819,7 +1828,7 @@ msgstr[0] "Var god och fyll giltiga %(self)s ID. Värdet %(value)r är ogiltigt. msgstr[1] "" "Var god och fyll giltiga %(self)s ID. Värdena %(value)r är ogiltigt." -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "ja,nej,kanske" diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo index 9b5a252c45..39f33ecb41 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 fac798f813..9c4c2d2b7e 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:03+0100\n" +"POT-Creation-Date: 2006-01-12 23:11+0100\n" "PO-Revision-Date: 2006-01-05 13:46+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:256 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256 msgid "IP address" msgstr "IP地址" @@ -89,8 +88,11 @@ msgid "is removed" msgstr "被删除" #: contrib/comments/models/comments.py:27 -msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead." -msgstr "如果评论不适合选中这个检查框。评论将被一条\"此评论已经被删除\"的消息所替换。" +msgid "" +"Check this box if the comment is inappropriate. A \"This comment has been " +"removed\" message will be displayed instead." +msgstr "" +"如果评论不适合选中这个检查框。评论将被一条\"此评论已经被删除\"的消息所替换。" #: contrib/comments/models/comments.py:31 msgid "Comment" @@ -219,17 +221,20 @@ msgid "No voting for yourself" msgstr "不能给自已投票" #: contrib/comments/views/comments.py:25 -msgid "This rating is required because you've entered at least one other rating." +msgid "" +"This rating is required because you've entered at least one other rating." msgstr "要求此等级，因为你已经输入了至少一个等级。" #: contrib/comments/views/comments.py:109 #, python-format msgid "" -"This comment was posted by a user who has posted fewer than %(count)s comment:\n" +"This comment was posted by a user who has posted fewer than %(count)s " +"comment:\n" "\n" "%(text)s" msgid_plural "" -"This comment was posted by a user who has posted fewer than %(count)s comments:\n" +"This comment was posted by a user who has posted fewer than %(count)s " +"comments:\n" "\n" "%(text)s" msgstr[0] "" @@ -265,7 +270,9 @@ msgstr "有人篡改了评论表格(安全侵害)" #: contrib/comments/views/comments.py:204 #: contrib/comments/views/comments.py:289 -msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid" +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" msgstr "评论表格有一个无效的 'target' 参数 -- 对象 ID 无效" #: contrib/comments/views/comments.py:254 @@ -282,8 +289,7 @@ msgstr "" "

由 %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 "全部" @@ -352,10 +358,11 @@ msgstr "日志记录" msgid "All dates" msgstr "全有日期" -#: contrib/admin/views/decorators.py:9 -#: parts/auth/formfields.py:33 +#: contrib/admin/views/decorators.py:9 parts/auth/formfields.py:33 #: parts/auth/formfields.py:38 -msgid "Please enter a correct username and password. Note that both fields are case-sensitive." +msgid "" +"Please enter a correct username and password. Note that both fields are case-" +"sensitive." msgstr "请输入正确的用户名和口令。请注意两个域都是大小写敏感的。" #: contrib/admin/views/decorators.py:23 @@ -364,12 +371,18 @@ msgid "Log in" msgstr "登录" #: contrib/admin/views/decorators.py:57 -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:64 -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:78 msgid "Usernames cannot contain the '@' character." @@ -399,13 +412,11 @@ msgstr "选择 %s 来修改" msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" 添加成功。" -#: contrib/admin/views/main.py:415 -#: contrib/admin/views/main.py:492 +#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:492 msgid "You may edit it again below." msgstr "你可以在下面再次编辑它。" -#: contrib/admin/views/main.py:423 -#: contrib/admin/views/main.py:501 +#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501 #, python-format msgid "You may add another %s below." msgstr "你可以在下面增加另一个 %s 。" @@ -420,8 +431,7 @@ msgstr "增加 %s" msgid "Added %s." msgstr "%s 已增加。" -#: contrib/admin/views/main.py:457 -#: contrib/admin/views/main.py:459 +#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459 #: contrib/admin/views/main.py:461 msgid "and" msgstr "和" @@ -447,7 +457,8 @@ msgstr "%(name)s \"%(obj)s\" 修改成功。" #: 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:536 @@ -479,12 +490,9 @@ msgstr "你确信吗？" msgid "Change history: %s" msgstr "修改历史： %s" -#: contrib/admin/views/doc.py:244 -#: contrib/admin/views/doc.py:253 -#: contrib/admin/views/doc.py:255 -#: contrib/admin/views/doc.py:261 -#: contrib/admin/views/doc.py:262 -#: contrib/admin/views/doc.py:264 +#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253 +#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261 +#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264 msgid "Integer" msgstr "整数" @@ -513,8 +521,7 @@ msgstr "日期(带时间)" msgid "E-mail address" msgstr "邮箱地址" -#: contrib/admin/views/doc.py:251 -#: contrib/admin/views/doc.py:254 +#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254 msgid "File path" msgstr "文件路径" @@ -546,8 +553,7 @@ msgstr "文本" msgid "Time" msgstr "时间" -#: contrib/admin/views/doc.py:267 -#: contrib/flatpages/models/flatpages.py:6 +#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 msgid "URL" msgstr "URL" @@ -559,6 +565,15 @@ msgstr "美国州名(两个大写字母)" msgid "XML text" msgstr "XML文本" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "文档" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -618,8 +633,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 "用户" @@ -632,7 +646,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 @@ -656,8 +672,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 @@ -716,13 +736,21 @@ msgstr "欢迎，" #: contrib/admin/templates/admin/delete_confirmation.html:6 #, python-format -msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:" -msgstr "删除 %(object_name)s '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下列类型的对象：" +msgid "" +"Deleting the %(object_name)s '%(object)s' would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"删除 %(object_name)s '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下" +"列类型的对象：" #: contrib/admin/templates/admin/delete_confirmation.html:13 #, python-format -msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:" -msgstr "你确信相要删除 %(object_name)s \"%(object)s\"？所有相关的项目都将被删除：" +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"你确信相要删除 %(object_name)s \"%(object)s\"？所有相关的项目都将被删除：" #: contrib/admin/templates/admin/delete_confirmation.html:17 msgid "Yes, I'm sure" @@ -733,7 +761,7 @@ msgstr "是的，我确定" msgid " By %(title)s " msgstr " 由 %(title)s" -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "去" @@ -798,8 +826,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:" @@ -823,12 +855,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:" @@ -877,10 +916,6 @@ msgstr "感谢使用我们的站点！" msgid "The %(site_name)s team" msgstr "%(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 "书签" @@ -912,7 +947,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 @@ -920,7 +957,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 @@ -960,7 +999,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 @@ -968,7 +1009,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 @@ -980,7 +1023,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 @@ -1000,8 +1044,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" @@ -1067,28 +1114,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 "七月" @@ -1185,10 +1227,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 "名称" @@ -1240,8 +1279,7 @@ msgstr "代码名称" msgid "Permission" msgstr "许可" -#: models/auth.py:11 -#: models/auth.py:58 +#: models/auth.py:11 models/auth.py:58 msgid "Permissions" msgstr "许可" @@ -1249,8 +1287,7 @@ msgstr "许可" msgid "Group" msgstr "组" -#: models/auth.py:23 -#: models/auth.py:60 +#: models/auth.py:23 models/auth.py:60 msgid "Groups" msgstr "组" @@ -1303,8 +1340,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" @@ -1371,44 +1411,46 @@ msgid "Japanese" msgstr "日语" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "挪威语" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "巴西语" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "罗马尼亚语" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "俄语" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "斯洛伐克语" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "塞尔维亚语" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "瑞典语" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "简体中文" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Traditional 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 "这个字段是必输项。" @@ -1423,9 +1465,7 @@ msgstr[0] "确定你输入的文本少于 %s 个字符。" msgid "Line breaks are not allowed here." msgstr "这里不允许换行符。" -#: core/formfields.py:438 -#: core/formfields.py:509 -#: core/formfields.py:547 +#: core/formfields.py:438 core/formfields.py:509 core/formfields.py:547 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "选择一个有效的选项： '%(data)s' 不在 %(choices)s 中。" @@ -1511,7 +1551,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 @@ -1552,8 +1594,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 是一个断开的链接。" @@ -1577,8 +1618,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 "请要么两个字段都输入或者两个字段都空着。" @@ -1608,13 +1648,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 @@ -1642,38 +1684,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/__init__.py:1947 #, python-format @@ -1695,7 +1756,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 @@ -1705,18 +1767,20 @@ msgstr "输入一个有效的文件名。" #: core/meta/fields.py:782 #, 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:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "是、否、也许" #: parts/auth/formfields.py:27 -msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in." +msgid "" +"Your Web browser doesn't appear to have cookies enabled. Cookies are " +"required for logging in." msgstr "你的Web浏览器好象不允许使用cookie。登录需要使用cookie。" #, fuzzy #~ msgid "count" #~ msgstr "内容" - diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo index 75a5d4fba1..0a2f071b63 100644 Binary files a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo and b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.po b/django/conf/locale/zh_TW/LC_MESSAGES/django.po index 65497b409c..8d07ac8a58 100644 --- a/django/conf/locale/zh_TW/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_TW/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: django v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-29 00:05+0100\n" +"POT-Creation-Date: 2006-01-12 23:12+0100\n" "PO-Revision-Date: 2005-12-28 23:30+0800\n" "Last-Translator: yungyuc \n" "Language-Team: LANGUAGE \n" @@ -565,6 +565,15 @@ msgstr "U.S. 州名 (兩個大寫字母)" msgid "XML text" msgstr "XML 文字" +#: contrib/admin/templates/admin/object_history.html:3 +#: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "文件" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 #: contrib/admin/templates/admin/base.html:23 @@ -752,7 +761,7 @@ msgstr "是的，我確定" msgid " By %(title)s " msgstr " 根據 %(title)s " -#: contrib/admin/templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "去" @@ -907,10 +916,6 @@ msgstr "感謝使用本網站！" msgid "The %(site_name)s team" msgstr "%(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 "Bookmarklets" @@ -1409,38 +1414,42 @@ msgid "Japanese" msgstr "" #: conf/global_settings.py:49 +msgid "Dutch" +msgstr "" + +#: conf/global_settings.py:50 msgid "Norwegian" msgstr "挪威文" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Brazilian" msgstr "巴西文" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Romanian" msgstr "羅馬尼亞文" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Russian" msgstr "俄文" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Slovak" msgstr "斯洛伐克文" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Serbian" msgstr "塞爾維亞文" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Swedish" msgstr "瑞典文" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Simplified Chinese" msgstr "簡體中文" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 #, fuzzy msgid "Traditional Chinese" msgstr "繁體中文" @@ -1769,7 +1778,7 @@ msgid_plural "" msgstr[0] "請輸入有效的 %(self)s ID。%(value)r 是無效的。" msgstr[1] "請輸入有效的 %(self)s ID。%(value)r 是無效的。" -#: core/template/defaultfilters.py:371 +#: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "是,否,也許" diff --git a/django/contrib/admin/media/js/SelectFilter2.js b/django/contrib/admin/media/js/SelectFilter2.js index a34f80ad03..8f6079e0b3 100644 --- a/django/contrib/admin/media/js/SelectFilter2.js +++ b/django/contrib/admin/media/js/SelectFilter2.js @@ -70,7 +70,6 @@ var SelectFilter = { addEvent(filter_input, 'keyup', function(e) { SelectFilter.filter_key_up(e, field_id); }); addEvent(filter_input, 'keydown', function(e) { SelectFilter.filter_key_down(e, field_id); }); addEvent(from_box, 'dblclick', function() { SelectBox.move(field_id + '_from', field_id + '_to'); }); - addEvent(from_box, 'focus', function() { filter_input.focus(); }); addEvent(to_box, 'dblclick', function() { SelectBox.move(field_id + '_to', field_id + '_from'); }); addEvent(findForm(from_box), 'submit', function() { SelectBox.select_all(field_id + '_to'); }); SelectBox.init(field_id + '_from'); diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index fa0b2a9663..3d35423ac3 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -20,7 +20,7 @@ {% block branding %}{% endblock %} {% if not user.is_anonymous %} -
    {% trans 'Welcome,' %} {% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}.
    {% block userlinks %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %}
    +
    {% trans 'Welcome,' %} {% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}.
    {% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %}
    {% endif %} {% block nav-global %}{% endblock %}
    diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index 09d6cb0582..6a89c6b454 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -6,7 +6,7 @@ {% endblock %} {% block coltype %}{{ bound_manipulator.coltype }}{% endblock %} {% block bodyclass %}{{ app_label }}-{{ bound_manipulator.object_name.lower }} change-form{% endblock %} -{% block userlinks %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} +{% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} {% block breadcrumbs %}{% if not is_popup %}
    {% if add %}{% path_breadcrumbs path "Home" "1" "0" %}{% endif %} diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index 4d6fe2d84d..5e9c54dae3 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -1,7 +1,7 @@ {% extends "admin/base_site" %} {% load adminmedia admin_list i18n breadcrumbs %} {% block bodyclass %}change-list{% endblock %} -{% block userlinks %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} +{% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} {% if not is_popup %}{% block breadcrumbs %}
    {% path_breadcrumbs path "Home" "1" "0" %}
    {% endblock %}{% endif %} {% block coltype %}flex{% endblock %} {% block content %} diff --git a/django/contrib/admin/templates/admin/delete_confirmation.html b/django/contrib/admin/templates/admin/delete_confirmation.html index 5ebdcafbe3..7fba4cebd7 100644 --- a/django/contrib/admin/templates/admin/delete_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_confirmation.html @@ -1,6 +1,6 @@ {% extends "admin/base_site" %} {% load i18n %} -{% block userlinks %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} +{% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} {% block content %} {% if perms_lacking %}

    {% blocktrans %}Deleting the {{ object_name }} '{{ object }}' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:{% endblocktrans %}

    diff --git a/django/contrib/admin/templates/admin/object_history.html b/django/contrib/admin/templates/admin/object_history.html index 17977509df..b182f40acb 100644 --- a/django/contrib/admin/templates/admin/object_history.html +++ b/django/contrib/admin/templates/admin/object_history.html @@ -1,6 +1,6 @@ {% extends "admin/base_site" %} {% load i18n %} -{% block userlinks %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} +{% block userlinks %}{% trans 'Documentation' %} / {% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} {% block breadcrumbs %}
    {% trans 'Home' %} › {{ module_name }} › {{ object|truncatewords:"18" }} › {% trans 'History' %}
    {% endblock %} diff --git a/django/core/cache.py b/django/core/cache.py index 1d0eb914ee..d88297deec 100644 --- a/django/core/cache.py +++ b/django/core/cache.py @@ -29,7 +29,7 @@ The CACHE_BACKEND setting is a quasi-URI; examples are: testing. Note that this cache backend is NOT threadsafe! - locmem:/// A more sophisticaed local memory cache; + locmem:/// A more sophisticated local memory cache; this is multi-process- and thread-safe. dummy:/// Doesn't actually cache. For use in test @@ -350,7 +350,7 @@ class _FileCache(_SimpleCache): pickle.dump(now + timeout, f, 2) pickle.dump(value, f, 2) except (IOError, OSError): - raise + pass def delete(self, key): try: diff --git a/django/core/management.py b/django/core/management.py index 4a8f71ac51..e36b4192b5 100644 --- a/django/core/management.py +++ b/django/core/management.py @@ -944,11 +944,19 @@ def createcachetable(tablename): connection.commit() createcachetable.args = "[tablename]" -def run_shell(): - "Runs a Python interactive interpreter" - import code - code.interact() -run_shell.args = '' +def run_shell(use_plain=False): + "Runs a Python interactive interpreter. Tries to use IPython, if it's available." + try: + if use_plain: + # Don't bother loading IPython, because the user wants plain Python. + raise ImportError + import IPython + shell = IPython.Shell.IPShell() + shell.mainloop() + except ImportError: + import code + code.interact() +run_shell.args = '[--plain]' # Utilities for command-line script @@ -1009,6 +1017,8 @@ def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING): help='Python path to settings module, e.g. "myproject.settings.main". If this isn\'t provided, the DJANGO_SETTINGS_MODULE environment variable will be used.') parser.add_option('--pythonpath', help='Lets you manually add a directory the Python path, e.g. "/home/djangoprojects/myproject".') + parser.add_option('--plain', action='store_true', dest='plain', + help='Tells Django to use plain Python, not IPython, for "shell" command.') options, args = parser.parse_args() # Take care of options. @@ -1044,7 +1054,9 @@ def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING): sys.exit(1) else: action_mapping[action](username, email, password) - elif action in ('init', 'init-minimal', 'shell', 'validate'): + elif action == 'shell': + action_mapping[action](options.plain is True) + elif action in ('init', 'init-minimal', 'validate'): action_mapping[action]() elif action == 'inspectdb': try: diff --git a/django/utils/text.py b/django/utils/text.py index 8206095f42..ce1225b83c 100644 --- a/django/utils/text.py +++ b/django/utils/text.py @@ -100,7 +100,7 @@ def javascript_quote(s): return r"\u%04x" % ord(match.group(1)) if type(s) == str: - s = s.decode(DEFAULT_ENCODING) + s = s.decode(DEFAULT_CHARSET) elif type(s) != unicode: raise TypeError, s s = s.replace('\\', '\\\\') diff --git a/django/utils/translation.py b/django/utils/translation.py index 4eb7f6c7bc..351a1bd3cd 100644 --- a/django/utils/translation.py +++ b/django/utils/translation.py @@ -117,7 +117,7 @@ def translation(language): globalpath = os.path.join(os.path.dirname(settings.__file__), 'locale') - parts = os.environ['DJANGO_SETTINGS_MODULE'].split('.') + parts = settings.SETTINGS_MODULE.split('.') project = __import__(parts[0], {}, {}, []) projectpath = os.path.join(os.path.dirname(project.__file__), 'locale') diff --git a/docs/contributing.txt b/docs/contributing.txt index dd682f2889..be3cbe232d 100644 --- a/docs/contributing.txt +++ b/docs/contributing.txt @@ -211,6 +211,38 @@ repository: Subversion and Trac so that any commit message in that format will automatically post a comment to the appropriate ticket. +Unit tests +========== + +Django comes with a test suite of its own, in the ``tests`` directory of the +Django tarball. It's our policy to make sure all tests pass at all times. + +The tests cover: + + * Models and the database API (``tests/testapp/models``). + * The cache system (``tests/otherthests/cache.py``). + * The ``django.utils.dateformat`` module (``tests/othertests/dateformat.py``). + * Database typecasts (``tests/othertests/db_typecasts.py``). + * The template system (``tests/othertests/templates.py`` and + ``tests/othertests/defaultfilters.py``). + * ``QueryDict`` objects (``tests/othertests/httpwrappers.py``). + * Markup template tags (``tests/othertests/markup.py``). + * The ``django.utils.timesince`` module (``tests/othertests/timesince.py``). + +We appreciate any and all contributions to the test suite! + +Running the unit tests +---------------------- + +To run the tests, ``cd`` to the ``tests/`` directory and type:: + + ./runtests.py --settings=path.to.django.settings + +Yes, the unit tests need a settings module, but only for database connection +info -- the ``DATABASE_ENGINE``, ``DATABASE_USER`` and ``DATABASE_PASSWORD``. +The unit tests will not touch your database; they create a new database, called +``django_test_db``, which is deleted when the tests are finished. + Requesting features =================== @@ -390,4 +422,4 @@ requests for commit access are potential flame-war starters, and will be ignored .. _PEP 8: http://www.python.org/peps/pep-0008.html .. _i18n documentation: http://www.djangoproject.com/documentation/i18n/ .. _i18n branch: http://code.djangoproject.com/browser/django/branches/i18n -.. _`tags/releases`: http://code.djangoproject.com/browser/django/tags/releases \ No newline at end of file +.. _`tags/releases`: http://code.djangoproject.com/browser/django/tags/releases diff --git a/docs/django-admin.txt b/docs/django-admin.txt index 5271853aa6..750bb58970 100644 --- a/docs/django-admin.txt +++ b/docs/django-admin.txt @@ -28,6 +28,7 @@ Usage ===== ``django-admin.py action [options]`` + ``manage.py action [options]`` ``action`` should be one of the actions listed in this document. ``options``, @@ -155,6 +156,19 @@ Port 7000 on IP address 1.2.3.4:: django-admin.py runserver 1.2.3.4:7000 +shell +----- + +Starts the Python interactive interpreter. + +**New in Django development version:** Uses IPython_, if it's installed. If you +have IPython installed and want to force use of the "plain" Python interpreter, +use the ``--plain`` option, like so:: + + django-admin.py shell --plain + +.. _IPython: http://ipython.scipy.org/ + sql [modelmodule modelmodule ...] --------------------------------- diff --git a/docs/email.txt b/docs/email.txt index e43a29da30..ba2adf8201 100644 --- a/docs/email.txt +++ b/docs/email.txt @@ -124,10 +124,14 @@ scripts generate. The Django e-mail functions outlined above all protect against header injection by forbidding newlines in header values. If any ``subject``, ``from_email`` or -``recipient_list`` contains a newline, the e-mail function (e.g. -``send_mail()``) will raise ``django.core.mail.BadHeaderError`` (a subclass of -``ValueError``) and, hence, will not send the e-mail. It's your responsibility -to validate all data before passing it to the e-mail functions. +``recipient_list`` contains a newline (in either Unix, Windows or Mac style), +the e-mail function (e.g. ``send_mail()``) will raise +``django.core.mail.BadHeaderError`` (a subclass of ``ValueError``) and, hence, +will not send the e-mail. It's your responsibility to validate all data before +passing it to the e-mail functions. + +If a ``message`` contains headers at the start of the string, the headers will +simply be printed as the first bit of the e-mail message. Here's an example view that takes a ``subject``, ``message`` and ``from_email`` from the request's POST data, sends that to admin@example.com and redirects to diff --git a/docs/faq.txt b/docs/faq.txt index 9899be0a50..499224fd12 100644 --- a/docs/faq.txt +++ b/docs/faq.txt @@ -156,7 +156,14 @@ We've documented our philosophies on the `design philosophies page`_. Do you have any of those nifty "screencast" things? --------------------------------------------------- -They're in the works. It's amazing how much time those things take! Stay tuned... +You can bet your bottom they're on the way. But, since we're still hammering +out a few points, we want to make sure they reflect the final state of things +at Django 1.0, not some intermediary step. In other words, we don't want to +spend a lot of energy creating screencasts yet, because Django APIs will shift. + +In the meantime, though, check out this `unofficial Django screencast`_. + +.. _unofficial Django screencast: http://www.throwingbeans.org/django_screencasts.html Installation questions ====================== diff --git a/docs/forms.txt b/docs/forms.txt index e77849c772..964328a313 100644 --- a/docs/forms.txt +++ b/docs/forms.txt @@ -97,7 +97,7 @@ view has a number of problems: because that field is required. Ugly. * Even if you *do* perform validation, there's still no way to give that - information to the user is any sort of useful way. + information to the user in any sort of useful way. * You'll have to separately create a form (and view) that submits to this page, which is a pain and is redundant. diff --git a/docs/generic_views.txt b/docs/generic_views.txt index fd40b24b98..f7e8921689 100644 --- a/docs/generic_views.txt +++ b/docs/generic_views.txt @@ -327,7 +327,7 @@ The create/update/delete views are: Uses the template ``/_form`` by default. This is the same template as the ``update_object`` view below. Your template can tell - the different by the presence or absence of ``{{ object }}`` in the + the difference by the presence or absence of ``{{ object }}`` in the context. Has the following template context: diff --git a/docs/install.txt b/docs/install.txt index c961411f8e..6aed44769e 100644 --- a/docs/install.txt +++ b/docs/install.txt @@ -77,9 +77,9 @@ It's easy either way. Installing the official version ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -1. Download Django-0.90.tar.gz from our `download page`_. -2. ``tar xzvf Django-0.90.tar.gz`` -3. ``cd Django-0.90`` +1. Download Django-0.91.tar.gz from our `download page`_. +2. ``tar xzvf Django-0.91.tar.gz`` +3. ``cd Django-0.91`` 4. ``sudo python setup.py install`` Note that the last command will automatically download and install setuptools_ diff --git a/docs/model-api.txt b/docs/model-api.txt index 3644d9de87..e17a68ea5c 100644 --- a/docs/model-api.txt +++ b/docs/model-api.txt @@ -361,7 +361,8 @@ Here are all available field types: meta.FloatField(..., max_digits=5, decimal_places=2) - And to store numbers up to one million with a resolution of 10 decimal places:: + And to store numbers up to approximately one billion with a resolution of 10 + decimal places:: meta.FloatField(..., max_digits=19, decimal_places=10) diff --git a/docs/settings.txt b/docs/settings.txt index 5d447e5415..75044cc61e 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -478,6 +478,16 @@ Whether to prepend the "www." subdomain to URLs that don't have it. This is only used if ``CommonMiddleware`` is installed (see the `middleware docs`_). See also ``APPEND_SLASH``. +ROOT_URLCONF +------------ + +Default: Not defined + +A string representing the full Python import path to your root URLconf. For example: +``"mydjangoapps.urls"``. See `How Django processes a request`_. + +.. _How Django processes a request: http://www.djangoproject.com/documentation/url_dispatch/#how-django-processes-a-request + SECRET_KEY ---------- diff --git a/docs/templates_python.txt b/docs/templates_python.txt index 71d94dbb5a..aeedfdc614 100644 --- a/docs/templates_python.txt +++ b/docs/templates_python.txt @@ -278,7 +278,7 @@ optional, third positional argument, ``processors``. In this example, the def some_view(request): # ... - return RequestContext({ + return RequestContext(request, { 'foo': 'bar', }, [ip_address_processor]) @@ -335,28 +335,6 @@ See the `internationalization docs`_ for more. .. _LANGUAGE_CODE setting: http://www.djangoproject.com/documentation/settings/#language-code .. _internationalization docs: http://www.djangoproject.com/documentation/i18n/ -Subclassing Context: Custom subclasses --------------------------------------- - -Feel free to subclass ``Context`` yourself if you find yourself wanting to give -each template something "automatically." For instance, if you want to give -every template automatic access to the current time, use something like this:: - - from django.template import Context - import datetime - class TimeContext(Context): - def __init__(self, *args, **kwargs): - Context.__init__(self, *args, **kwargs) - self['current_time'] = datetime.datetime.now() - -This technique has two caveats: - - * You'll have to remember to use ``TimeContext`` instead of ``Context`` in - your template-loading code. - - * You'll have to be careful not to set the variable ``current_time`` when - you populate this context. If you do, you'll override the other one. - Loading templates ----------------- diff --git a/docs/tutorial01.txt b/docs/tutorial01.txt index 1ef5437467..004c3ba61d 100644 --- a/docs/tutorial01.txt +++ b/docs/tutorial01.txt @@ -76,6 +76,11 @@ command line:: Go to http://127.0.0.1:8000/ for Django. Quit the server with CONTROL-C (Unix) or CTRL-BREAK (Windows). +(If you get an error about ``DATABASE_ENGINE``, edit your ``settings.py`` file +to change the ``DATABASE_ENGINE`` setting to point to the correct database, and +make sure you have the right database libraries installed -- such as PostgreSQL's +psycopg or MySQL's MySQLdb.) + You've started the Django development server, a lightweight, pure-Python Web server that builds on the BaseHTTPServer included in Python's standard library. We've included this with Django so you can develop things rapidly, without diff --git a/docs/tutorial02.txt b/docs/tutorial02.txt index c7a38f8a01..8b0ad6f2b7 100644 --- a/docs/tutorial02.txt +++ b/docs/tutorial02.txt @@ -399,7 +399,8 @@ admin template directory (``django/contrib/admin/templates``) into an ``admin`` subdirectory of whichever directory you're using in ``TEMPLATE_DIRS``. For example, if your ``TEMPLATE_DIRS`` includes ``"/home/mytemplates"``, as above, then copy ``django/contrib/admin/templates/admin/base_site.html`` to -``/home/mytemplates/admin/base_site.html``. +``/home/mytemplates/admin/base_site.html``. Don't forget that ``admin`` +subdirectory. Then, just edit the file and replace the generic Django text with your own site's name and URL as you see fit. diff --git a/ez_setup.py b/ez_setup.py index b9d4f2dae0..4789e37ae2 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -14,7 +14,7 @@ the appropriate options to ``use_setuptools()``. This file can also be run as a script to install or upgrade setuptools. """ import sys -DEFAULT_VERSION = "0.6a7" +DEFAULT_VERSION = "0.6a9" DEFAULT_URL = "http://cheeseshop.python.org/packages/%s/s/setuptools/" % sys.version[:3] md5_data = { @@ -34,6 +34,10 @@ md5_data = { 'setuptools-0.6a6-py2.4.egg': 'c10d20d29acebce0dc76219dc578d058', 'setuptools-0.6a7-py2.3.egg': 'cfc4125ddb95c07f9500adc5d6abef6f', 'setuptools-0.6a7-py2.4.egg': 'c6d62dab4461f71aed943caea89e6f20', + 'setuptools-0.6a8-py2.3.egg': '2f18eaaa3f544f5543ead4a68f3b2e1a', + 'setuptools-0.6a8-py2.4.egg': '799018f2894f14c9f8bcb2b34e69b391', + 'setuptools-0.6a9-py2.3.egg': '8e438ad70438b07b0d8f82cae42b278f', + 'setuptools-0.6a9-py2.4.egg': '8f6e01fc12fb1cd006dc0d6c04327ec1', } import sys, os diff --git a/setup.py b/setup.py index 6ddfd7a894..2ff9b700fd 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup, find_packages setup( name = "Django", - version = "0.90", + version = "0.91", url = 'http://www.djangoproject.com/', author = 'Lawrence Journal-World', author_email = 'holovaty@gmail.com', @@ -25,6 +25,8 @@ setup( 'locale/gl/LC_MESSAGES/*', 'locale/is/LC_MESSAGES/*', 'locale/it/LC_MESSAGES/*', + 'locale/ja/LC_MESSAGES/*', + 'locale/nl/LC_MESSAGES/*', 'locale/no/LC_MESSAGES/*', 'locale/pt_BR/LC_MESSAGES/*', 'locale/ro/LC_MESSAGES/*', @@ -32,7 +34,8 @@ setup( 'locale/sk/LC_MESSAGES/*', 'locale/sr/LC_MESSAGES/*', 'locale/sv/LC_MESSAGES/*', - 'locale/zh_CN/LC_MESSAGES/*'], + 'locale/zh_CN/LC_MESSAGES/*', + 'locale/zh_TW/LC_MESSAGES/*'], 'django.contrib.admin': ['templates/admin/*.html', 'templates/admin_doc/*.html', 'templates/registration/*.html',