diff options
| author | Georg Bauer <gb@hugo.westfalen.de> | 2006-02-02 10:25:15 +0000 |
|---|---|---|
| committer | Georg Bauer <gb@hugo.westfalen.de> | 2006-02-02 10:25:15 +0000 |
| commit | 1d6a56dae26acdecd7410b5670b6d3b4701b3179 (patch) | |
| tree | 16926c35c7940943ed2f15aff7febd55c3516dda | |
| parent | 2ddc9504c3c1309e2c9e3c5a6849f92166437f39 (diff) | |
fixed #1287 - comment forms are now translateable and overrideable
git-svn-id: http://code.djangoproject.com/svn/django/trunk@2230 bcc190cf-cafb-0310-a4f2-bffc1f526a37
47 files changed, 2464 insertions, 1188 deletions
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo Binary files differindex 6964e7aee0..c9b6c5bf46 100644 --- a/django/conf/locale/bn/LC_MESSAGES/django.mo +++ b/django/conf/locale/bn/LC_MESSAGES/django.mo diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po index 7c0396ae1e..3caf80817b 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: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: 2005-11-12 20:05+0530\n" "Last-Translator: Baishampayan Ghose <b.ghose@gnu.org.in>\n" "Language-Team: Ankur Bangla <core@bengalinux.org>\n" @@ -278,6 +278,77 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "ব্যবহারকারীর নাম:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "পাসওয়ার্ড:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "আমার পাসওয়ার্ড পরিবর্তন করুন" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "বাইরে যান" + +#: contrib/comments/templates/comments/form.html:12 +msgid "Ratings" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "মন্তব্য সক্রিয় করুন" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "মন্তব্য সক্রিয় করুন" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "ব্যবহারকারীর নাম" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -352,7 +423,7 @@ msgstr "কার্যবিবরণী এন্ট্রি" msgid "log entries" msgstr "কার্যবিবরণী এন্ট্রি সমুহ" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "" @@ -368,23 +439,23 @@ msgstr "" msgid "Log in" msgstr "প্রবেশ করুন" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 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 +#: contrib/admin/views/decorators.py:68 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:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "" -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -463,26 +534,26 @@ msgstr "" msgid "Change %s" msgstr "পরিবর্তন" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, fuzzy, python-format msgid "Change history: %s" msgstr "পাসওয়ার্ড পরিবর্তন করুন" @@ -572,6 +643,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "" @@ -581,6 +653,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: 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 @@ -594,28 +667,10 @@ msgstr "" msgid "Change password" 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:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "বাইরে যান" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -722,14 +777,6 @@ msgstr "কিছুই পাওয়া যাচ্ছে না" msgid "Add %(name)s" msgstr "যোগ করুন" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "ব্যবহারকারীর নাম:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "পাসওয়ার্ড:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "আপনি কি <a href=\"/password_reset/\">আপনার পাসওয়ার্ড ভুলে গেছেন</a>?" @@ -1770,7 +1817,7 @@ msgstr "" "\"%(attr)s\"বৈশিষ্ট্যয় লাইন %(line)s একটি অবৈধ মান আছে । (\"%(start)s\"এর সঙ্গে " "লাইন আরম্ভ।)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo Binary files differindex f4188d83ac..2dcdb0fabd 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.mo +++ b/django/conf/locale/cs/LC_MESSAGES/django.mo diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index d1b1f0f855..3d44f4c0f6 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: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:25+0100\n" "PO-Revision-Date: 2005-12-18 18:36+0100\n" "Last-Translator: Radek Švarz <tranlate@svarz.cz>\n" "Language-Team: Czech\n" @@ -295,6 +295,78 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "Formulář komentáře neobsahoval buď 'preview' nebo 'post'" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Uživatelské jméno:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Heslo:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Změnit mé heslo" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Odhlásit se" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr "hodnocení #1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "Komentář" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "volný komentář" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "uživatelské jméno" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -369,7 +441,7 @@ msgstr "log záznam" msgid "log entries" msgstr "log záznamy" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "Všechna data" @@ -385,7 +457,7 @@ msgstr "" msgid "Log in" msgstr "Přihlášení" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." @@ -393,7 +465,7 @@ msgstr "" "Prosíme, znovu se přihlašte, Vaše sezení vypršelo. Nemusíte se obávat, Vaše " "podání je uloženo." -#: contrib/admin/views/decorators.py:64 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -401,11 +473,11 @@ msgstr "" "Vypadá to, že Váš prohlížeč není nastaven, aby akceptoval cookies. Prosíme, " "zapněte cookies, obnovte tuto stránku a zkuste znovu." -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "Uživatelská jména nemohou obsahovat znak '@'." -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -485,26 +557,26 @@ msgstr "" msgid "Change %s" msgstr "%s: změnit" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Jedno nebo více %(fieldname)s z %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Jedno nebo více %(fieldname)s z %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně smazán." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "Jste si jist(á)?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "Historie změn: %s" @@ -589,6 +661,7 @@ msgstr "text XML" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentace" @@ -598,6 +671,7 @@ msgstr "Dokumentace" #: 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/registration/password_change_form.html:3 #: 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 @@ -611,28 +685,10 @@ msgstr "Dokumentace" msgid "Change password" msgstr "Změnit heslo" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Odhlásit se" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -739,14 +795,6 @@ msgstr "Nic" msgid "Add %(name)s" msgstr "%(name)s: přidat" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Uživatelské jméno:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Heslo:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "<a href=\"/password_reset/\">Zapomněl(a) jste své heslo?</a>" @@ -1808,7 +1856,7 @@ msgstr "" "Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s " "\"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "%(object)s s tímto %(type)s již existují pro daná %(field)s." diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo Binary files differindex 9a36894291..8044d67cb2 100644 --- a/django/conf/locale/cy/LC_MESSAGES/django.mo +++ b/django/conf/locale/cy/LC_MESSAGES/django.mo diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po index 2fee563fb7..4111e4aeea 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: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n" "Last-Translator: Jason Davies <jason@jasondavies.com>\n" "Language-Team: Cymraeg <cy@li.org>\n" @@ -268,6 +268,78 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Enw defnyddiwr:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Cyfrinair:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Newidio fy nghyfrinair" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Allgofnodi" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr "cyfraddiad #1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "Sylw" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "Sylw rhydd" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "enw defnyddiwr" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -340,7 +412,7 @@ msgstr "cofnod" msgid "log entries" msgstr "cofnodion" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "Dyddiadau i gyd" @@ -356,23 +428,23 @@ msgstr "" msgid "Log in" msgstr "Mewngofnodi" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 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 +#: contrib/admin/views/decorators.py:68 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:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "" -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -450,26 +522,26 @@ msgstr "" msgid "Change %s" msgstr "Newidio %s" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "Ydych yn sicr?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "Hanes newid: %s" @@ -554,6 +626,7 @@ msgstr "Testun XML" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dogfennaeth" @@ -563,6 +636,7 @@ msgstr "Dogfennaeth" #: 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/registration/password_change_form.html:3 #: 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 @@ -576,28 +650,10 @@ msgstr "Dogfennaeth" msgid "Change password" msgstr "Newid cyfrinair" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Allgofnodi" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -704,14 +760,6 @@ msgstr "Dim ar gael" msgid "Add %(name)s" msgstr "Ychwanegu %(name)s" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Enw defnyddiwr:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Cyfrinair:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Ydych wedi <a href=\"/password_reset/\">anghofio eich cyfrinair</a>?" @@ -1753,7 +1801,7 @@ msgstr "" "Mae gan y priodoledd \"%(attr)s\" ar lein %(line)s gwerth annilydd. (Linell " "yn ddechrau â \"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo Binary files differindex 9a103502f0..8bdc7a3478 100644 --- a/django/conf/locale/da/LC_MESSAGES/django.mo +++ b/django/conf/locale/da/LC_MESSAGES/django.mo diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po index d66428d67d..f59a99fbd9 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: 2006-01-12 23:12+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Morten Bagai <m@bagai.com>\n" "Language-Team: Danish\n" @@ -278,6 +278,77 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Brugernavn:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Adgangskode:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Ændre adgangskode" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Log ud" + +#: contrib/comments/templates/comments/form.html:12 +msgid "Ratings" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "tillad kommentarer" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "tillad kommentarer" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "brugernavn" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -352,7 +423,7 @@ msgstr "logmeddelelse" msgid "log entries" msgstr "logmeddelelser" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "" @@ -368,23 +439,23 @@ msgstr "" msgid "Log in" msgstr "Log ind" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 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 +#: contrib/admin/views/decorators.py:68 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:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "" -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -463,26 +534,26 @@ msgstr "" msgid "Change %s" msgstr "Ændre" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, fuzzy, python-format msgid "Change history: %s" msgstr "Ændre adgangskode" @@ -572,6 +643,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "" @@ -581,6 +653,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: 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 @@ -594,28 +667,10 @@ msgstr "" msgid "Change password" msgstr "Ændre adgangskode" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Log ud" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -722,14 +777,6 @@ msgstr "Ingen tilgængelige" msgid "Add %(name)s" msgstr "" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Brugernavn:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Adgangskode:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Har du <a href=\"/password_reset/\">glemt din adgangskode</a>?" @@ -1779,7 +1826,7 @@ msgstr "" "\"%(attr)s\" attributten på linje $(line)s har en ugyldig værdi. (Linjen " "starter med \"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo Binary files differindex 9654bd087b..e9f84e3ec2 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.mo +++ b/django/conf/locale/de/LC_MESSAGES/django.mo diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 38b3f19345..f1acbf8853 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: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: 2005-10-08 00:03+0200\n" "Last-Translator: Georg Bauer <gb@bofh.ms>\n" "MIME-Version: 1.0\n" @@ -288,6 +288,73 @@ msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" "Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Benutzername:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Passwort:" + +#: contrib/comments/templates/comments/form.html:6 +msgid "Forgotten your password?" +msgstr "Kennwort vergessen?" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Abmelden" + +#: contrib/comments/templates/comments/form.html:12 +msgid "Ratings" +msgstr "Bewertungen" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "Erforderlich" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "Optional" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "Ein Bild verffentlichen" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +msgid "Comment:" +msgstr "Kommentar:" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +msgid "Preview comment" +msgstr "Kommentarvorschau" + +#: contrib/comments/templates/comments/freeform.html:4 +msgid "Your name:" +msgstr "Ihr Name:" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -362,7 +429,7 @@ msgstr "Logeintrag" msgid "log entries" msgstr "Logeintrge" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "Alle Tage" @@ -380,7 +447,7 @@ msgstr "" msgid "Log in" msgstr "Anmelden" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." @@ -388,7 +455,7 @@ msgstr "" "Bitte neu anmelden, da die Session ausgelaufen ist. Keine Angst: die " "Beitrge wurden gesichert." -#: contrib/admin/views/decorators.py:64 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -396,11 +463,11 @@ msgstr "" "Es sieht danach aus, das der Browser keine Cookies akzeptiert. Bitte im " "Browser Cookies aktivieren und diese Seite neu laden." -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "Benutzernamen knnen das Zeichen '@' nicht enthalten." -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -482,26 +549,26 @@ msgstr "" msgid "Change %s" msgstr "%s ndern" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Ein oder mehrere %(fieldname)s in %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Ein oder mehrere %(fieldname)s in %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelscht." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "Sicher? Ganz sicher?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "nderungsgeschichte: %s" @@ -586,6 +653,7 @@ msgstr "XML Text" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentation" @@ -595,6 +663,7 @@ msgstr "Dokumentation" #: 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/registration/password_change_form.html:3 #: 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 @@ -608,28 +677,10 @@ msgstr "Dokumentation" msgid "Change password" msgstr "Passwort ndern" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Abmelden" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -738,14 +789,6 @@ msgstr "Keine vorhanden" msgid "Add %(name)s" msgstr "%(name)s zufgen" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Benutzername:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Passwort:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Haben Sie <a href=\"/password_reset/\">ihr Passwort vergessen</a>?" @@ -1809,7 +1852,7 @@ msgstr "" "Das Attribut %(attr)s in Zeile %(line)s hat einen ungltigen Wert. Die Zeile " "beginnt mit \"%(start)s\"." -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo Binary files differindex c76eea564b..8006017dbe 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.mo +++ b/django/conf/locale/en/LC_MESSAGES/django.mo diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 05126d01c1..fde0cf39eb 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: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -263,6 +263,73 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "" + +#: contrib/comments/templates/comments/form.html:6 +msgid "Forgotten your password?" +msgstr "" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +msgid "Ratings" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +msgid "Comment:" +msgstr "" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +msgid "Preview comment" +msgstr "" + +#: contrib/comments/templates/comments/freeform.html:4 +msgid "Your name:" +msgstr "" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -335,7 +402,7 @@ msgstr "" msgid "log entries" msgstr "" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "" @@ -351,23 +418,23 @@ msgstr "" msgid "Log in" msgstr "" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 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 +#: contrib/admin/views/decorators.py:68 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:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "" -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -445,26 +512,26 @@ msgstr "" msgid "Change %s" msgstr "" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "" @@ -549,6 +616,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "" @@ -558,6 +626,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: 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 @@ -571,28 +640,10 @@ msgstr "" msgid "Change password" 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:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -695,14 +746,6 @@ msgstr "" msgid "Add %(name)s" msgstr "" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "" @@ -1698,7 +1741,7 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo Binary files differindex 50f14bb72f..b3412433cf 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.mo +++ b/django/conf/locale/es/LC_MESSAGES/django.mo diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index c14c2c367e..daf7f3a3f1 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: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:25+0100\n" "PO-Revision-Date: 2005-11-28 15:28+0000\n" "Last-Translator: Ricardo Javier Cardenes Medina <ricardo.cardenes@gmail." "com>\n" @@ -289,6 +289,78 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "El formulario de comentario no proporcion 'previsualizar' ni 'enviar'" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Usuario:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Clave:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Cambiar mi clave" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Terminar sesin" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr "calificacin 1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "Comentario" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "Comentario libre" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "nombre de usuario" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -363,7 +435,7 @@ msgstr "entrada de registro" msgid "log entries" msgstr "entradas de registro" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "Todas las fechas" @@ -379,7 +451,7 @@ msgstr "" msgid "Log in" msgstr "Identificarse" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." @@ -387,7 +459,7 @@ msgstr "" "Por favor, identifquese de nuevo, porque su sesin ha caducado. No se " "preocupe: se ha guardado su envo." -#: contrib/admin/views/decorators.py:64 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -395,11 +467,11 @@ msgstr "" "Parece que su navegador no est configurado para aceptar cookies. Actvelas " "por favor, recargue esta pgina, e intntelo de nuevo." -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "Los nombres de usuario no pueden contener el carcter '@'." -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -480,26 +552,26 @@ msgstr "" msgid "Change %s" msgstr "Modificar %s" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Uno o ms %(fieldname)s en %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Uno o ms %(fieldname)s en %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Se elimin con xito el %(name)s \"%(obj)s\"." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "Est seguro?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "Modificar histrico: %s" @@ -584,6 +656,7 @@ msgstr "Texto XML" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Documentacin" @@ -593,6 +666,7 @@ msgstr "Documentacin" #: 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/registration/password_change_form.html:3 #: 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 @@ -606,28 +680,10 @@ msgstr "Documentacin" msgid "Change password" msgstr "Cambiar clave" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Terminar sesin" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -735,14 +791,6 @@ msgstr "Ninguno disponible" msgid "Add %(name)s" msgstr "Agregar %(name)s" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Usuario:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Clave:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Ha <a href=\"/password_reset/\">olvidado su clave</a>?" @@ -1806,7 +1854,7 @@ msgstr "" "El atributo \"%(attr)s\" de la lnea %(line)s tiene un valor que no es " "vlido. (La lnea empieza por \"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, fuzzy, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "Ya existe %(optname)s con este %(fieldname)s." diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo Binary files differindex 8d5abb1377..919c2f431e 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.mo +++ b/django/conf/locale/fr/LC_MESSAGES/django.mo diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index 44ba7e9998..40dabd33a9 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: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:25+0100\n" "PO-Revision-Date: 2005-10-18 12:27+0200\n" "Last-Translator: Mikal Barbero <mikael.barbero nospam at nospam free.fr>\n" "Language-Team: franais <fr@li.org>\n" @@ -305,6 +305,78 @@ msgstr "" "Le formulaire de commentaire ne proposait ni les options de prvisualisation " "ni d'envoi" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Nom d'utilisateur" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Mot de passe" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Modifier mon mot de passe" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Dconnection" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr "vote n1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "Commentaire" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "Commentaire libre" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "nom d'utilisateur" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -381,7 +453,7 @@ msgstr "entre d'historique" msgid "log entries" msgstr "entres d'historique" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "Toutes les dates" @@ -400,7 +472,7 @@ msgstr "" msgid "Log in" msgstr "Connectez-vous" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." @@ -408,7 +480,7 @@ msgstr "" "Votre session a expir, connectez-vous de nouveau s'il vous plat. Ne vous " "inquitez pas, votre travail prcdement ffectu a t sauv." -#: contrib/admin/views/decorators.py:64 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -416,11 +488,11 @@ msgstr "" "Il semblerait que votre navigateur n'accepte pas les cookies. Activez-les, " "rechargez cette page et rssayez s'il vous plat." -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "Les noms d'utilisateur ne peuvent contenir le caractre '@'" -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -502,26 +574,26 @@ msgstr "" msgid "Change %s" msgstr "Changement %s" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Un ou plusieurs %(fieldname)s dans %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Un ou plusieurs %(fieldname)s dans %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "L'objet %(name)s \"%(obj)s\" a t supprim avec succs." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "tes-vous sr ?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, fuzzy, python-format msgid "Change history: %s" msgstr "Historique des changements : %s" @@ -611,6 +683,7 @@ msgstr "Texte XML" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Documentation" @@ -620,6 +693,7 @@ msgstr "Documentation" #: 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/registration/password_change_form.html:3 #: 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 @@ -633,28 +707,10 @@ msgstr "Documentation" msgid "Change password" msgstr "Modifier votre mot de passe" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Dconnection" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -763,14 +819,6 @@ msgstr "Aucun(e) disponible" msgid "Add %(name)s" msgstr "Ajouter %(name)s" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Nom d'utilisateur" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Mot de passe" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Avez vous <a href=\"/password_reset/\">perdu votre mot de passe</a>?" @@ -1845,7 +1893,7 @@ msgstr "" "La valeur de l'attribut \"%(attr)s\" de la ligne %(line)s n'est pas valide. " "(Ligne dbutant par \"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo Binary files differindex d0f086af47..fb0608efe0 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.mo +++ b/django/conf/locale/gl/LC_MESSAGES/django.mo diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po index 70c7c916e3..66130ac462 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: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:25+0100\n" "PO-Revision-Date: 2005-12-20 10:48+0100\n" "Last-Translator: Afonso Fernández Nogueira <fonzzo.django@gmail.com>\n" "Language-Team: Galego\n" @@ -284,6 +284,77 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "O formulario de comentario non proporciona 'preview' ou 'post'" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Usuario:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Contrasinal:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Cambiar o contrasinal" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Saír" + +#: contrib/comments/templates/comments/form.html:12 +msgid "Ratings" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "Comentario" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "Comentario libre" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "nome de usuario" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -358,7 +429,7 @@ msgstr "entrada de rexistro" msgid "log entries" msgstr "entradas de rexistro" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "Todas as datas" @@ -374,7 +445,7 @@ msgstr "" msgid "Log in" msgstr "Entrar" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." @@ -382,7 +453,7 @@ msgstr "" "Ten que identicarse outra vez porque a súa sesión expirou. Non se preocupe, " "o que enviou quedou gardado." -#: contrib/admin/views/decorators.py:64 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -390,11 +461,11 @@ msgstr "" "Semella que o seu navegador non está configurado para aceptar 'cookies'. " "Por favor, habilite as 'cookies', recargue a páxina e ténteo de novo." -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "Os nomes de usuario non poden conter o carácter '@'." -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -474,26 +545,26 @@ msgstr "Engadiuse correctamente o/a %(name)s \"%(obj)s\" Pode editalo embaixo." msgid "Change %s" msgstr "Modificar %s" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Un ou máis %(fieldname)s no/a %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Un ou máis %(fieldname)s no/a %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Eliminouse correctamente o/a %(name)s \"%(obj)s\"." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "Está seguro?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "Histórico de cambios: %s" @@ -578,6 +649,7 @@ msgstr "Texto XML" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Documentación" @@ -587,6 +659,7 @@ msgstr "Documentación" #: 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/registration/password_change_form.html:3 #: 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 @@ -600,28 +673,10 @@ msgstr "Documentación" msgid "Change password" msgstr "Cambiar contrasinal" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Saír" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -728,14 +783,6 @@ msgstr "Ningunha dispoñíbel" msgid "Add %(name)s" msgstr "Engadir %(name)s" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Usuario:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Contrasinal:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "<a href=\"/password_reset/\">Esqueceu o contrasinal</a>?" @@ -1785,7 +1832,7 @@ msgstr "" "O atributo \"%(attr)s\" na liña %(line)s contén un valor non válido. (A liña " "comeza con \"%(start)s\")." -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, fuzzy, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "Xa existe un/ha %(optname)s con este/a %(fieldname)s." diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo Binary files differindex 00754d1263..b84d660597 100644 --- a/django/conf/locale/is/LC_MESSAGES/django.mo +++ b/django/conf/locale/is/LC_MESSAGES/django.mo diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po index 18914d3b13..bc22c37cca 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: 2006-01-12 23:12+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: 2005-11-13 18:08-0000\n" "Last-Translator: Dagur Páll Ammendrup <dagurp@gmail.com>\n" "Language-Team: <dagurp@gmail.com>\n" @@ -280,6 +280,77 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Notandanafn:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Lykilorð:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Breyta lykilorðinu mínu" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Skrá út" + +#: contrib/comments/templates/comments/form.html:12 +msgid "Ratings" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "virkja athugasemdir" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "virkja athugasemdir" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "notandanafn" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -354,7 +425,7 @@ msgstr "kladdafærsla" msgid "log entries" msgstr "kladdafærslur" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "" @@ -370,23 +441,23 @@ msgstr "" msgid "Log in" msgstr "Skrá inn" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 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 +#: contrib/admin/views/decorators.py:68 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:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "" -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -465,26 +536,26 @@ msgstr "" msgid "Change %s" msgstr "Breyta" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, fuzzy, python-format msgid "Change history: %s" msgstr "Breyta lykilorði" @@ -574,6 +645,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "" @@ -583,6 +655,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: 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 @@ -596,28 +669,10 @@ msgstr "" msgid "Change password" msgstr "Breyta lykilorði" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Skrá út" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -724,14 +779,6 @@ msgstr "Engin fáanleg" msgid "Add %(name)s" msgstr "Bæta við" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Notandanafn:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Lykilorð:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "<a href=\"/password_reset/\">Gleymdir þú lykilorðinu</a> þínu?" @@ -1776,7 +1823,7 @@ msgstr "" "\"%(attr)s\" eigindið á línu %(line)s hefur ótækt gildi (línan hefst á \"%" "(start)s\")." -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo Binary files differindex e023fd2d48..7d8563ec30 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.mo +++ b/django/conf/locale/it/LC_MESSAGES/django.mo diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index 1307d39a13..93b40e2da5 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: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -278,6 +278,77 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Nome utente:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Password:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Cambia la mia password" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Esci" + +#: contrib/comments/templates/comments/form.html:12 +msgid "Ratings" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "abilita commenti" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "abilita commenti" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "nome utente" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -352,7 +423,7 @@ msgstr "voce di log" msgid "log entries" msgstr "voci di log" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "" @@ -368,23 +439,23 @@ msgstr "" msgid "Log in" msgstr "Accedi" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 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 +#: contrib/admin/views/decorators.py:68 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:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "" -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -463,26 +534,26 @@ msgstr "" msgid "Change %s" msgstr "Cambia" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, fuzzy, python-format msgid "Change history: %s" msgstr "Cambia la password" @@ -572,6 +643,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "" @@ -581,6 +653,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: 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 @@ -594,28 +667,10 @@ msgstr "" msgid "Change password" msgstr "Cambia la password" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Esci" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -723,14 +778,6 @@ msgstr "Nessuna disponibile" msgid "Add %(name)s" msgstr "Aggiungi" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Nome utente:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Password:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Hai <a href=\"/password_reset/\">dimenticato la tua password</a>?" @@ -1778,7 +1825,7 @@ msgstr "" "L'attributo \"%(attr)s\" alla linea %(line)s ha un valore non valido. (La " "linea comincia con \"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo Binary files differindex bd24eec980..a84d2ae69b 100644 --- a/django/conf/locale/ja/LC_MESSAGES/django.mo +++ b/django/conf/locale/ja/LC_MESSAGES/django.mo diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po index 39777d22dd..6d16aad848 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: 2006-01-13 15:53+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -282,6 +282,78 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "コメントフォームに「プレビュー」「投稿」のどちらも指示がありません。" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "ユーザ名" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "パスワード" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "パスワードの変更" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "ログアウト" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr "レーティング #1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "コメント" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "自由コメント" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "ユーザ名" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -356,7 +428,7 @@ msgstr "ログ" msgid "log entries" msgstr "ログ" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "全ての日:" @@ -372,7 +444,7 @@ msgstr "" msgid "Log in" msgstr "ログイン" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." @@ -380,7 +452,7 @@ msgstr "" "再ログインしてください。ログインセッションが有効期間切れしてしまいました。入" "力データは失われておりませんのでご安心ください。" -#: contrib/admin/views/decorators.py:64 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -388,11 +460,11 @@ msgstr "" "ブラウザがクッキーの設定を許可していないようです。クッキーの設定を許可して、" "もう一度このページを表示してください。" -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "ユーザ名は'@'を含むことが出来ません。" -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "メールアドレスはユーザ名ではありません。'%s'を試してみてください。" @@ -470,26 +542,26 @@ msgstr "%(name)s \"%(obj)s\" が追加されました。この下で編集が可 msgid "Change %s" msgstr "%s を変更" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "%(name)sに%(fieldname)s が一つ以上あります: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "%(name)sに%(fieldname)s が一つ以上あります:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" が削除されました。" -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "よろしいですか？ " -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "変更履歴: %s" @@ -574,6 +646,7 @@ msgstr "XMLテキスト" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "文書" @@ -583,6 +656,7 @@ msgstr "文書" #: 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/registration/password_change_form.html:3 #: 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 @@ -596,28 +670,10 @@ msgstr "文書" msgid "Change password" 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:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "ログアウト" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -724,14 +780,6 @@ msgstr "利用不可" msgid "Add %(name)s" msgstr "%(name)s を追加" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "ユーザ名" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "パスワード" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "<a href=\"/password_reset/\">パスワードを忘れましたか</a>？" @@ -1762,7 +1810,7 @@ msgstr "" "%(line)s 行目の \"%(attr)s\" 亜鶏ビューは無効です。（ \"%(start)s\" で始まる" "行 ）" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" diff --git a/django/conf/locale/nl/LC_MESSAGES/django.mo b/django/conf/locale/nl/LC_MESSAGES/django.mo Binary files differindex 634d3c49d7..364fedca92 100644 --- a/django/conf/locale/nl/LC_MESSAGES/django.mo +++ b/django/conf/locale/nl/LC_MESSAGES/django.mo diff --git a/django/conf/locale/nl/LC_MESSAGES/django.po b/django/conf/locale/nl/LC_MESSAGES/django.po index 024ac606e9..9f9e6c4935 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: 2006-01-12 23:12+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Johan C. Stöver <johan@nilling.nl>\n" "Language-Team: \n" @@ -288,6 +288,78 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "Het opmerkingenformulier heeft geen 'voorbeeld' of 'post'" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Gebruikersnaam:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Wachtwoord:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Wijzig mijn wachtwoord" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Afmelden" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr "waardering #1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "Opmerking" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "Opmerking" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "gebruikernaam" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -363,7 +435,7 @@ msgstr "log ingave" msgid "log entries" msgstr "log ingaves" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 #, fuzzy msgid "All dates" msgstr "Elke datum" @@ -382,7 +454,7 @@ msgstr "" msgid "Log in" msgstr "Aanmelden" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." @@ -390,7 +462,7 @@ msgstr "" "Uw sessie is verlopen, meldt u opnieuw aan. Maakt u geen zorgen: Uw bijdrage " "is opgeslagen." -#: contrib/admin/views/decorators.py:64 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -398,11 +470,11 @@ msgstr "" "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 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "Gebruikersnamen mogen geen '@' bevatten." -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Uw e-mail adres is niet uw gebruikersnaam. Probeer '%s' eens." @@ -481,26 +553,26 @@ msgstr "De %(name)s \"%(obj)s\" toegevoegd. U mag het hieronder wijzigen." msgid "Change %s" msgstr "Wijzigen" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Een of meer %(fieldname)s in %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Een of meer %(fieldname)s in %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Verwijdering %(name)s \"%(obj)s\" is geslaagd." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "Weet u het zeker?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, fuzzy, python-format msgid "Change history: %s" msgstr "Wachtwoord wijzigen" @@ -585,6 +657,7 @@ msgstr "XML Tekst" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Documentatie" @@ -594,6 +667,7 @@ msgstr "Documentatie" #: 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/registration/password_change_form.html:3 #: 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 @@ -607,28 +681,10 @@ msgstr "Documentatie" msgid "Change password" msgstr "Wachtwoord wijzigen" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Afmelden" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -734,14 +790,6 @@ msgstr "Geen beschikbaar" msgid "Add %(name)s" msgstr "%(name)s toevoegen" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Gebruikersnaam:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Wachtwoord:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Wachtwoord <a href=\"password_reset/\">vergeten</a>?" @@ -1801,7 +1849,7 @@ msgstr "" "De \"%(attr)s\" attribuut op regel %(line)s heeft een ongeldige waarde. " "(Regel start met \"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo Binary files differindex b64af505f3..028f25022a 100644 --- a/django/conf/locale/no/LC_MESSAGES/django.mo +++ b/django/conf/locale/no/LC_MESSAGES/django.mo diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po index d2c59763c3..6814fd7f2d 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: 2006-01-12 23:12+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n" "Language-Team: Norwegian\n" @@ -292,6 +292,77 @@ msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" "Kommentar skjemaet returnerte ikke et 'forhåndsvisning' eller 'post' objekt" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Brukernavn:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Passord:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Endre passord" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Log ut" + +#: contrib/comments/templates/comments/form.html:12 +msgid "Ratings" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "tillat kommentarer" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "tillat kommentarer" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "brukernavn" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -369,7 +440,7 @@ msgstr "logg notis" msgid "log entries" msgstr "logg innlegg" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "Alle datoer" @@ -385,7 +456,7 @@ msgstr "" msgid "Log in" msgstr "Log inn" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." @@ -393,7 +464,7 @@ msgstr "" "Du må logge inn igjen, fordi sesjonen din har gått ut på dato, men ikke ikke " "bekjymr deg informasjonen du sendte ble lagret." -#: contrib/admin/views/decorators.py:64 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -402,11 +473,11 @@ msgstr "" "('cookies'). Vennligst omkonfigurer nettleseren din, last siden på ny og " "prøv igjen." -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "Brukernavnet kan ikke inneholde '@'" -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Epost adressen din er ikke brukernavnet ditt, prøv '%s' i stede." @@ -485,26 +556,26 @@ msgstr "%(name)s \"%(obj)s\" ble endret. Du kan endre det igjen under." msgid "Change %s" msgstr "Endre %s" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "En eller flere %(fieldname)s i %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "En eller flere %(fieldname)s i %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" ble slettet." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "Er du sikker?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, fuzzy, python-format msgid "Change history: %s" msgstr "Endre historien: %s" @@ -591,6 +662,7 @@ msgstr "XML tekst" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentasjon" @@ -600,6 +672,7 @@ msgstr "Dokumentasjon" #: 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/registration/password_change_form.html:3 #: 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 @@ -613,28 +686,10 @@ msgstr "Dokumentasjon" msgid "Change password" msgstr "Endre passord" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Log ut" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -741,14 +796,6 @@ msgstr "Ingen tilgjengelige" msgid "Add %(name)s" msgstr "Legg til %(name)s" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Brukernavn:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Passord:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Har du <a href=\"/password_reset/\">glemt passordet ditt</a>?" @@ -1799,7 +1846,7 @@ msgstr "" "\"%(attr)s\" tillegg på linje $(line)s har en ikke godkjent verdi. (Linja " "starter med \"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, fuzzy, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "$(optname)s med %(fieldname)s finnes allerede." diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo Binary files differindex c324550bb0..fd22fa0a1c 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index 0f67f34a1f..039492698c 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -7,13 +7,13 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:25+0100\n" "PO-Revision-Date: 2006-01-23 19:54-0200\n" "Last-Translator: João Marcus Christ <joaoma@gmail.com>\n" "Language-Team: Português do Brasil <pt-br@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 @@ -75,8 +75,7 @@ msgstr "data/hora de envio" msgid "is public" msgstr "é público" -#: 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 "Endereço IP:" @@ -85,8 +84,12 @@ msgid "is removed" msgstr "foi removido" #: 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 "Selecione esta opção se o comentário é inapropriado. Uma mensagem \"Este comentário foi removido\" será mostrada no lugar." +msgid "" +"Check this box if the comment is inappropriate. A \"This comment has been " +"removed\" message will be displayed instead." +msgstr "" +"Selecione esta opção se o comentário é inapropriado. Uma mensagem \"Este " +"comentário foi removido\" será mostrada no lugar." #: contrib/comments/models/comments.py:31 msgid "Comment" @@ -215,23 +218,29 @@ msgid "No voting for yourself" msgstr "Você não pode votar em si mesmo" #: contrib/comments/views/comments.py:25 -msgid "This rating is required because you've entered at least one other rating." -msgstr "Esta avaliação é requerida porque você entrou com ao menos uma avaliação" +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" +"Esta avaliação é requerida porque você entrou com ao menos uma avaliação" #: contrib/comments/views/comments.py:109 -#, python-format +#, fuzzy, 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" -"This comment was posted by a user who has posted fewer than %(count)s comments:\n" +msgid_plural "" +"This comment was posted by a user who has posted fewer than %(count)s " +"comments:\n" "\n" "%(text)s" -msgstr "" -"Este comentário foi envidao por um usuário que enviou menos de %(count)s comentário:\n" +msgstr[0] "" +"Este comentário foi feito por um usuário esboço:\n" "\n" "%(text)s" -"Este comentário foi enviado por um usuário que enviou menos de %(count)s comentários:\n" +msgstr[1] "" +"Este comentário foi feito por um usuário esboço:\n" "\n" "%(text)s" @@ -263,14 +272,90 @@ msgstr "Alguém modificou o form de comentários (violação de segurança)" #: 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 "O form de comentários teve um parâmetro 'target' inválido -- o ID do objeto é inválido" +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" +"O form de comentários teve um parâmetro 'target' inválido -- o ID do objeto " +"é inválido" #: contrib/comments/views/comments.py:254 #: contrib/comments/views/comments.py:318 msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "O form de comentários não forneceu nem 'preview' nem 'post'" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Usuário:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Senha:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Alterar minha senha" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Encerrar sessão" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr "avaliação #1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "Comentário" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "Comentário livre" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "usuário" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -280,8 +365,7 @@ msgstr "" "<h3>Por %s</h3>\n" "<ul>\n" -#: contrib/admin/filterspecs.py:70 -#: contrib/admin/filterspecs.py:88 +#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88 #: contrib/admin/filterspecs.py:143 msgid "All" msgstr "Todos" @@ -346,34 +430,45 @@ msgstr "entrada de log" msgid "log entries" msgstr "entradas de log" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "Todas as datas" -#: 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." -msgstr "Por favor entre usuário e senha corretos. Note que ambos os camposdiferenciam maiúsculas e minúsculas." +msgid "" +"Please enter a correct username and password. Note that both fields are case-" +"sensitive." +msgstr "" +"Por favor entre usuário e senha corretos. Note que ambos os " +"camposdiferenciam maiúsculas e minúsculas." #: contrib/admin/views/decorators.py:23 #: contrib/admin/templates/admin/login.html:24 msgid "Log in" msgstr "Acessar" -#: 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 "Por favor acesse novamente, pois sua sessão expirou. Não se preocupe: Os dados enviados foram salvos." +#: contrib/admin/views/decorators.py:61 +msgid "" +"Please log in again, because your session has expired. Don't worry: Your " +"submission has been saved." +msgstr "" +"Por favor acesse novamente, pois sua sessão expirou. Não se preocupe: Os " +"dados enviados foram salvos." -#: 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 "Parece que seu navegador não está configurado para aceitar cookies. Por favor habilite os cookies, recarregue esta página, e tente novamente." +#: contrib/admin/views/decorators.py:68 +msgid "" +"Looks like your browser isn't configured to accept cookies. Please enable " +"cookies, reload this page, and try again." +msgstr "" +"Parece que seu navegador não está configurado para aceitar cookies. Por " +"favor habilite os cookies, recarregue esta página, e tente novamente." -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "Nomes de usuário não podem conter o caracter '@'." -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Seu endereço de e-mail não é seu nome de usuário. Tente usar '%s'" @@ -397,15 +492,11 @@ msgstr "Selecione %s para modificar" msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "O(A) %(name)s \"%(obj)s\" foi adicionado com sucesso." -#: contrib/admin/views/main.py:415 -#: contrib/admin/views/main.py:491 -#: 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 "Você pode editá-lo(a) de novo abaixo." -#: contrib/admin/views/main.py:423 -#: contrib/admin/views/main.py:500 -#: 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 "Você pode adicionar outro(a) %s abaixo." @@ -420,11 +511,7 @@ msgstr "Adicionar %s" msgid "Added %s." msgstr "Adicionado %s." -#: 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:457 contrib/admin/views/main.py:459 #: contrib/admin/views/main.py:461 msgid "and" msgstr "e" @@ -450,44 +537,44 @@ msgstr "O(A) %(name)s \"%(obj)s\" foi modificado com sucesso." #: contrib/admin/views/main.py:498 #, python-format -msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." -msgstr "O(A) %(name)s \"%(obj)s\" foi adicionado com sucesso. Você pode editá-lo(a) abaixo." +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "" +"O(A) %(name)s \"%(obj)s\" foi adicionado com sucesso. Você pode editá-lo(a) " +"abaixo." #: contrib/admin/views/main.py:536 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Um(a) ou mais %(fieldname)s em %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Um(a) ou mais %(fieldname)s em %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "O(A) %(name)s \"%(obj)s\" foi adicionado com sucesso." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "Você tem certeza?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "Histórico de Modificações: %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 "Inteiro" @@ -515,10 +602,8 @@ msgstr "Data/hora" #: contrib/admin/views/doc.py:250 msgid "E-mail address" msgstr "Endereço de e-mail" -"" -#: 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 "Caminho do Arquivo" @@ -550,8 +635,7 @@ msgstr "Texto" msgid "Time" msgstr "Hora" -#: 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" @@ -568,6 +652,7 @@ msgstr "Texto XML" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Documentação" @@ -577,6 +662,7 @@ msgstr "Documentação" #: 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/registration/password_change_form.html:3 #: 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 @@ -590,28 +676,10 @@ msgstr "Documentação" msgid "Change password" msgstr "Alterar senha" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Encerrar sessão" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -631,8 +699,7 @@ msgstr "Histórico" msgid "Date/time" msgstr "Data/hora" -#: 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 "Usuário" @@ -645,8 +712,12 @@ msgid "DATE_WITH_TIME_FULL" msgstr "j. N Y, H:i" #: contrib/admin/templates/admin/object_history.html:36 -msgid "This object doesn't have a change history. It probably wasn't added via this admin site." -msgstr "Este objeto não tem um histórico de alterações. Ele provavelmente não foi adicionado por este site de administração." +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" +"Este objeto não tem um histórico de alterações. Ele provavelmente não foi " +"adicionado por este site de administração." #: contrib/admin/templates/admin/base_site.html:4 msgid "Django site admin" @@ -669,8 +740,12 @@ msgid "Server Error <em>(500)</em>" msgstr "Erro no Servidor <em>(500)</em>" #: contrib/admin/templates/admin/500.html:10 -msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." -msgstr "Houve um erro. Este foi reportado aos administradores do site através d e-mail e deve ser consertado em breve. Obrigado pela compreensão." +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"Houve um erro. Este foi reportado aos administradores do site através d e-" +"mail e deve ser consertado em breve. Obrigado pela compreensão." #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 @@ -711,14 +786,6 @@ msgstr "Nenhuma disponível" msgid "Add %(name)s" msgstr "Adicionar %(name)s" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Usuário:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Senha:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Você <a href=\"/password_reset/\"esqueceu a senha</a>?" @@ -729,13 +796,23 @@ msgstr "Bem vindo," #: 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 "A remoção de '%(object)s' %(object_name)s pode resultar na remoção de objetos relacionados, mas sua conta não tem a permissão para remoção dos seguintes tipos de objetos:" +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 "" +"A remoção de '%(object)s' %(object_name)s pode resultar na remoção de " +"objetos relacionados, mas sua conta não tem a permissão para remoção dos " +"seguintes tipos de objetos:" #: 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 "Você tem certeza que quer remover o \"%(object)s\" %(object_name)s? Todos os seguintes itens relacionados serão removidos:" +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"Você tem certeza que quer remover o \"%(object)s\" %(object_name)s? Todos os " +"seguintes itens relacionados serão removidos:" #: contrib/admin/templates/admin/delete_confirmation.html:17 msgid "Yes, I'm sure" @@ -755,8 +832,11 @@ msgid "View on site" msgstr "Ver no site" #: contrib/admin/templates/admin/change_form.html:28 +#, fuzzy msgid "Please correct the error below." -msgstr "Por favor, corrija o erro abaixo." +msgid_plural "Please correct the errors below." +msgstr[0] "Por favor, corrija o erro abaixo." +msgstr[1] "Por favor, corrija o erro abaixo." #: contrib/admin/templates/admin/change_form.html:45 msgid "Ordering" @@ -810,8 +890,12 @@ msgid "Password reset" msgstr "Reinicializar senha" #: 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 "Esqueceu a senha? Digite seu e-mail abaixo e nós iremos enviar uma nova senha para você." +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 "" +"Esqueceu a senha? Digite seu e-mail abaixo e nós iremos enviar uma nova " +"senha para você." #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" @@ -835,12 +919,20 @@ msgid "Password reset successful" msgstr "Senha inicializada com sucesso" #: 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 "Nós enviamos uma nova senha para o e-mail que você informou. Você deve estar recebendo uma mensagem em breve." +msgid "" +"We've e-mailed a new password to the e-mail address you submitted. You " +"should be receiving it shortly." +msgstr "" +"Nós enviamos uma nova senha para o e-mail que você informou. Você deve estar " +"recebendo uma mensagem em breve." #: 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 "Por favor, informe sua senha antiga, por segurança, e então informe sua nova senha duas vezes para que possamos verificar que se ela está correta." +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 "" +"Por favor, informe sua senha antiga, por segurança, e então informe sua nova " +"senha duas vezes para que possamos verificar que se ela está correta." #: contrib/admin/templates/registration/password_change_form.html:17 msgid "Old password:" @@ -921,16 +1013,23 @@ msgid "Documentation for this page" msgstr "Documentação para esta página" #: contrib/admin/templates/admin_doc/bookmarklets.html:20 -msgid "Jumps you from any page to the documentation for the view that generates that page." -msgstr "Leva você de qualquer página da documentação para a view que gera tal página." +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." +msgstr "" +"Leva você de qualquer página da documentação para a view que gera tal página." #: contrib/admin/templates/admin_doc/bookmarklets.html:22 msgid "Show object ID" msgstr "Mostar ID de objeto" #: contrib/admin/templates/admin_doc/bookmarklets.html:23 -msgid "Shows the content-type and unique ID for pages that represent a single object." -msgstr "Mostra o tipo de conteúdo e ID único para páginas que representam um objeto único." +msgid "" +"Shows the content-type and unique ID for pages that represent a single " +"object." +msgstr "" +"Mostra o tipo de conteúdo e ID único para páginas que representam um objeto " +"único." #: contrib/admin/templates/admin_doc/bookmarklets.html:25 msgid "Edit this object (current window)" @@ -938,7 +1037,9 @@ msgstr "Edita este objeto (janela atual)" #: contrib/admin/templates/admin_doc/bookmarklets.html:26 msgid "Jumps to the admin page for pages that represent a single object." -msgstr "Vai para a página de administração para páginas que representam um objeto único." +msgstr "" +"Vai para a página de administração para páginas que representam um objeto " +"único." #: contrib/admin/templates/admin_doc/bookmarklets.html:28 msgid "Edit this object (new window)" @@ -969,16 +1070,24 @@ msgid "redirect from" msgstr "redirecionar de" #: contrib/redirects/models/redirects.py:8 -msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'." -msgstr "Deve conter um caminho absoluto, excluindo o nome de domínio. Exemplo: '/eventos/busca/'." +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Deve conter um caminho absoluto, excluindo o nome de domínio. Exemplo: '/" +"eventos/busca/'." #: contrib/redirects/models/redirects.py:9 msgid "redirect to" msgstr "redirecionar para" #: contrib/redirects/models/redirects.py:10 -msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'." -msgstr "Deve conter um caminho absoluto (como acima) ou uma URL completa, começando com 'http://'." +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Deve conter um caminho absoluto (como acima) ou uma URL completa, começando " +"com 'http://'." #: contrib/redirects/models/redirects.py:12 msgid "redirect" @@ -989,7 +1098,8 @@ msgid "redirects" msgstr "redirecionamentos" #: 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 "Exemplo: '/sobre/contato/'. Lembre-se das barras no começo e no final." #: contrib/flatpages/models/flatpages.py:8 @@ -1009,8 +1119,12 @@ msgid "template name" msgstr "nome do modelo" #: contrib/flatpages/models/flatpages.py:12 -msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'." -msgstr "Exemplo: 'flatfiles/contact_page'. Se não for informado, será utilizado 'flatfiles/default'." +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Exemplo: 'flatfiles/contact_page'. Se não for informado, será utilizado " +"'flatfiles/default'." #: contrib/flatpages/models/flatpages.py:13 msgid "registration required" @@ -1076,28 +1190,23 @@ msgstr "Janeiro" msgid "February" msgstr "Fevereiro" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "March" msgstr "Março" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "April" msgstr "Abril" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "May" msgstr "Maio" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "June" msgstr "Junho" -#: utils/dates.py:15 -#: utils/dates.py:27 +#: utils/dates.py:15 utils/dates.py:27 msgid "July" msgstr "Julho" @@ -1150,24 +1259,39 @@ msgid "Dec." msgstr "Dez." #: utils/timesince.py:12 +#, fuzzy msgid "year" -msgstr "ano" +msgid_plural "years" +msgstr[0] "ano" +msgstr[1] "ano" #: utils/timesince.py:13 +#, fuzzy msgid "month" -msgstr "mês" +msgid_plural "months" +msgstr[0] "mês" +msgstr[1] "mês" #: utils/timesince.py:14 +#, fuzzy msgid "day" -msgstr "dia" +msgid_plural "days" +msgstr[0] "dia" +msgstr[1] "dia" #: utils/timesince.py:15 +#, fuzzy msgid "hour" -msgstr "hora" +msgid_plural "hours" +msgstr[0] "hora" +msgstr[1] "hora" #: utils/timesince.py:16 +#, fuzzy msgid "minute" -msgstr "minuto" +msgid_plural "minutes" +msgstr[0] "minuto" +msgstr[1] "minuto" #: models/core.py:7 msgid "domain name" @@ -1189,10 +1313,7 @@ msgstr "sites" msgid "label" msgstr "etiqueta" -#: 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 "nome" @@ -1244,8 +1365,7 @@ msgstr "nome código" msgid "Permission" msgstr "Permissão" -#: models/auth.py:11 -#: models/auth.py:58 +#: models/auth.py:11 models/auth.py:58 msgid "Permissions" msgstr "Permissões" @@ -1253,8 +1373,7 @@ msgstr "Permissões" msgid "Group" msgstr "Grupo" -#: models/auth.py:23 -#: models/auth.py:60 +#: models/auth.py:23 models/auth.py:60 msgid "Groups" msgstr "Grupos" @@ -1307,8 +1426,12 @@ msgid "date joined" msgstr "data de registro" #: 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 "Em adição às permissões atribuídas manualmente, este usuário também terá todas as permissões dadas a cada grupo que participar." +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "" +"Em adição às permissões atribuídas manualmente, este usuário também terá " +"todas as permissões dadas a cada grupo que participar." #: models/auth.py:48 msgid "Users" @@ -1411,32 +1534,27 @@ msgstr "Sueco" msgid "Simplified Chinese" msgstr "Chinês Simplificado" -#: core/formfields.py:59 -#: core/meta/fields.py:285 -#: core/meta/fields.py:488 #: conf/global_settings.py:58 msgid "Traditional Chinese" msgstr "Chinês Tradicional" -#: 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 "Este campo é requerido." #: core/formfields.py:338 -#, python-format +#, fuzzy, python-format msgid "Ensure your text is less than %s character." -msgstr "Certifique-se de que seu texto tenha menos que %s caracteres." +msgid_plural "Ensure your text is less than %s characters." +msgstr[0] "Certifique-se de que seu texto tenha menos que %s caracteres." +msgstr[1] "Certifique-se de que seu texto tenha menos que %s caracteres." #: core/formfields.py:343 msgid "Line breaks are not allowed here." msgstr "Não são permitidas múltiplas linhas aqui." -#: 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 "Selecione uma escolha válida; '%(data)s' não está em %(choices)s." @@ -1522,8 +1640,12 @@ msgid "Enter a valid e-mail address." msgstr "Informe um endereço de email válido." #: core/validators.py:150 -msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image." -msgstr "Envie uma imagem válida. O arquivo enviado não é uma imagem ou está corrompido." +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"Envie uma imagem válida. O arquivo enviado não é uma imagem ou está " +"corrompido." #: core/validators.py:157 #, python-format @@ -1533,7 +1655,8 @@ msgstr "A URL %s não aponta para um imagem válida." #: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." -msgstr "Números de telefone deves estar no formato XXX-XXX-XXXX.\"%s\" é inválido." +msgstr "" +"Números de telefone deves estar no formato XXX-XXX-XXXX.\"%s\" é inválido." #: core/validators.py:169 #, python-format @@ -1563,8 +1686,7 @@ msgstr "XML mal formado: %s" msgid "Invalid URL: %s" msgstr "URL inválida: %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 "A URL %s é um link quebrado." @@ -1574,9 +1696,11 @@ msgid "Enter a valid U.S. state abbreviation." msgstr "Informe uma abreviação válida de nome de um estado dos EUA." #: core/validators.py:231 -#, python-format +#, fuzzy, python-format msgid "Watch your mouth! The word %s is not allowed here." -msgstr "Lave sua boca! A palavra %s não é permitida aqui." +msgid_plural "Watch your mouth! The words %s are not allowed here." +msgstr[0] "Lave sua boca! A palavra %s não é permitida aqui." +msgstr[1] "Lave sua boca! A palavra %s não é permitida aqui." #: core/validators.py:238 #, python-format @@ -1587,8 +1711,7 @@ msgstr "Este campo deve ser igual ao campo '%s'." msgid "Please enter something for at least one field." msgstr "Informe algo em pelo menos um campo." -#: 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 "Informe ambos os campos ou deixe ambos vazios." @@ -1616,14 +1739,20 @@ msgid "Please enter a valid decimal number." msgstr "Informe um número decimal." #: core/validators.py:351 -#, python-format +#, fuzzy, python-format msgid "Please enter a valid decimal number with at most %s total digit." -msgstr "Por favor entre com um número decimal com no máximo %s digitos." +msgid_plural "" +"Please enter a valid decimal number with at most %s total digits." +msgstr[0] "Por favor entre com um número decimal com no máximo %s digitos." +msgstr[1] "Por favor entre com um número decimal com no máximo %s digitos." #: core/validators.py:354 -#, python-format +#, fuzzy, python-format msgid "Please enter a valid decimal number with at most %s decimal place." -msgstr "Informe um número decimal com no máximo %s casa decimal." +msgid_plural "" +"Please enter a valid decimal number with at most %s decimal places." +msgstr[0] "Informe um número decimal com no máximo %s casa decimal." +msgstr[1] "Informe um número decimal com no máximo %s casa decimal." #: core/validators.py:364 #, python-format @@ -1650,40 +1779,67 @@ msgstr "Não foi possível receber dados de %s." #: core/validators.py:431 #, python-format -msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." -msgstr "A URL %(url)s retornou um cabeçalho '%(contenttype)s' de Content-Type inválido." +msgid "" +"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." +msgstr "" +"A URL %(url)s retornou um cabeçalho '%(contenttype)s' de Content-Type " +"inválido." #: core/validators.py:464 #, python-format -msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)" -msgstr "Por favor, feche a tag %(tag)s na linha %(line)s. (A linha começa com \"%(start)s\".)" +msgid "" +"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " +"\"%(start)s\".)" +msgstr "" +"Por favor, feche a tag %(tag)s na linha %(line)s. (A linha começa com \"%" +"(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 "Algum texto começando na linha %(line)s não é permitido no contexto. (Linha começa com \"%(start)s\".)" +msgid "" +"Some text starting on line %(line)s is not allowed in that context. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Algum texto começando na linha %(line)s não é permitido no contexto. (Linha " +"começa com \"%(start)s\".)" #: core/validators.py:473 #, python-format -msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)" -msgstr "\"%(attr)s\" na linha %(line)s não é um atributo válido. (Linha começa com \"%(start)s\".)" +msgid "" +"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"\"%(attr)s\" na linha %(line)s não é um atributo válido. (Linha começa com " +"\"%(start)s\".)" #: core/validators.py:478 #, python-format -msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)" -msgstr "\"<%(tag)s>\" na linha %(line)s é uma tag inválida. (Linha começa com \"%(start)s\".)" +msgid "" +"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"\"<%(tag)s>\" na linha %(line)s é uma tag inválida. (Linha começa com \"%" +"(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 "Uma tag na linha %(line)s está não apresenta um ou mais atributos exigidos.(Linha começa com \"%(start)s\".)" +msgid "" +"A tag on line %(line)s is missing one or more required attributes. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Uma tag na linha %(line)s está não apresenta um ou mais atributos exigidos." +"(Linha começa com \"%(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 "O atributo \"%(attr)s\" na linha %(line)s tem um valor inválido. (Linha começa com \"%(start)s\".)" +msgid "" +"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"O atributo \"%(attr)s\" na linha %(line)s tem um valor inválido. (Linha " +"começa com \"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "%(object)s com este %(type)s já existe para o %(field)s dado." @@ -1703,25 +1859,54 @@ msgid " Separate multiple IDs with commas." msgstr " Separe IDs múltiplos com vírgulas." #: core/meta/fields.py:132 -msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr " Mantenha pressionado \"Control\", ou \"Command\" num Mac para selecionar mais de uma opção." +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" +" Mantenha pressionado \"Control\", ou \"Command\" num Mac para selecionar " +"mais de uma opção." #: core/meta/fields.py:508 msgid "Enter a valid filename." msgstr "Informe um nome de arquivo válido." #: core/meta/fields.py:782 -#, python-format +#, fuzzy, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." -msgstr "Por favor, entre IDs válidos para %(self)s. O valor %(value)r é inválido." +msgid_plural "" +"Please enter valid %(self)s IDs. The values %(value)r are invalid." +msgstr[0] "" +"Por favor, entre IDs válidos para %(self)s. O valor %(value)r é inválido." +msgstr[1] "" +"Por favor, entre IDs válidos para %(self)s. O valor %(value)r é inválido." #: core/template/defaultfilters.py:379 msgid "yes,no,maybe" msgstr "sim,não,talvez" #: parts/auth/formfields.py:27 -msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in." -msgstr "Seu navegador Web não parece estar com os cookies habilitados. Cookies são requeridos para acesssar." +msgid "" +"Your Web browser doesn't appear to have cookies enabled. Cookies are " +"required for logging in." +msgstr "" +"Seu navegador Web não parece estar com os cookies habilitados. Cookies são " +"requeridos para acesssar." + +#~ msgid "" +#~ "This comment was posted by a user who has posted fewer than %(count)s " +#~ "comment:\n" +#~ "\n" +#~ "%(text)sThis comment was posted by a user who has posted fewer than %" +#~ "(count)s comments:\n" +#~ "\n" +#~ "%(text)s" +#~ msgstr "" +#~ "Este comentário foi envidao por um usuário que enviou menos de %(count)s " +#~ "comentário:\n" +#~ "\n" +#~ "%(text)sEste comentário foi enviado por um usuário que enviou menos de %" +#~ "(count)s comentários:\n" +#~ "\n" +#~ "%(text)s" #, fuzzy #~ msgid "count" diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo Binary files differindex f2459c8fcb..e24d7370c2 100644 --- a/django/conf/locale/ro/LC_MESSAGES/django.mo +++ b/django/conf/locale/ro/LC_MESSAGES/django.mo diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po index 913e2fdf62..dda7df497c 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: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: 2005-11-08 19:06+GMT+2\n" "Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n" "Language-Team: Romanian <ro@li.org>\n" @@ -278,6 +278,77 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Utilizator:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Parola:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Schimbă-mi parola" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Deautentificare" + +#: contrib/comments/templates/comments/form.html:12 +msgid "Ratings" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "permite comentarii" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "permite comentarii" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "nume utilizator" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -352,7 +423,7 @@ msgstr "intrare log" msgid "log entries" msgstr "intrări log" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "" @@ -368,23 +439,23 @@ msgstr "" msgid "Log in" msgstr "Login" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 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 +#: contrib/admin/views/decorators.py:68 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:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "" -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -463,26 +534,26 @@ msgstr "" msgid "Change %s" msgstr "Schimbă" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, fuzzy, python-format msgid "Change history: %s" msgstr "Schimbă parola" @@ -572,6 +643,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "" @@ -581,6 +653,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: 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 @@ -594,28 +667,10 @@ msgstr "" msgid "Change password" msgstr "Schimbă parola" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Deautentificare" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -722,14 +777,6 @@ msgstr "Indisponibil" msgid "Add %(name)s" msgstr "Adaugă" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Utilizator:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Parola:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Ai <a href=\"/password_reset/\">uitat parola</a>?" @@ -1782,7 +1829,7 @@ msgstr "" "Atributul \"%(attr)s\" din linia %(line)s are o valoare invalidă. ( Linia " "începe cu \"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo Binary files differindex 3f59887de8..65b6b4477e 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.mo +++ b/django/conf/locale/ru/LC_MESSAGES/django.mo diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index 47133d6bba..270c27dabf 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: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:25+0100\n" "PO-Revision-Date: 2005-11-26 00:00\n" "Last-Translator: Dmitry Sorokin <ds@dial.com.ru>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -270,6 +270,78 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr ":" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr ":" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr " " + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr " #1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr " " + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr " " + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -342,7 +414,7 @@ msgstr " " msgid "log entries" msgstr " " -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr " " @@ -358,7 +430,7 @@ msgstr "" msgid "Log in" msgstr "" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." @@ -366,7 +438,7 @@ msgstr "" " , . :" " ." -#: contrib/admin/views/decorators.py:64 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -374,11 +446,11 @@ msgstr "" ", cookies. " "cookie, . " -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr " '@'." -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" @@ -456,26 +528,26 @@ msgstr "" msgid "Change %s" msgstr " %s" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr " %(fieldname)s %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr " %(fieldname)s %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" ." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr " ?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr " : %s" @@ -560,6 +632,7 @@ msgstr "XML " #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "" @@ -569,6 +642,7 @@ msgstr "" #: 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/registration/password_change_form.html:3 #: 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 @@ -582,28 +656,10 @@ msgstr "" msgid "Change password" 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:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -710,14 +766,6 @@ msgstr "" msgid "Add %(name)s" msgstr " %(name)s" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr ":" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr ":" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr " <a href=\"/password_reset/\"> </a>?" @@ -1744,7 +1792,7 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "" diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo Binary files differindex 157307f7e6..9b9f560786 100644 --- a/django/conf/locale/sk/LC_MESSAGES/django.mo +++ b/django/conf/locale/sk/LC_MESSAGES/django.mo diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po index 21f4a26f22..df5a487e1d 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: 2006-01-12 23:12+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: 2005-11-10 23:22-0500\n" "Last-Translator: Vladimir Labath <vlado@labath.org>\n" "Language-Team: Slovak <sk@li.org>\n" @@ -286,6 +286,78 @@ 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/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Meno:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Heslo:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Zmena môjho hesla" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Odhlásenie" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr "hodnotenie #1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "Komentár" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "Voľný komentár" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "užívateľské meno" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -360,7 +432,7 @@ msgstr "záznam priebehu" msgid "log entries" msgstr "záznamy priebehu" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "Všetky dátumy" @@ -370,15 +442,15 @@ msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -"Prosím, vložte spávne meno užvateľa ako aj heslo. Pripomínam, že obe polia" -"rozlišujú malé a veľké písmena" +"Prosím, vložte spávne meno užvateľa ako aj heslo. Pripomínam, že obe " +"poliarozlišujú malé a veľké písmena" #: contrib/admin/views/decorators.py:23 #: contrib/admin/templates/admin/login.html:24 msgid "Log in" msgstr "Prihlásenie" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." @@ -386,7 +458,7 @@ msgstr "" "Prosím prihlaste sa znovu, lebo čas vášho sedenia vypršal. Nemajte obavy: " "Vaše údaje su uchované." -#: contrib/admin/views/decorators.py:64 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -394,11 +466,11 @@ msgstr "" "Vyzerá, že váš prehliadač nemá povolené cookies. Prosím povoľte cookies, " "znovu načítajte túto stránku a skúste činnosť znovu." -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "Meno užívateľa nemože obsahovať znak '@' ." -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Vaša e-mailova adresa nie je vaše užívateľské meno. Skúste '%s'." @@ -478,26 +550,26 @@ msgstr "" msgid "Change %s" msgstr "Zmeň %s" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Jeden alebo viac %(fieldname)s v %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Jeden alebo viac %(fieldname)s v %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne vymazaný." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "Ste si istý?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "Zmena histórie:" @@ -582,6 +654,7 @@ msgstr "XML text" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentácia" @@ -591,6 +664,7 @@ msgstr "Dokumentácia" #: 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/registration/password_change_form.html:3 #: 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 @@ -604,28 +678,10 @@ msgstr "Dokumentácia" msgid "Change password" msgstr "Zmena hesla" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Odhlásenie" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -732,14 +788,6 @@ msgstr "Nepovolené" msgid "Add %(name)s" msgstr "Pridaj %(name)s" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Meno:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Heslo:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Zabudli ste<a href=\"/password_reset/\"> vaše heslo</a>?" @@ -1791,7 +1839,7 @@ msgstr "" "Atribút \"%(attr)s\" na riadku %(line)s má neplatnú hodnotu. (Riadok začína " "s \"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "%(object)s s %(type)s už existuje pre prvok %(field)s." diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo Binary files differindex afb105aeee..e5bc4d0f2d 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.mo +++ b/django/conf/locale/sr/LC_MESSAGES/django.mo diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index ca89cefc80..dac807af61 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -2,14 +2,16 @@ msgid "" msgstr "" "Project-Id-Version: Django Serbian (latin) translation v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:25+0100\n" "PO-Revision-Date: 2006-01-15 11:21+0100\n" "Last-Translator: Nebojša Đorđević <nesh@studioquattro.co.yu>\n" -"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail.com>\n" +"Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail." +"com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Poedit-Language: Serbian\n" "X-Poedit-Country: YUGOSLAVIA\n" "X-Poedit-SourceCharset: utf-8\n" @@ -75,8 +77,7 @@ msgstr "datum/vreme slanja" msgid "is public" msgstr "da li je javni" -#: contrib/comments/models/comments.py:26 -#: contrib/admin/views/doc.py:256 +#: contrib/comments/models/comments.py:26 contrib/admin/views/doc.py:256 msgid "IP address" msgstr "IP adresa" @@ -85,8 +86,12 @@ msgid "is removed" msgstr "obrisan je" #: contrib/comments/models/comments.py:27 -msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead." -msgstr "Selektujte ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je obrisan\" umesto teksta komentara." +msgid "" +"Check this box if the comment is inappropriate. A \"This comment has been " +"removed\" message will be displayed instead." +msgstr "" +"Selektujte ako je komentar neodgovarajući. Biće ispisano \"Ovaj komentar je " +"obrisan\" umesto teksta komentara." #: contrib/comments/models/comments.py:31 msgid "Comment" @@ -216,29 +221,35 @@ msgstr "Ne možete da glasate sami za sebe" # nesh: grrrrr, ala je rogobatno #: contrib/comments/views/comments.py:25 -msgid "This rating is required because you've entered at least one other rating." +msgid "" +"This rating is required because you've entered at least one other rating." msgstr "Ovaj rejting je obavezan pošto ste uneli još najmanje jedan rejting." #: contrib/comments/views/comments.py:109 #, python-format msgid "" -"This comment was posted by a user who has posted fewer than %(count)s comment:\n" +"This comment was posted by a user who has posted fewer than %(count)s " +"comment:\n" "\n" "%(text)s" msgid_plural "" -"This comment was posted by a user who has posted fewer than %(count)s comments:\n" +"This comment was posted by a user who has posted fewer than %(count)s " +"comments:\n" "\n" "%(text)s" msgstr[0] "" -"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n" +"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s " +"komentara:\n" "\n" "%(text)s" msgstr[1] "" -"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n" +"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s " +"komentara:\n" "\n" "%(text)s" msgstr[2] "" -"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s komentara:\n" +"Ovaj komentar je poslat od korisnika koji je poslao manje od %(count)s " +"komentara:\n" "\n" "%(text)s" @@ -271,14 +282,89 @@ msgstr "Neko je menjao form za komentare (povreda sigurnosti)" #: contrib/comments/views/comments.py:204 #: contrib/comments/views/comments.py:289 -msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid" -msgstr "Form komentara ima neispravni 'target' parametar -- ID objekta nije ispravan" +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" +"Form komentara ima neispravni 'target' parametar -- ID objekta nije ispravan" #: contrib/comments/views/comments.py:254 #: contrib/comments/views/comments.py:318 msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "Ovaj komentar nije koristio 'preview' ili 'post'" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Korisničko ime:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Lozinka:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Izmeni moju lozinku" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Odjavi se" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr "rejting #1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "Komentar" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "Slobodan komentar" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "korisničko ime" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -288,8 +374,7 @@ msgstr "" "<h3>Od %s:</h3>\n" "<ul>\n" -#: contrib/admin/filterspecs.py:70 -#: contrib/admin/filterspecs.py:88 +#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88 #: contrib/admin/filterspecs.py:143 msgid "All" msgstr "Sve" @@ -354,34 +439,45 @@ msgstr "unos u dnevnik izmena" msgid "log entries" msgstr "unosi u dnevnik izmena" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "Svi datumi" -#: 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." -msgstr "Unesite ispravno korisničko ime i šifru. Napomena: oba polja prave razliku između velikih i malih slova." +msgid "" +"Please enter a correct username and password. Note that both fields are case-" +"sensitive." +msgstr "" +"Unesite ispravno korisničko ime i šifru. Napomena: oba polja prave razliku " +"između velikih i malih slova." #: contrib/admin/views/decorators.py:23 #: contrib/admin/templates/admin/login.html:24 msgid "Log in" msgstr "Prijavi se" -#: 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 "Ponovo se prijavite pošto je vaša sesija istekla. Ne brinite, vaši podaci su sačuvani." +#: contrib/admin/views/decorators.py:61 +msgid "" +"Please log in again, because your session has expired. Don't worry: Your " +"submission has been saved." +msgstr "" +"Ponovo se prijavite pošto je vaša sesija istekla. Ne brinite, vaši podaci su " +"sačuvani." -#: contrib/admin/views/decorators.py:64 -msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again." -msgstr "Izgleda da vaš browser ne podržava \"cookie\". Uključite ih, ponovo učitajte stranu i pokušajte ponovo." +#: contrib/admin/views/decorators.py:68 +msgid "" +"Looks like your browser isn't configured to accept cookies. Please enable " +"cookies, reload this page, and try again." +msgstr "" +"Izgleda da vaš browser ne podržava \"cookie\". Uključite ih, ponovo učitajte " +"stranu i pokušajte ponovo." -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "Korisnička imena ne mogu sadržati karakter '@'." -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Vaša e-mail adresa nije koriničko ime. Probajte sa '%s'." @@ -405,13 +501,11 @@ msgstr "Izaberi %s za izmenu" msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Uspešno dodat %(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 "Ispod ga možete ponovo izmeniti." -#: 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 "Ispod možete dodati još jedan %s." @@ -426,8 +520,7 @@ msgstr "Dodaj %s" msgid "Added %s." msgstr "Dodat %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 "i" @@ -453,7 +546,8 @@ msgstr "Uspešno izmenjen: %(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\" je uspešno dodat. Ispod ga možete ponovo menjati." #: contrib/admin/views/main.py:536 @@ -461,36 +555,33 @@ msgstr "%(name)s \"%(obj)s\" je uspešno dodat. Ispod ga možete ponovo menjati. msgid "Change %s" msgstr "Izmeni %s" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Jedno ili više %(fieldname)s u %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Jedan ili više %(fieldname)s u %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "Uspešno obrisan: %(name)s \"%(obj)s\"." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "Da li ste sigurni?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "Istorija izmena: %s" -#: contrib/admin/views/doc.py:244 -#: contrib/admin/views/doc.py:253 -#: contrib/admin/views/doc.py:255 -#: contrib/admin/views/doc.py:261 -#: contrib/admin/views/doc.py:262 -#: contrib/admin/views/doc.py:264 +#: contrib/admin/views/doc.py:244 contrib/admin/views/doc.py:253 +#: contrib/admin/views/doc.py:255 contrib/admin/views/doc.py:261 +#: contrib/admin/views/doc.py:262 contrib/admin/views/doc.py:264 msgid "Integer" msgstr "Ceo broj" @@ -519,8 +610,7 @@ msgstr "Datum (sa vremenom)" msgid "E-mail address" msgstr "E-mail adresa" -#: contrib/admin/views/doc.py:251 -#: contrib/admin/views/doc.py:254 +#: contrib/admin/views/doc.py:251 contrib/admin/views/doc.py:254 msgid "File path" msgstr "Putanja do fajla" @@ -554,8 +644,7 @@ msgstr "Vreme" # nesh: ovo se valjda ne prevodi # petar: ne prevodi se -#: contrib/admin/views/doc.py:267 -#: contrib/flatpages/models/flatpages.py:6 +#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 msgid "URL" msgstr "URL" @@ -572,6 +661,7 @@ msgstr "XML tekst" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentacija" @@ -581,6 +671,7 @@ msgstr "Dokumentacija" #: 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/registration/password_change_form.html:3 #: 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 @@ -594,28 +685,10 @@ msgstr "Dokumentacija" msgid "Change password" msgstr "Izmeni lozinku" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Odjavi se" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -635,8 +708,7 @@ msgstr "Istorija" msgid "Date/time" msgstr "Datum/vreme" -#: contrib/admin/templates/admin/object_history.html:19 -#: models/auth.py:47 +#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47 msgid "User" msgstr "Korisnik" @@ -649,8 +721,12 @@ msgid "DATE_WITH_TIME_FULL" msgstr "j. N Y, H:i" #: contrib/admin/templates/admin/object_history.html:36 -msgid "This object doesn't have a change history. It probably wasn't added via this admin site." -msgstr "Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem administracije sajta." +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" +"Ovaj objekat nema istoriju promena. Najverovatnije nije dodat korišćenjem " +"administracije sajta." #: contrib/admin/templates/admin/base_site.html:4 msgid "Django site admin" @@ -673,8 +749,12 @@ msgid "Server Error <em>(500)</em>" msgstr "Greška na serveru <em>(500)</em>" #: contrib/admin/templates/admin/500.html:10 -msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." -msgstr "Dogodila se greška koja je prijavljena administratorima i biće popravljena uskoro. Hvala Vam na strpljenju." +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"Dogodila se greška koja je prijavljena administratorima i biće popravljena " +"uskoro. Hvala Vam na strpljenju." #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 @@ -715,14 +795,6 @@ msgstr "Nema dostupnih" msgid "Add %(name)s" msgstr "Dodaj %(name)s" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Korisničko ime:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Lozinka:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Da li ste <a href=\"/password_reset/\">zaboravili Vašu lozinku?</a>?" @@ -733,13 +805,22 @@ msgstr "Dobrodošli," #: contrib/admin/templates/admin/delete_confirmation.html:6 #, python-format -msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:" -msgstr "Brisanjem %(object_name)s '%(object)s' došlo bi do brisanja dodatnih podataka, ali nemate prava da brišete sledeće tipove podataka:" +msgid "" +"Deleting the %(object_name)s '%(object)s' would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"Brisanjem %(object_name)s '%(object)s' došlo bi do brisanja dodatnih " +"podataka, ali nemate prava da brišete sledeće tipove podataka:" #: contrib/admin/templates/admin/delete_confirmation.html:13 #, python-format -msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:" -msgstr "Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće obrisani i sledeći pridruženi objekti:" +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće " +"obrisani i sledeći pridruženi objekti:" #: contrib/admin/templates/admin/delete_confirmation.html:17 msgid "Yes, I'm sure" @@ -817,8 +898,12 @@ msgid "Password reset" msgstr "Resetovanje lozinke" #: contrib/admin/templates/registration/password_reset_form.html:12 -msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you." -msgstr "Zaboravili ste svoju lozinku? Unesite vašu e-mail adresu i dobićete novu lozinku na dati e-mail." +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll reset " +"your password and e-mail the new one to you." +msgstr "" +"Zaboravili ste svoju lozinku? Unesite vašu e-mail adresu i dobićete novu " +"lozinku na dati e-mail." #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" @@ -842,12 +927,20 @@ msgid "Password reset successful" msgstr "Vaša lozinka je uspešno resetovana" #: contrib/admin/templates/registration/password_reset_done.html:12 -msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly." -msgstr "Nova lozinka poslata vam je na zadatu e-mail adresu. E-mail bi trebao da stigne u narednih nekoliko minuta." +msgid "" +"We've e-mailed a new password to the e-mail address you submitted. You " +"should be receiving it shortly." +msgstr "" +"Nova lozinka poslata vam je na zadatu e-mail adresu. E-mail bi trebao da " +"stigne u narednih nekoliko minuta." #: contrib/admin/templates/registration/password_change_form.html:12 -msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." -msgstr "Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi provere ispravnosti unosa." +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" +"Unesite staru lozinku, nakon toga unesite novu lozinku dva puta, radi " +"provere ispravnosti unosa." #: contrib/admin/templates/registration/password_change_form.html:17 msgid "Old password:" @@ -915,23 +1008,36 @@ msgid "" "your computer is \"internal\").</p>\n" msgstr "" "\n" -"<p class=\"help\">Da bi ste instalirali \"bookmarklet\", odvučite link u vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup nekima od strana mora biti sa kompjutera čija je IP adresa označena kao \"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je vaš IP označen kao \"internal\").</p>\n" +"<p class=\"help\">Da bi ste instalirali \"bookmarklet\", odvučite link u " +"vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete " +"da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup " +"nekima od strana mora biti sa kompjutera čija je IP adresa označena kao " +"\"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je " +"vaš IP označen kao \"internal\").</p>\n" #: contrib/admin/templates/admin_doc/bookmarklets.html:19 msgid "Documentation for this page" msgstr "Dokumentacija za ovu stranu" #: contrib/admin/templates/admin_doc/bookmarklets.html:20 -msgid "Jumps you from any page to the documentation for the view that generates that page." -msgstr "Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji generiše tu stranu." +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." +msgstr "" +"Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji " +"generiše tu stranu." #: contrib/admin/templates/admin_doc/bookmarklets.html:22 msgid "Show object ID" msgstr "Prikaži ID objekta" #: contrib/admin/templates/admin_doc/bookmarklets.html:23 -msgid "Shows the content-type and unique ID for pages that represent a single object." -msgstr "Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan objekt." +msgid "" +"Shows the content-type and unique ID for pages that represent a single " +"object." +msgstr "" +"Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan " +"objekt." #: contrib/admin/templates/admin_doc/bookmarklets.html:25 msgid "Edit this object (current window)" @@ -970,16 +1076,24 @@ msgid "redirect from" msgstr "redirekcija od" #: contrib/redirects/models/redirects.py:8 -msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'." -msgstr "Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/search/'." +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/" +"search/'." #: contrib/redirects/models/redirects.py:9 msgid "redirect to" msgstr "redirekcija na" #: contrib/redirects/models/redirects.py:10 -msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'." -msgstr "Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa 'http://'." +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Ovo može biti apsolutna putanja (kao gore) ili puni URL koji počinje sa " +"'http://'." #: contrib/redirects/models/redirects.py:12 msgid "redirect" @@ -990,8 +1104,11 @@ msgid "redirects" msgstr "redirekcije" #: contrib/flatpages/models/flatpages.py:7 -msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu crtu." +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Primer: '/about/contact/'. Proverite da li ste uneli početnu i kranju kosu " +"crtu." #: contrib/flatpages/models/flatpages.py:8 msgid "title" @@ -1010,8 +1127,12 @@ msgid "template name" msgstr "ime templejta" #: contrib/flatpages/models/flatpages.py:12 -msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'." -msgstr "Primer: 'flatpages/contact-page'. Ako nije dato sistem će koristiti flatpages/default'." +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Primer: 'flatpages/contact-page'. Ako nije dato sistem će koristiti " +"flatpages/default'." #: contrib/flatpages/models/flatpages.py:13 msgid "registration required" @@ -1019,7 +1140,9 @@ msgstr "samo za registrovane korisnike" #: contrib/flatpages/models/flatpages.py:13 msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj strani." +msgstr "" +"Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj " +"strani." #: contrib/flatpages/models/flatpages.py:17 msgid "flat page" @@ -1077,28 +1200,23 @@ msgstr "Januar" msgid "February" msgstr "Februar" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "March" msgstr "Mart" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "April" msgstr "April" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "May" msgstr "Maj" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "June" msgstr "Jun" -#: utils/dates.py:15 -#: utils/dates.py:27 +#: utils/dates.py:15 utils/dates.py:27 msgid "July" msgstr "Jul" @@ -1205,10 +1323,7 @@ msgstr "sajtovi" msgid "label" msgstr "labela" -#: models/core.py:29 -#: models/core.py:40 -#: models/auth.py:6 -#: models/auth.py:19 +#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19 msgid "name" msgstr "ime" @@ -1260,8 +1375,7 @@ msgstr "kodno ime" msgid "Permission" msgstr "Pravo" -#: models/auth.py:11 -#: models/auth.py:58 +#: models/auth.py:11 models/auth.py:58 msgid "Permissions" msgstr "Prava" @@ -1269,8 +1383,7 @@ msgstr "Prava" msgid "Group" msgstr "Grupa" -#: models/auth.py:23 -#: models/auth.py:60 +#: models/auth.py:23 models/auth.py:60 msgid "Groups" msgstr "Grupe" @@ -1323,8 +1436,11 @@ msgid "date joined" msgstr "datum otvaranja naloga" #: models/auth.py:44 -msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in." -msgstr "Uz ručno dodata prava, korisnik će dobiti sva prava iz grupa kojima pripada." +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "" +"Uz ručno dodata prava, korisnik će dobiti sva prava iz grupa kojima pripada." #: models/auth.py:48 msgid "Users" @@ -1430,9 +1546,7 @@ msgstr "Kineski (pojednostavljen)" msgid "Traditional Chinese" msgstr "Tradicionalni Kineski" -#: core/formfields.py:59 -#: core/meta/fields.py:285 -#: core/meta/fields.py:488 +#: core/formfields.py:59 core/meta/fields.py:285 core/meta/fields.py:488 #: core/meta/fields.py:499 msgid "This field is required." msgstr "Obavezno polje." @@ -1449,9 +1563,7 @@ msgstr[2] "Tekst mora imati manje od %s slova." msgid "Line breaks are not allowed here." msgstr "Novi redovi ovde nisu dozvoljeni." -#: core/formfields.py: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 "Izaberite validnu opciju: '%(data)s' nije u %(choices)s." @@ -1479,7 +1591,8 @@ msgstr "Ovo polje može sadržati samo slova, brojeve i donju crtu (_)." #: core/validators.py:66 msgid "This value must contain only letters, numbers, underscores and slashes." -msgstr "Ovo polje može sadržati samo slova, brojeve, donju crtu (_) i kose crte." +msgstr "" +"Ovo polje može sadržati samo slova, brojeve, donju crtu (_) i kose crte." #: core/validators.py:74 msgid "Uppercase letters are not allowed here." @@ -1538,8 +1651,12 @@ msgid "Enter a valid e-mail address." msgstr "Unesite ispravnu e-mail adresu." #: core/validators.py:150 -msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image." -msgstr "Pošaljite ispravnu sliku. Fajl koji ste poslali ili nije slika ili je sam fajl oštećen." +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"Pošaljite ispravnu sliku. Fajl koji ste poslali ili nije slika ili je sam " +"fajl oštećen." #: core/validators.py:157 #, python-format @@ -1550,7 +1667,8 @@ msgstr "URL %s ne pokazuje na ispravnu sliku" #: core/validators.py:161 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." -msgstr "Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan." +msgstr "" +"Telefonski brojevi moraju biti u formatu XXX-XXX-XXXX. \"%s\" je neispravan." #: core/validators.py:169 #, python-format @@ -1580,8 +1698,7 @@ msgstr "Neispravan XML: %s" msgid "Invalid URL: %s" msgstr "Neispravan URL: %s" -#: core/validators.py:208 -#: core/validators.py:210 +#: core/validators.py:208 core/validators.py:210 #, python-format msgid "The URL %s is a broken link." msgstr "URL %s je neispravan link." @@ -1608,8 +1725,7 @@ msgstr "Ovo polje mora biti jednako sa poljem '%s'." msgid "Please enter something for at least one field." msgstr "Morate popuniti barem jedno polje." -#: core/validators.py:266 -#: core/validators.py:277 +#: core/validators.py:266 core/validators.py:277 msgid "Please enter both fields or leave them both empty." msgstr "Popunite oba polja ili oba ostavite prazna." @@ -1639,7 +1755,8 @@ msgstr "Unesite ispravan decimalni broj." #: core/validators.py:351 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." -msgid_plural "Please enter a valid decimal number with at most %s total digits." +msgid_plural "" +"Please enter a valid decimal number with at most %s total digits." msgstr[0] "Unesite ispravan decimalni broj sa %s cifrom." msgstr[1] "Unesite ispravan decimalni broj sa %s cifre." msgstr[2] "Unesite ispravan decimalni broj sa %s cifara." @@ -1647,7 +1764,8 @@ msgstr[2] "Unesite ispravan decimalni broj sa %s cifara." #: core/validators.py:354 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." -msgid_plural "Please enter a valid decimal number with at most %s decimal places." +msgid_plural "" +"Please enter a valid decimal number with at most %s decimal places." msgstr[0] "Unesite decimalni broj sa najviše %s decimalnim mestom." msgstr[1] "Unesite decimalni broj sa najviše %s decimalna mesta." msgstr[2] "Unesite decimalni broj sa najviše %s decimalnih mesta." @@ -1677,40 +1795,65 @@ msgstr "Ništa nije moglo da se skine sa URL-a %s." #: core/validators.py:431 #, python-format -msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." -msgstr "Sa URL-a %(url)s se vratio pogrešan Content-Type header '%(contenttype)s'." +msgid "" +"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." +msgstr "" +"Sa URL-a %(url)s se vratio pogrešan Content-Type header '%(contenttype)s'." #: core/validators.py:464 #, python-format -msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)" -msgstr "Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%(start)s\".)" +msgid "" +"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " +"\"%(start)s\".)" +msgstr "" +"Zatvorite nezatvoren tag \"%(tag)s\" iz reda %(line)s. (Red počinje sa \"%" +"(start)s\".)" #: core/validators.py:468 #, python-format -msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)" -msgstr "Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red počinje sa \"%(start)s\".)" +msgid "" +"Some text starting on line %(line)s is not allowed in that context. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Tekst koji počinje u redu %(line)s nije dozvoljen u ovom kontekstu. (Red " +"počinje sa \"%(start)s\".)" #: core/validators.py:473 #, python-format -msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)" -msgstr "Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(start)s\".)" +msgid "" +"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"Atribut \"%(attr)s\" u red %(line)s je neispravan. (Red počinje sa \"%(start)" +"s\".)" #: core/validators.py:478 #, python-format -msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)" -msgstr "Tag \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(start)s\".)" +msgid "" +"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"Tag \"<%(tag)s>\" u redu %(line)s je neispravan. (Red počinje \"%(start)s\".)" #: core/validators.py:482 #, python-format -msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)" -msgstr "Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%(start)s\".)" +msgid "" +"A tag on line %(line)s is missing one or more required attributes. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Tag-u u redu %(line)s nedostaje jedan ili više atributa. (Red počinje sa \"%" +"(start)s\".)" #: core/validators.py:487 #, python-format -msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)" -msgstr "Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje sa \"%(start)s\".)" +msgid "" +"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Atribut \"%(attr)s\" u redu %(line)s ima neispravnu vrednost. (Red počinje " +"sa \"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "%(object)s sa ovim tipom %(type)s već postoji za polje %(field)s." @@ -1730,8 +1873,11 @@ msgid " Separate multiple IDs with commas." msgstr " Odvojite višestruke ID-ove zarezima." #: core/meta/fields.py:132 -msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr " Koristite \"Ctrl\" (PC) ili \"Jabuku\" (Mek) da bi ste selektovali više stavki." +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" +" Koristite \"Ctrl\" (PC) ili \"Jabuku\" (Mek) da bi ste selektovali više " +"stavki." #: core/meta/fields.py:508 msgid "Enter a valid filename." @@ -1740,7 +1886,8 @@ msgstr "Unesite ispravno ime fajla." #: 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] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna." msgstr[1] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna." msgstr[2] "Unesite validne %(self)s ID-ove. Vrednost %(value)r je neispravna." @@ -1750,11 +1897,16 @@ msgid "yes,no,maybe" msgstr "da,ne,možda" #: parts/auth/formfields.py:27 -msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in." -msgstr "Vaš web brovser nema omogućenje \"cookie\". \"cookie\" podrška je potrebna da bi ste mogli da se prijavite." +msgid "" +"Your Web browser doesn't appear to have cookies enabled. Cookies are " +"required for logging in." +msgstr "" +"Vaš web brovser nema omogućenje \"cookie\". \"cookie\" podrška je potrebna " +"da bi ste mogli da se prijavite." #~ msgid "Error in Template" #~ msgstr "Greška u templejtu" + #~ msgid "" #~ "\n" #~ "In template %(name)s, error at line %(line)s:\n" @@ -1765,4 +1917,3 @@ msgstr "Vaš web brovser nema omogućenje \"cookie\". \"cookie\" podrška je pot #, fuzzy #~ msgid "count" #~ msgstr "sadržaj" - diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo Binary files differindex 5afe00f360..c9ff905608 100644 --- a/django/conf/locale/sv/LC_MESSAGES/django.mo +++ b/django/conf/locale/sv/LC_MESSAGES/django.mo diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po index 4e41a95c60..24fa88631a 100644 --- a/django/conf/locale/sv/LC_MESSAGES/django.po +++ b/django/conf/locale/sv/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-01-12 23:12+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: 2005-12-04 16:20+0100\n" "Last-Translator: Robin Sonefors <ozamosi@blinkenlights.se>\n" "Language-Team: Django translators <djangoi18n@googlegroups.com>\n" @@ -288,6 +288,78 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "Kommenteringsformuläret skickade varken 'förhandsgranska' eller 'post'" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "Användarnamn:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "Lösenord:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "Ändra mitt lösenord" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "Logga ut" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr "betyg #1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "Kommentar" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "Fri kommentar" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "användarnamn" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -362,7 +434,7 @@ msgstr "loggpost" msgid "log entries" msgstr "loggposter" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "Alla datum" @@ -378,7 +450,7 @@ msgstr "" msgid "Log in" msgstr "Logga in" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." @@ -386,7 +458,7 @@ msgstr "" "Du måste logga in igen, eftersom din session har tagit slut. Oroa dig inte: " "ditt bidrag har sparats." -#: contrib/admin/views/decorators.py:64 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -394,11 +466,11 @@ msgstr "" "Det ser ut som om din webbläsare inte är konfigurerad att acceptera kakor. " "Aktivera kakor, ladda om den här sidan, och försök igen." -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "Användarnamn kan inte innehålla tecknet '@'." -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Din e-postadress är inte ditt användarnamn. Försök med '%s' istället." @@ -476,26 +548,26 @@ msgstr "%(name)set \"%(obj)s\" lades till. Du kan ändra det igen här under." msgid "Change %s" msgstr "Ändra %s" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "Ett eller flera %(fieldname)s i %(name)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "Ett eller flera %(fieldname)s i %(name)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)set \"%(obj)s\" togs bort." -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "Är du säker?" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "Ändra historien: %s" @@ -580,6 +652,7 @@ msgstr "XML-text" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentation" @@ -589,6 +662,7 @@ msgstr "Dokumentation" #: 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/registration/password_change_form.html:3 #: 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 @@ -602,28 +676,10 @@ msgstr "Dokumentation" msgid "Change password" msgstr "Ändra lösenord" -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:4 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Logga ut" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -730,14 +786,6 @@ msgstr "Inga tillgängliga" msgid "Add %(name)s" msgstr "Lägg till %(name)s" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Användarnamn:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Lösenord:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "Har du <a href=\"/password_reset/\">glömt ditt lösenord</a>?" @@ -1790,7 +1838,7 @@ msgstr "" "Attributet \"%(attr)s\" på rad %(line)s har ett ogiltigt värde. (Raden " "börjar med \"%(start)s\".)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, fuzzy, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "%(optname)s med det här %(fieldname)s finns redan." diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo Binary files differindex 39f33ecb41..551e6bcc59 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po index 9c4c2d2b7e..67bcbef22f 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: 2006-01-12 23:11+0100\n" +"POT-Creation-Date: 2006-02-02 11:25+0100\n" "PO-Revision-Date: 2006-01-05 13:46+0800\n" "Last-Translator: limodou <limodou@gmail.com>\n" "Language-Team: Simplified Chinese <limodou@gmail.com>\n" @@ -280,6 +280,78 @@ msgstr "评论表格有一个无效的 'target' 参数 -- 对象 ID 无效" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "评论表格无法提供 '预览' 或 '张贴' 功能" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "用户名：" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "口令：" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "修改我的口令" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "注销" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr "等级 #1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "评论" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "自由评论" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "用户名" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -354,7 +426,7 @@ msgstr "日志记录" msgid "log entries" msgstr "日志记录" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "全有日期" @@ -370,13 +442,13 @@ msgstr "请输入正确的用户名和口令。请注意两个域都是大小写 msgid "Log in" msgstr "登录" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 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 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -384,11 +456,11 @@ msgstr "" "看上去你的浏览器没有配置成接受 cookie 。请允许 cookie，重新装入本页面，再试一" "次。" -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "用户名不能包含 '@' 字符。" -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "你的邮箱地址不是你的用户名。换 '%s' 试试。" @@ -466,26 +538,26 @@ msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。 msgid "Change %s" msgstr "修改 %s" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "一个或多个 %(fieldname)s 在 %(name)s 中: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "一个或多个 %(fieldname)s 在 %(name)s 中:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" 删除成功。" -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "你确信吗？" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "修改历史： %s" @@ -570,6 +642,7 @@ msgstr "XML文本" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "文档" @@ -579,6 +652,7 @@ msgstr "文档" #: 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/registration/password_change_form.html:3 #: 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 @@ -592,28 +666,10 @@ msgstr "文档" msgid "Change password" 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:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "注销" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -718,14 +774,6 @@ msgstr "无可用的" msgid "Add %(name)s" msgstr "增加 %(name)s" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "用户名：" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "口令：" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "<a href=\"/password_reset/\">忘记你的密码</a>？" @@ -1736,7 +1784,7 @@ msgid "" msgstr "" "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "带有这个 %(type)s 的 %(object)s 对于给定的 %(field)s 已经存在了。" diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo Binary files differindex 0a2f071b63..5e2e3c0e23 100644 --- a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo +++ b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.po b/django/conf/locale/zh_TW/LC_MESSAGES/django.po index 8d07ac8a58..e6485e24f6 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: 2006-01-12 23:12+0100\n" +"POT-Creation-Date: 2006-02-02 11:26+0100\n" "PO-Revision-Date: 2005-12-28 23:30+0800\n" "Last-Translator: yungyuc <yyc@seety.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -280,6 +280,78 @@ msgstr "此評論表單有一個無效的 'target' 參數 -- 物件 ID 是無效 msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "此評論表單沒有提供 'preview' 或 'post'" +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +#: contrib/admin/templates/admin/login.html:15 +msgid "Username:" +msgstr "使用者名稱:" + +#: contrib/comments/templates/comments/form.html:6 +#: contrib/admin/templates/admin/login.html:18 +msgid "Password:" +msgstr "密碼:" + +#: contrib/comments/templates/comments/form.html:6 +#, fuzzy +msgid "Forgotten your password?" +msgstr "變更我的密碼" + +#: contrib/comments/templates/comments/form.html:8 +#: 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/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +msgid "Log out" +msgstr "登出" + +#: contrib/comments/templates/comments/form.html:12 +#, fuzzy +msgid "Ratings" +msgstr "等級 #1" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "" + +#: contrib/comments/templates/comments/form.html:27 +#: contrib/comments/templates/comments/freeform.html:5 +#, fuzzy +msgid "Comment:" +msgstr "評論" + +#: contrib/comments/templates/comments/form.html:32 +#: contrib/comments/templates/comments/freeform.html:9 +#, fuzzy +msgid "Preview comment" +msgstr "自由評論" + +#: contrib/comments/templates/comments/freeform.html:4 +#, fuzzy +msgid "Your name:" +msgstr "使用者名稱" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -354,7 +426,7 @@ msgstr "紀錄項目" msgid "log entries" msgstr "紀錄項目" -#: contrib/admin/templatetags/admin_list.py:245 +#: contrib/admin/templatetags/admin_list.py:241 msgid "All dates" msgstr "所有日期" @@ -370,13 +442,13 @@ msgstr "請輸入一個正確的使用者名稱與密碼。注意此二欄位都 msgid "Log in" msgstr "登入" -#: contrib/admin/views/decorators.py:57 +#: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." msgstr "請再登入一次，因為你的 session 已經到期。不必擔心: 你的提交已被儲存。" -#: contrib/admin/views/decorators.py:64 +#: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." @@ -384,11 +456,11 @@ msgstr "" "看起來你的瀏覽器沒有組態成允許 cookie。請啟用 cookie、重新載入此頁，然後再試" "一次。" -#: contrib/admin/views/decorators.py:78 +#: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." msgstr "使用者名稱不能包含 '@' 字元。" -#: contrib/admin/views/decorators.py:80 +#: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "你的電子郵件地址不是你的使用者名稱。試著改用 '%s'。" @@ -466,26 +538,26 @@ msgstr "%(name)s \"%(obj)s\" 已成功新增。你可以在下面再次編輯。 msgid "Change %s" msgstr "變更 %s" -#: contrib/admin/views/main.py:614 +#: contrib/admin/views/main.py:615 #, python-format msgid "One or more %(fieldname)s in %(name)s: %(obj)s" msgstr "在 %(name) 裡的一個或多個 %(fieldname)s: %(obj)s" -#: contrib/admin/views/main.py:619 +#: contrib/admin/views/main.py:620 #, python-format msgid "One or more %(fieldname)s in %(name)s:" msgstr "在 %(name)s 裡的一個或多個 %(fieldname)s:" -#: contrib/admin/views/main.py:648 +#: contrib/admin/views/main.py:649 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" 已成功刪除。" -#: contrib/admin/views/main.py:651 +#: contrib/admin/views/main.py:652 msgid "Are you sure?" msgstr "你確定？" -#: contrib/admin/views/main.py:666 +#: contrib/admin/views/main.py:667 #, python-format msgid "Change history: %s" msgstr "變更歷史: %s" @@ -570,6 +642,7 @@ msgstr "XML 文字" #: 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/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "文件" @@ -579,6 +652,7 @@ msgstr "文件" #: 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/registration/password_change_form.html:3 #: 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 @@ -592,28 +666,10 @@ msgstr "文件" msgid "Change password" 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:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "登出" - #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/base.html:28 #: 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 @@ -718,14 +774,6 @@ msgstr "沒有可用的" msgid "Add %(name)s" msgstr "新增 %(name)s" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "使用者名稱:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "密碼:" - #: contrib/admin/templates/admin/login.html:20 msgid "Have you <a href=\"/password_reset/\">forgotten your password</a>?" msgstr "你 <a href=\"/password_reset/\">忘記你的密碼了嗎</a>？" @@ -1742,7 +1790,7 @@ msgid "" msgstr "" "在第 %(line)s 的 \"%(attr)s\" 屬性有一個無效值 (行開始於 \"%(start)s\")。" -#: core/meta/__init__.py:1947 +#: core/meta/__init__.py:1944 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." msgstr "此 %(type)s 的 %(object)s 已存在於給定的 %(field)s 裡。" diff --git a/django/contrib/comments/templates/comments/form.html b/django/contrib/comments/templates/comments/form.html new file mode 100644 index 0000000000..deb5540c92 --- /dev/null +++ b/django/contrib/comments/templates/comments/form.html @@ -0,0 +1,34 @@ +{% load i18n %} +{% if display_form %} +<form {% if photos_optional or photos_required %}enctype="multipart/form-data" {% endif %}action="/comments/post/" method="post"> + +{% if user.is_anonymous %} +<p>{% trans "Username:" %} <input type="text" name="username" id="id_username" /><br />{% trans "Password:" %} <input type="password" name="password" id="id_password" /> (<a href="/accounts/password_reset/">{% trans "Forgotten your password?" %}</a>)</p> +{% else %} +<p>{% trans "Username:" %} <strong>{{ user.username }}</strong> (<a href="/accounts/logout/">{% trans "Log out" %}</a>)</p> +{% endif %} + +{% if ratings_optional or ratings_required %} +<p>{% trans "Ratings" %} ({% if ratings_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):</p> +<table> +<tr><th> </th>{% for value in rating_range %}<th>{{ value }}</th>{% endfor %}</tr> +{% for rating in rating_choices %} +<tr><th>{{ rating }}</th>{% for value in rating_range %}<th><input type="radio" name="rating{{ forloop.parentloop.counter }}" value="{{ value }}" /></th>{% endfor %}</tr> +{% endfor %} +</table> +<input type="hidden" name="rating_options" value="{{ rating_options }}" /> +{% endif %} + +{% if photos_optional or photos_required %} +<p>{% trans "Post a photo" %} ({% if photos_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}): <input type="file" name="photo" /></p> +<input type="hidden" name="photo_options" value="{{ photo_options }}" /> +{% endif %} + +<p>{% trans "Comment:" %}<br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p> + +<input type="hidden" name="options" value="{{ options }}" /> +<input type="hidden" name="target" value="{{ target }}" /> +<input type="hidden" name="gonzo" value="{{ hash }}" /> +<p><input type="submit" name="preview" value="{% trans "Preview comment" %}" /></p> +</form> +{% endif %} diff --git a/django/contrib/comments/templates/comments/freeform.html b/django/contrib/comments/templates/comments/freeform.html new file mode 100644 index 0000000000..0c52bfab29 --- /dev/null +++ b/django/contrib/comments/templates/comments/freeform.html @@ -0,0 +1,11 @@ +{% load i18n %} +{% if display_form %} +<form action="/comments/postfree/" method="post"> +<p>{% trans "Your name:" %} <input type="text" id="id_person_name" name="person_name" /></p> +<p>{% trans "Comment:" %}<br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p> +<input type="hidden" name="options" value="{{ options }}" /> +<input type="hidden" name="target" value="{{ target }}" /> +<input type="hidden" name="gonzo" value="{{ hash }}" /> +<p><input type="submit" name="preview" value="{% trans "Preview comment" %}" /></p> +</form> +{% endif %} diff --git a/django/contrib/comments/templatetags/comments.py b/django/contrib/comments/templatetags/comments.py index c2c4ab47d5..9c829bb761 100644 --- a/django/contrib/comments/templatetags/comments.py +++ b/django/contrib/comments/templatetags/comments.py @@ -1,6 +1,6 @@ "Custom template tags for user comments" -from django.core import template +from django.core import template, template_loader from django.core.exceptions import ObjectDoesNotExist from django.models.comments import comments, freecomments from django.models.core import contenttypes @@ -8,56 +8,8 @@ import re register = template.Library() -COMMENT_FORM = ''' -{% load i18n %} -{% if display_form %} -<form {% if photos_optional or photos_required %}enctype="multipart/form-data" {% endif %}action="/comments/post/" method="post"> - -{% if user.is_anonymous %} -<p>{% trans "Username:" %} <input type="text" name="username" id="id_username" /><br />{% trans "Password:" %} <input type="password" name="password" id="id_password" /> (<a href="/accounts/password_reset/">{% trans "Forgotten your password?" %}</a>)</p> -{% else %} -<p>{% trans "Username:" %} <strong>{{ user.username }}</strong> (<a href="/accounts/logout/">{% trans "Log out" %}</a>)</p> -{% endif %} - -{% if ratings_optional or ratings_required %} -<p>{% trans "Ratings" %} ({% if ratings_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):</p> -<table> -<tr><th> </th>{% for value in rating_range %}<th>{{ value }}</th>{% endfor %}</tr> -{% for rating in rating_choices %} -<tr><th>{{ rating }}</th>{% for value in rating_range %}<th><input type="radio" name="rating{{ forloop.parentloop.counter }}" value="{{ value }}" /></th>{% endfor %}</tr> -{% endfor %} -</table> -<input type="hidden" name="rating_options" value="{{ rating_options }}" /> -{% endif %} - -{% if photos_optional or photos_required %} -<p>{% trans "Post a photo" %} ({% if photos_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}): <input type="file" name="photo" /></p> -<input type="hidden" name="photo_options" value="{{ photo_options }}" /> -{% endif %} - -<p>{% trans "Comment:" %}<br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p> - -<input type="hidden" name="options" value="{{ options }}" /> -<input type="hidden" name="target" value="{{ target }}" /> -<input type="hidden" name="gonzo" value="{{ hash }}" /> -<p><input type="submit" name="preview" value="{% trans "Preview comment" %}" /></p> -</form> -{% endif %} -''' - -FREE_COMMENT_FORM = ''' -{% load i18n %} -{% if display_form %} -<form action="/comments/postfree/" method="post"> -<p>{% trans "Your name:" %} <input type="text" id="id_person_name" name="person_name" /></p> -<p>{% trans "Comment:" %}<br /><textarea name="comment" id="id_comment" rows="10" cols="60"></textarea></p> -<input type="hidden" name="options" value="{{ options }}" /> -<input type="hidden" name="target" value="{{ target }}" /> -<input type="hidden" name="gonzo" value="{{ hash }}" /> -<p><input type="submit" name="preview" value="{% trans "Preview comment" %}" /></p> -</form> -{% endif %} -''' +COMMENT_FORM = 'comments/form' +FREE_COMMENT_FORM = 'comments/freeform' class CommentFormNode(template.Node): def __init__(self, content_type, obj_id_lookup_var, obj_id, free, @@ -104,15 +56,15 @@ class CommentFormNode(template.Node): context['options'] = ','.join(options) if self.free: context['hash'] = comments.get_security_hash(context['options'], '', '', context['target']) - default_form = FREE_COMMENT_FORM + default_form = template_loader.get_template(FREE_COMMENT_FORM) else: context['photo_options'] = self.photo_options context['rating_options'] = normalize_newlines(base64.encodestring(self.rating_options).strip()) if self.rating_options: context['rating_range'], context['rating_choices'] = comments.get_rating_options(self.rating_options) context['hash'] = comments.get_security_hash(context['options'], context['photo_options'], context['rating_options'], context['target']) - default_form = COMMENT_FORM - output = template.Template(default_form).render(context) + default_form = template_loader.get_template(COMMENT_FORM) + output = default_form.render(context) context.pop() return output |