From b343704398a81ad96fb9af8e7f9da68c6645f5da Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Thu, 29 Dec 2005 19:22:02 +0000 Subject: [PATCH] magic-removal: Merged to [1793] git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1794 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/global_settings.py | 2 + django/conf/locale/bn/LC_MESSAGES/django.mo | Bin 26898 -> 26898 bytes django/conf/locale/bn/LC_MESSAGES/django.po | 81 +- django/conf/locale/cs/LC_MESSAGES/django.mo | Bin 31597 -> 31597 bytes django/conf/locale/cs/LC_MESSAGES/django.po | 433 ++-- django/conf/locale/cy/LC_MESSAGES/django.mo | Bin 24115 -> 24115 bytes django/conf/locale/cy/LC_MESSAGES/django.po | 81 +- django/conf/locale/da/LC_MESSAGES/django.mo | Bin 16807 -> 16880 bytes django/conf/locale/da/LC_MESSAGES/django.po | 82 +- django/conf/locale/de/LC_MESSAGES/django.mo | Bin 31113 -> 31673 bytes django/conf/locale/de/LC_MESSAGES/django.po | 85 +- django/conf/locale/en/LC_MESSAGES/django.mo | Bin 536 -> 536 bytes django/conf/locale/en/LC_MESSAGES/django.po | 81 +- django/conf/locale/es/LC_MESSAGES/django.mo | Bin 30291 -> 30253 bytes django/conf/locale/es/LC_MESSAGES/django.po | 310 +-- django/conf/locale/fr/LC_MESSAGES/django.mo | Bin 17427 -> 28145 bytes django/conf/locale/fr/LC_MESSAGES/django.po | 519 +++-- django/conf/locale/fr/LC_MESSAGES/djangojs.mo | Bin 0 -> 1533 bytes django/conf/locale/fr/LC_MESSAGES/djangojs.po | 110 + django/conf/locale/gl/LC_MESSAGES/django.mo | Bin 30067 -> 30067 bytes django/conf/locale/gl/LC_MESSAGES/django.po | 85 +- django/conf/locale/is/LC_MESSAGES/django.mo | Bin 17726 -> 17726 bytes django/conf/locale/is/LC_MESSAGES/django.po | 81 +- django/conf/locale/it/LC_MESSAGES/django.mo | Bin 16501 -> 16501 bytes django/conf/locale/it/LC_MESSAGES/django.po | 81 +- django/conf/locale/ja/LC_MESSAGES/django.mo | Bin 0 -> 32623 bytes django/conf/locale/ja/LC_MESSAGES/django.po | 1803 +++++++++++++++++ django/conf/locale/ja/LC_MESSAGES/djangojs.mo | Bin 0 -> 1436 bytes django/conf/locale/ja/LC_MESSAGES/djangojs.po | 109 + django/conf/locale/no/LC_MESSAGES/django.mo | Bin 24054 -> 24054 bytes django/conf/locale/no/LC_MESSAGES/django.po | 81 +- .../conf/locale/pt_BR/LC_MESSAGES/django.mo | Bin 16330 -> 16330 bytes .../conf/locale/pt_BR/LC_MESSAGES/django.po | 81 +- django/conf/locale/ro/LC_MESSAGES/django.mo | Bin 17096 -> 17096 bytes django/conf/locale/ro/LC_MESSAGES/django.po | 81 +- django/conf/locale/ru/LC_MESSAGES/django.mo | Bin 21077 -> 21077 bytes django/conf/locale/ru/LC_MESSAGES/django.po | 81 +- django/conf/locale/ru/LC_MESSAGES/djangojs.mo | Bin 0 -> 1468 bytes django/conf/locale/ru/LC_MESSAGES/djangojs.po | 110 + django/conf/locale/sk/LC_MESSAGES/django.mo | Bin 30586 -> 30586 bytes django/conf/locale/sk/LC_MESSAGES/django.po | 81 +- django/conf/locale/sr/LC_MESSAGES/django.mo | Bin 30125 -> 30125 bytes django/conf/locale/sr/LC_MESSAGES/django.po | 81 +- django/conf/locale/sv/LC_MESSAGES/django.mo | Bin 30439 -> 30439 bytes django/conf/locale/sv/LC_MESSAGES/django.po | 81 +- .../conf/locale/zh_CN/LC_MESSAGES/django.mo | Bin 28644 -> 28644 bytes .../conf/locale/zh_CN/LC_MESSAGES/django.po | 81 +- .../conf/locale/zh_TW/LC_MESSAGES/django.mo | Bin 0 -> 29399 bytes .../conf/locale/zh_TW/LC_MESSAGES/django.po | 1780 ++++++++++++++++ .../templates/admin/change_list_results.html | 4 + .../admin/templates/admin/search_form.html | 4 +- django/contrib/admin/views/decorators.py | 3 +- django/middleware/sessions.py | 3 + django/parts/auth/formfields.py | 6 +- django/utils/datastructures.py | 3 + docs/db-api.txt | 6 +- docs/email.txt | 116 ++ docs/forms.txt | 2 +- docs/sessions.txt | 3 + docs/url_dispatch.txt | 5 - 60 files changed, 5552 insertions(+), 1084 deletions(-) create mode 100644 django/conf/locale/fr/LC_MESSAGES/djangojs.mo create mode 100644 django/conf/locale/fr/LC_MESSAGES/djangojs.po create mode 100644 django/conf/locale/ja/LC_MESSAGES/django.mo create mode 100644 django/conf/locale/ja/LC_MESSAGES/django.po create mode 100644 django/conf/locale/ja/LC_MESSAGES/djangojs.mo create mode 100644 django/conf/locale/ja/LC_MESSAGES/djangojs.po create mode 100644 django/conf/locale/ru/LC_MESSAGES/djangojs.mo create mode 100644 django/conf/locale/ru/LC_MESSAGES/djangojs.po create mode 100644 django/conf/locale/zh_TW/LC_MESSAGES/django.mo create mode 100644 django/conf/locale/zh_TW/LC_MESSAGES/django.po create mode 100644 docs/email.txt diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index d08d903f3f..5185850d01 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -45,6 +45,7 @@ LANGUAGES = ( ('gl', _('Galician')), ('is', _('Icelandic')), ('it', _('Italian')), + ('ja', _('Japanese')), ('no', _('Norwegian')), ('pt-br', _('Brazilian')), ('ro', _('Romanian')), @@ -53,6 +54,7 @@ LANGUAGES = ( ('sr', _('Serbian')), ('sv', _('Swedish')), ('zh-cn', _('Simplified Chinese')), + ('zh-tw', _('Traditional Chinese')), ) # Not-necessarily-technical managers of the site. They get broken link diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo index 049cc3cdf456d46a55f52784560ad9392831f3e3..880bcba5c9e9d6b45700163d1b2998715b36bbd3 100644 GIT binary patch delta 23 fcmbPqiE+{;#tlMR97dK31_o9JCYz\n" "Language-Team: Ankur Bangla \n" @@ -356,28 +356,35 @@ msgstr "কার্যবিবরণী এন্ট্রি সমুহ" msgid "All dates" msgstr "" -#: contrib/admin/views/decorators.py:22 +#: 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." +msgstr "" + +#: contrib/admin/views/decorators.py:23 #: contrib/admin/templates/admin/login.html:24 msgid "Log in" msgstr "প্রবেশ করুন" -#: contrib/admin/views/decorators.py:56 +#: contrib/admin/views/decorators.py:57 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." msgstr "" -#: contrib/admin/views/decorators.py:63 +#: 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 "" -#: contrib/admin/views/decorators.py:77 +#: contrib/admin/views/decorators.py:78 msgid "Usernames cannot contain the '@' character." msgstr "" -#: contrib/admin/views/decorators.py:79 +#: contrib/admin/views/decorators.py:80 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -402,80 +409,80 @@ msgstr "" msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: contrib/admin/views/main.py:415 contrib/admin/views/main.py:491 +#: 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:500 +#: contrib/admin/views/main.py:423 contrib/admin/views/main.py:501 #, python-format msgid "You may add another %s below." msgstr "" -#: contrib/admin/views/main.py:440 +#: contrib/admin/views/main.py:441 #, fuzzy, python-format msgid "Add %s" msgstr "যোগ করুন" -#: contrib/admin/views/main.py:456 +#: contrib/admin/views/main.py:457 #, python-format msgid "Added %s." msgstr "" -#: contrib/admin/views/main.py:456 contrib/admin/views/main.py:458 -#: contrib/admin/views/main.py:460 +#: contrib/admin/views/main.py:457 contrib/admin/views/main.py:459 +#: contrib/admin/views/main.py:461 msgid "and" msgstr "" -#: contrib/admin/views/main.py:458 +#: contrib/admin/views/main.py:459 #, fuzzy, python-format msgid "Changed %s." msgstr "পরিবর্তন" -#: contrib/admin/views/main.py:460 +#: contrib/admin/views/main.py:461 #, python-format msgid "Deleted %s." msgstr "" -#: contrib/admin/views/main.py:463 +#: contrib/admin/views/main.py:464 msgid "No fields changed." msgstr "" -#: contrib/admin/views/main.py:488 +#: contrib/admin/views/main.py:489 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: contrib/admin/views/main.py:497 +#: contrib/admin/views/main.py:498 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: contrib/admin/views/main.py:535 +#: contrib/admin/views/main.py:536 #, fuzzy, python-format msgid "Change %s" msgstr "পরিবর্তন" -#: contrib/admin/views/main.py:613 +#: contrib/admin/views/main.py:614 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "" -#: contrib/admin/views/main.py:618 +#: contrib/admin/views/main.py:619 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "" -#: contrib/admin/views/main.py:647 +#: contrib/admin/views/main.py:648 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: contrib/admin/views/main.py:650 +#: contrib/admin/views/main.py:651 msgid "Are you sure?" msgstr "" -#: contrib/admin/views/main.py:665 +#: contrib/admin/views/main.py:666 #, fuzzy, python-format msgid "Change history: %s" msgstr "পাসওয়ার্ড পরিবর্তন করুন" @@ -1412,37 +1419,45 @@ msgid "Italian" msgstr "ইতালিয়" #: conf/global_settings.py:48 +msgid "Japanese" +msgstr "" + +#: conf/global_settings.py:49 msgid "Norwegian" msgstr "নরওয়েজিয়" -#: conf/global_settings.py:49 +#: conf/global_settings.py:50 msgid "Brazilian" msgstr "ব্রাজিলীয়" -#: conf/global_settings.py:50 +#: conf/global_settings.py:51 msgid "Romanian" msgstr "রোমানীয়" -#: conf/global_settings.py:51 +#: conf/global_settings.py:52 msgid "Russian" msgstr "রুশ" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Slovak" msgstr "স্লোভাক" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "Serbian" msgstr "সার্বিয়ান" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 msgid "Swedish" msgstr "" -#: conf/global_settings.py:55 +#: conf/global_settings.py:56 msgid "Simplified Chinese" msgstr "সরলীকৃত চীনা" +#: conf/global_settings.py:57 +msgid "Traditional Chinese" +msgstr "" + #: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488 #: core/meta/fields.py:499 #, fuzzy @@ -1789,6 +1804,12 @@ msgstr[1] "" 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." +msgstr "" + #, fuzzy #~ msgid "count" #~ msgstr "অভ্যন্তরস্থ বস্তু" diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index da4e9584a7c7aedf80f2ac622e68f670c1c644af..94195a3dd9104dbfc158479a5d16718bae49a440 100644 GIT binary patch delta 23 fcmaF+jq&X_#tm0JIE*Y63=FIcOg7*3m|z3|gtiI6 delta 23 fcmaF+jq&X_#tm0JI1J4djEt;|%r@Wkm|z3|gwYAc diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index 2e9e31ed70..7cdef17d3a 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -7,14 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: Django Czech translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-12-17 22:26+0100\n" +"POT-Creation-Date: 2005-12-29 00:04+0100\n" "PO-Revision-Date: 2005-12-18 18:36+0100\n" "Last-Translator: Radek Švarz \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Poedit-Language: Czech\n" "X-Poedit-Country: CZECH REPUBLIC\n" @@ -78,8 +79,7 @@ msgstr "datum/čas byl zaslán" msgid "is public" msgstr "je veřejné" -#: contrib/comments/models/comments.py:26 -#: contrib/admin/views/doc.py:256 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256 msgid "IP address" msgstr "IP adresa" @@ -88,8 +88,12 @@ msgid "is removed" msgstr "je odstraněno" #: contrib/comments/models/comments.py:27 -msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead." -msgstr "Zaškrtněte tento box, pokud komentář není vhodný. Místo něj bude zobrazena zpráva \"Tento komentář byl smazán\"." +msgid "" +"Check this box if the comment is inappropriate. A \"This comment has been " +"removed\" message will be displayed instead." +msgstr "" +"Zaškrtněte tento box, pokud komentář není vhodný. Místo něj bude zobrazena " +"zpráva \"Tento komentář byl smazán\"." #: contrib/comments/models/comments.py:31 msgid "Comment" @@ -218,29 +222,37 @@ msgid "No voting for yourself" msgstr "Nelze hlasovat pro sebe" #: contrib/comments/views/comments.py:25 -msgid "This rating is required because you've entered at least one other rating." -msgstr "Toto hodnocení je povinné, protože jste zadal(a) alespoň jedno jiné hodnocení." +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" +"Toto hodnocení je povinné, protože jste zadal(a) alespoň jedno jiné " +"hodnocení." #: contrib/comments/views/comments.py:109 #, python-format msgid "" -"This comment was posted by a user who has posted fewer than %(count)s comment:\n" +"This comment was posted by a user who has posted fewer than %(count)s " +"comment:\n" "\n" "%(text)s" msgid_plural "" -"This comment was posted by a user who has posted fewer than %(count)s comments:\n" +"This comment was posted by a user who has posted fewer than %(count)s " +"comments:\n" "\n" "%(text)s" msgstr[0] "" -"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %(count)s komentář:\n" +"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %" +"(count)s komentář:\n" "\n" "%(text)s" msgstr[1] "" -"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %(count)s komentáře:\n" +"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %" +"(count)s komentáře:\n" "\n" "%(text)s" msgstr[2] "" -"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %(count)s komentářů:\n" +"Tento komentář byl odevzdán uživatelem, který(á) odevzdal(a) méně než %" +"(count)s komentářů:\n" "\n" "%(text)s" @@ -272,8 +284,11 @@ msgstr "Někdo falšoval formulář komentáře (bezpečnostní narušení)" #: contrib/comments/views/comments.py:204 #: contrib/comments/views/comments.py:289 -msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid" -msgstr "Formulář komentáře měl neplatný parametr 'target' -- ID objektu nebylo platné" +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" +"Formulář komentáře měl neplatný parametr 'target' -- ID objektu nebylo platné" #: contrib/comments/views/comments.py:254 #: contrib/comments/views/comments.py:318 @@ -289,8 +304,7 @@ msgstr "" "

%s:

\n" "