From 00752157e47eb57b23b078563cf5c5dad0541c11 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Sat, 4 Feb 2006 20:19:12 +0000 Subject: [PATCH] magic-removal: Merged to [2272] git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2273 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/global_settings.py | 4 + django/conf/locale/bn/LC_MESSAGES/django.mo | Bin 26898 -> 26898 bytes django/conf/locale/bn/LC_MESSAGES/django.po | 125 ++-- django/conf/locale/cs/LC_MESSAGES/django.mo | Bin 31597 -> 31597 bytes django/conf/locale/cs/LC_MESSAGES/django.po | 126 ++-- django/conf/locale/cy/LC_MESSAGES/django.mo | Bin 24115 -> 24115 bytes django/conf/locale/cy/LC_MESSAGES/django.po | 126 ++-- django/conf/locale/da/LC_MESSAGES/django.mo | Bin 16880 -> 16880 bytes django/conf/locale/da/LC_MESSAGES/django.po | 125 ++-- django/conf/locale/de/LC_MESSAGES/django.mo | Bin 31707 -> 32093 bytes django/conf/locale/de/LC_MESSAGES/django.po | 121 ++-- django/conf/locale/en/LC_MESSAGES/django.mo | Bin 536 -> 536 bytes django/conf/locale/en/LC_MESSAGES/django.po | 121 ++-- django/conf/locale/es/LC_MESSAGES/django.mo | Bin 30253 -> 30253 bytes django/conf/locale/es/LC_MESSAGES/django.po | 126 ++-- django/conf/locale/fr/LC_MESSAGES/django.mo | Bin 28145 -> 28145 bytes django/conf/locale/fr/LC_MESSAGES/django.po | 126 ++-- django/conf/locale/gl/LC_MESSAGES/django.mo | Bin 30067 -> 30067 bytes django/conf/locale/gl/LC_MESSAGES/django.po | 125 ++-- django/conf/locale/is/LC_MESSAGES/django.mo | Bin 17726 -> 17726 bytes django/conf/locale/is/LC_MESSAGES/django.po | 125 ++-- django/conf/locale/it/LC_MESSAGES/django.mo | Bin 16501 -> 16501 bytes django/conf/locale/it/LC_MESSAGES/django.po | 125 ++-- django/conf/locale/ja/LC_MESSAGES/django.mo | Bin 32628 -> 32628 bytes django/conf/locale/ja/LC_MESSAGES/django.po | 126 ++-- django/conf/locale/nl/LC_MESSAGES/django.mo | Bin 27934 -> 27934 bytes django/conf/locale/nl/LC_MESSAGES/django.po | 126 ++-- django/conf/locale/no/LC_MESSAGES/django.mo | Bin 24054 -> 24054 bytes django/conf/locale/no/LC_MESSAGES/django.po | 125 ++-- .../conf/locale/pt_BR/LC_MESSAGES/django.mo | Bin 30419 -> 29096 bytes .../conf/locale/pt_BR/LC_MESSAGES/django.po | 557 ++++++++++++------ django/conf/locale/ro/LC_MESSAGES/django.mo | Bin 17096 -> 17096 bytes django/conf/locale/ro/LC_MESSAGES/django.po | 125 ++-- django/conf/locale/ru/LC_MESSAGES/django.mo | Bin 22101 -> 22101 bytes django/conf/locale/ru/LC_MESSAGES/django.po | 126 ++-- django/conf/locale/sk/LC_MESSAGES/django.mo | Bin 31297 -> 31684 bytes django/conf/locale/sk/LC_MESSAGES/django.po | 415 +++++++------ django/conf/locale/sr/LC_MESSAGES/django.mo | Bin 30950 -> 30950 bytes django/conf/locale/sr/LC_MESSAGES/django.po | 483 +++++++++------ django/conf/locale/sv/LC_MESSAGES/django.mo | Bin 30439 -> 30439 bytes django/conf/locale/sv/LC_MESSAGES/django.po | 126 ++-- .../conf/locale/zh_CN/LC_MESSAGES/django.mo | Bin 29384 -> 29384 bytes .../conf/locale/zh_CN/LC_MESSAGES/django.po | 126 ++-- .../conf/locale/zh_TW/LC_MESSAGES/django.mo | Bin 29399 -> 29399 bytes .../conf/locale/zh_TW/LC_MESSAGES/django.po | 126 ++-- .../contrib/admin/media/js/admin/ordering.js | 4 +- .../comments/templates/comments/form.html | 34 ++ .../comments/templates/comments/freeform.html | 11 + .../contrib/comments/templatetags/comments.py | 59 +- django/core/handlers/modpython.py | 4 + django/core/handlers/wsgi.py | 4 + django/core/management.py | 41 +- django/db/backends/sqlite3/introspection.py | 2 +- docs/admin_css.txt | 21 +- docs/db-api.txt | 2 +- docs/django-admin.txt | 18 + docs/faq.txt | 7 +- docs/settings.txt | 11 + 58 files changed, 2691 insertions(+), 1363 deletions(-) create mode 100644 django/contrib/comments/templates/comments/form.html create mode 100644 django/contrib/comments/templates/comments/freeform.html diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index bce5937770..1e9006321c 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -187,6 +187,10 @@ DATETIME_FORMAT = 'N j, Y, P' # http://www.djangoproject.com/documentation/templates/#now TIME_FORMAT = 'P' +# Whether to enable Psyco, which optimizes Python code. Requires Psyco. +# http://psyco.sourceforge.net/ +ENABLE_PSYCO = False + ############## # MIDDLEWARE # ############## diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo index 6964e7aee08496b8785c8a993cf4ce24bb313387..c9b6c5bf46057930f4d7a07831b9584c9b416489 100644 GIT binary patch delta 25 hcmbPqiE+{;#ti~mTt>PEMhb?8Rz_x\n" "Language-Team: Ankur Bangla \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 forgotten your password?" msgstr "আপনি কি আপনার পাসওয়ার্ড ভুলে গেছেন?" @@ -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 index f4188d83aca12e43550a2fc3e914d65baaeaee35..2dcdb0fabd309eb8e0175139a7a4d708f835bdc1 100644 GIT binary patch delta 25 hcmaF+jq&X_#toM}xQuiSj1&wFt&B`J-}RVa1OSx_3LF3c delta 25 hcmaF+jq&X_#toM}xD0g-jTDTGtqct}-}RVa1OSx=3K{?a 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 \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 forgotten your password?" msgstr "Zapomněl(a) jste své heslo?" @@ -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 index 9a36894291706b362f73f566166e3b4456a87cff..8044d67cb2d3d271c22111248e0800675140622b 100644 GIT binary patch delta 25 hcmdnIhjH^B#tn(qTt>PEMhb?8Rz_x\n" "Language-Team: Cymraeg \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 forgotten your password?" msgstr "Ydych wedi anghofio eich cyfrinair?" @@ -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 index 9a103502f0eda475716fa97697908e86215521f1..8bdc7a3478400fe2aa7a5aa5484e1fef8fdbd4b1 100644 GIT binary patch delta 25 gcmey+%=n?1af6R0myxc4k%FP2m66%zFwI#K0CQUh;Q#;t delta 25 gcmey+%=n?1af6R0m!Ynqk%E!2m7&q*FwI#K0CQFc-v9sr 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 \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 forgotten your password?" msgstr "Har du glemt din adgangskode?" @@ -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 index 9654bd087b29ef50c4740681af158816ad61cf6a..e9f84e3ec242f99e21e339a7d08bb2288460bea4 100644 GIT binary patch delta 8398 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

Ps+KR;( zfg4d1*n?WhPf;uQh4U18bm1A2x~RXGw6yh5Gi{FA+I<$yvvz_Fb|Y$i#yQ| z-@z`p3$=3P#`C~p0w&^89EcxdbF4Rk^;gnsf?cvXm`-^aw!u@_469GH|4pbHW>C&Y z-YByLqcLcbeX0|14doo<4K3kSd6LD?G3xJBIN^E9*?{FGAu{=Jci)~OvF2=*DrB~-Qr2ulJY8KSIuXb zqu&l4AF!|8BGh+a2Wm-=p&Imi&r~&3<08TblYH{AAR?XP~b0psrhln!t0YnZAsg$ad6< zy@y)i{pf>n+W%XGjsR-jLM`dHgg@oem`>CqjuBOfGsH{8vxJUJi}$^cCtpQ;Oe7Hx z6TY;g!R#Xr5!;D8;%UO8(QF{})$-Gj+@V+K&xdCJIZ=z~?oQO?`qy19Mic)f>QO&H z6&!PkYLus7BRqlc5<0fgzc;DM2_2Q4%6Ab5iJq=58ufk1aOEE4*~FuSUc)bmPDDe_ zcOaf2SL@#pA?}_5xR$bxeDY6S|E4d6DpZ!oq4*Keis(=1g>0 zA=D9JF)w2$*LVw8SKF0U&o-Scm;6w;{fBbv4M}Ag_Ym zh>3)b^%n1M#H-{_xbjA)n98-&kv}iZKytpm=F;8$&!J*76=Sh6@hbVB8Dg=`nc-`ldm9jq*=TlqUPjr?wTR!naqz0RHox`ci|1> z*R=O2;%9ev!@W3~s7~FBL=W;Gy;s>kyIPWWAQljZiARV!#5qDoti=?#_9|-shf}$O z_z&?9;y2pY& z!XAHH|K{BEhdb4gd@ynMC?RR+3JKJAC7Mv~>grD6Q0lH=4zZB6-bMpECEN0DE1 zC+ef82`BcGeBmlPQ*P&SKkQ2s5F@E?N<2>fPa=<8M<3!zZ}!(8pZuxVj%x!bhvQK! zCe9KZ9`hMLV>q!J6R{NEBeIAIl(UFxPRBjF~&I_BZ!}DwfAQ>zJ<(d|Q&0#3tegqBfyp9uZC?6VDN?xT!I=A$0f>ONc?##}coQk0Y4E`;pTF zN;^ci3@BX~9~4l!A}P+lS-I3dBiye-Vzb1gsHEg}iHW6+dNd6x n9n!CJVCmM}a{;BRMt\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 forgotten your password?" msgstr "Haben Sie ihr Passwort vergessen?" @@ -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 index c76eea564b703121fc53e8e99c493056c7985c3e..8006017dbe2ca9c3b291ac401c99eb0c5ed7fd72 100644 GIT binary patch delta 22 dcmbQiGJ|D11WbuK+!`1)Tr@ delta 22 dcmbQiGJ|D 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 \n" "Language-Team: LANGUAGE \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 forgotten your password?" 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 index 50f14bb72fe7868d8e85194b702a644d4571633a..b3412433cfd0ccd416f58289dcf67261547a7442 100644 GIT binary patch delta 25 hcmZ4chH>p1#tnwPEMhb?8Rz{|qt=&KA0RVbQ2%rD} delta 25 hcmZ4chH>p1#tnw\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 "Documentaci #: 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 "Documentaci 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 forgotten your password?" msgstr "Ha olvidado su clave?" @@ -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 index 8d5abb1377b8f1e97c725bd9f0ec7ff2ce8127fd..919c2f431e35ba4d65b23575aee6f0546cb6cf95 100644 GIT binary patch delta 25 hcmex(oAKjq#tl*qTt>PEMhb?8Rz{|qRUFRh0sw&b2&4c2 delta 25 hcmex(oAKjq#tl*qT!y-aMhZs8R)&U~RUFRh0sw&W2%-Q0 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 \n" "Language-Team: franais \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 "entr 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 forgotten your password?" msgstr "Avez vous perdu votre mot de passe?" @@ -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 index d0f086af4732104984e0a39c6c6768ddce25daa8..fb0608efe0369eb87d7aae5662cbea60e6ea9fac 100644 GIT binary patch delta 25 hcmezTit+O+#tk`cTt>PEMhb?8Rz{|q%iR9z0RW5L38w%6 delta 25 hcmezTit+O+#tk`cT!y-aMhZs8R)&U~%iR9z0RW5G38er4 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 \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 forgotten your password?" msgstr "Esqueceu o contrasinal?" @@ -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 index 00754d1263db82d99cdffeca60c87eba35d1d3b1..b84d6605970ccef48cb0a9b2d1a45831f6f5fd35 100644 GIT binary patch delta 25 gcmdnj#kjAFaYK(Lmyxc4k%FP2m66%zX__mf0dWTi8~^|S delta 25 gcmdnj#kjAFaYK(Lm!Ynqk%E!2m7&q*X__mf0dWEd8UO$Q 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 \n" "Language-Team: \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 forgotten your password?" msgstr "Gleymdir þú lykilorðinu þí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 index e023fd2d48b44305d8422ade273d42ddaf09e5bd..7d8563ec3093291264fdadd51286d1a81a0586c3 100644 GIT binary patch delta 25 hcmey`!1%R+al;jLE+bt7BLzc4D\n" "Language-Team: LANGUAGE \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 forgotten your password?" msgstr "Hai dimenticato la tua password?" @@ -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 index bd24eec980dfd11bddcca820e8dbca7e98d94daa..a84d2ae69b403277c271f112fc1df2bf799f5e7b 100644 GIT binary patch delta 25 hcmezJkMYYt#trM;xr}rTj1&wFt&Gez?{wd74gi$#3LyXh delta 25 hcmezJkMYYt#trM;xeRp;jTH<{txSzK?{wd74gi%R3MK#m 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 \n" "Language-Team: LANGUAGE \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 forgotten your password?" msgstr "パスワードを忘れましたか？" @@ -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 index 634d3c49d7591f71da78ee9627d76b087e0c03be..364fedca92a6a8f72b6ac1390ad666d327200bdc 100644 GIT binary patch delta 25 hcmbPti*ep9#tr_?Tt>PEMhb?8Rz_x\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 forgotten your password?" msgstr "Wachtwoord vergeten?" @@ -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 index b64af505f3be354f3abde6570d5a4725471589b2..028f25022aac2ef389aaf54ad6c3ee66c7deedd2 100644 GIT binary patch delta 25 gcmeyioAKLj#tk`ETt>PEMhb?8Rz_x<%d8rd0fIOPumAu6 delta 25 gcmeyioAKLj#tk`ET!y-aMhZs8R)$8K%d8rd0fI9Kt^fc4 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 \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 forgotten your password?" msgstr "Har du glemt passordet ditt?" @@ -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 index c324550bb03cfd193f2bef8b39486b0956ab03e6..fd22fa0a1ce609d91cb642e42141ae635971b286 100644 GIT binary patch delta 7769 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

SuW`+E|UD8KWi?F~w=0iu^oSy-<7aL!Fhi80<#o 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 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 \n" "Language-Team: Português do Brasil \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 "" "

Por %s

\n" "
    \n" -#: contrib/admin/filterspecs.py:70 -#: contrib/admin/filterspecs.py:88 +#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88 #: contrib/admin/filterspecs.py:143 msgid "All" msgstr "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 (500)" msgstr "Erro no Servidor (500)" #: contrib/admin/templates/admin/500.html:10 -msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." -msgstr "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 forgotten your password?" msgstr "Você ?" @@ -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 index f2459c8fcb5f547607132d21dbdd34c975ac8552..e24d7370c21b78d135a7b40005419fa5cbfa1ca0 100644 GIT binary patch delta 25 gcmX@n%6Oucal\n" "Language-Team: Romanian \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 forgotten your password?" msgstr "Ai uitat parola?" @@ -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 index 3f59887de8d0eaf21e4973d8096fddb9e4cf8936..65b6b4477e41ee7fbf3bef17d1ee75a097f8c46e 100644 GIT binary patch delta 25 gcmcb*hVkke#trsnTt>PEMhb?8Rz{|qJ\n" "Language-Team: LANGUAGE \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 forgotten your password?" msgstr " ?" @@ -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 index 157307f7e62228d171eabc84f16eddac7e408201..eb3d6a2d2d7bda8db33d26b53a7769806b4e6d73 100644 GIT binary patch delta 8334 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 p{8Ep%ptLBrGPIyqeJ(zgo9|hWtJ?<` delta 8012 zcmYk>3w+P@9>?+T?Diisvzsw<8M|Q2hRxh2x4B#H_nF&VM;V#$FXSF+uBW0TsZ&!e zBDo}mL`W1JmqRW`O+>;;=k@;ozE1rf=dbS%#E*(M&>P>uKzz^E@5BJg`|SB6wtO6;sQ&?7_&fTd7rmN{{#X`g zpgOV$eQ-Cby?q!)`{oddKNaUu4PQkDYwlo84C9YFkdC^swJmqV5XwERxmb?!G}QAJ zB9m!e#C%+fjM#+6I_DG7Mf;{9NqKCJn&NKAwPrAu#@XnLOE46dqdKw)gK@L1--GJt z3G~IY=!2I~Gjt90{9CB|z2caE_0UDK5yLPYcc9kl4yt2i;+?6C#!8gypr*bZvaDt( z`r;f^0}D|zvBsW%3!^C?LRQIKLw^iRVE+4(ge5prGahNv%tiiV-sO+h?j-5~rE3|Z zeVKr)j%kVYaX8k-6{wEyK|SXrCgUI236r>J7(R`fnRB(7e;3ImDjMU@7=UqgoT;ym zQz$n@?Trsmn`$@u;bH3u)N{_*@+B-q`8sN5N^JdYY)Sb6Y6hCQ6P=#4!O~Q8Ky{!e zX5wJfRBpr>xD|C{!@5p=Gt?&RjH=H@jV#xe$DulwZ|i5^W0YrM4|MOdCnD=PyEPgE zIZ+F>wyCI*_O1tZDHo$UbQsIvDb&C&+Hwh& z)%$;+L{sicF{TBEV?XSPEwKpu;0@FVB$HlN!yz~qpT$||YUq4779p3K_fP}4h_f+- zb(x1NQEx#N*2~?NWEP1=bO6=BDJ+k_phjFO&6&C~sB$Q3iYsFnR!5CE6*bZ<)W`>7 zD2_zEUDHr|qS&6_p2qxZO+KSSACyC=nYe->cpKF*f9~#z5vckRs0U9)EzM%ohzhY8 z-bFpPAzw57_%uTes2}S3v8eM;rZfK<$uuf7^={N!?!s*R9yNvOO`H$NC}ew>53N69 z1m%dP&iT5i-Cuy(oSRV{ID=eje#dUufL_+X*=`bD@Fr?4_hB#W)SRyszJ@HHIffsg zAH7tA+pz*3MXmK!WVK9GhB2|&9ktn}Vqct%9qSYc?FdgnC}7HqHP7QTK=2auj;&{jW)) z4?+T}p;U~iw1qa~;WEo9HTjxjSX{JuHu2 z-JNnM22+kgbs!Pdfeh63olpbrfu4W=_a)K$oTCbyjC$Zq+>9?^du-XmS*iu72G*fE z_8vy!F4TwX6zcW8gX(DIp3d{)F@$nDYL9eAcMQoBB)VZaYN~hOX#5N z;$765)nhAb#4T_Xc1F$A7Szc0qo(>aYOOEZ^3SN}-9zn_Qv4EWDO~+ne)d7(EtpjJ{PNDzAdl7P|E93Bj1Y8<6hJnXYsHMoQ(Q;--4Qf+o*Qk_es>F zKd}P(^AlGItD?$HP*c|(HT45f9T|=KHJgGO`82GI%djyPp*nO0_55E^4L(3U&kXjI z-6nuU6+x&5DqwAlMQxHSY>2Z_4Q;dMzee46-|C(1d^ZA74aZ?Lrl2~Ug;j76YHv)( z5WWAiNwh{Qt*>Gb<+o9rYddzuL#Qugr6J4)&cw-h45KhJ$N87fFno#fTwI7T?CiSu zE@t2vTaMykOWag+AX$Ll;b-1+ZlU!gWx&@i}w6O z)Y}r0%eMuik*~a2idvd;sPD-2T;^X>TxpckU?QrA4N;q=1vbLgs6A1DEVtQ!Dd^2~ z4Z&1Yd6o4`)a&;LcEZpxe1pEG$TOx5*2FG28r6Z1Fc2>xFPypQCh0)Zb%HZRt5LiC zD#l?nUzgU{20P(=48RlU!n3HEx?=swdK2}w{Dyv5mUW21F!aVW)cx+JB>cy;;ZHnn zMO}CnOQYA5&Qu1X9vFk#E9qDtGf*R%h>zh6)Lz+*&){K9#jcasH~1W?L)VdkxXmpR z_2j=+-+X68L0F#pP}C-jMa@Vn)EbV)j<^)3;c3joUc8gK?iJKh?8AC^4nr_#iqpaB z=+gV2MB>GX##j!U*b6#(E?|eFraT8V^0BCyc>>GebPUD$7=|y~^Y7d8C#dHhL(S9$ z)WAw~Uhlto%9+}5)CGyC2c=^$cC}_>GUbWrkLyuW{WhwD+fWVdMLp*@hT}O@$M0YS zK0pm1WGeHooWYNUbeG@TDc%}4_3!6~Rcw2RP@K}1vWmZ$XB zAJ1~z;%8D7%WVa3idj$OaO2CEPK+URw59HKCpG7+Bk)C=N2zs=bj)^A&)*w1A4PpK z5kt(St|ifc+nfO@@( zI);;9!1sywh=!CO9o@YczrN@GRQ}i2*1&kmLBu#BkFqw~e~9svb-Y3Zkas1tJUaeK zRP|f*`5Ss}d^{C&79f@Cwr9@-m&BA4oq3#6E7E&5Y{7Ae@=r~5yuuoLEIeD%vCsA%h zbRc>Vm8t&{b#y1bAqLrNpC)fZ=-_){{`6%3|5Law($^hL@e^A$9jkEfWB4^Ogm`pp zCs{(gLA*eO5UYr)TtAwaP2Lgze$=*w{y3I%hyHf5KII6lZY?VJ5ToqLrktovOrji# zIu;P&~=b=uf#Zv6uX9q7(6es6=ED6Nx&U*O5k4AtESO#fn&yXip>&-KcvU zb+mRcg{vb23tx@&QMms>Whr}sJ#P|i`5+a(9Ze$vYFr$@>t2gpRF5l)g08IhjXPAi5F1c~0}MQOqSKP}hOb5$Rw~<3Pfn z_=xz5(2-B{BJL9x2_0kXy=TaMJT=S^b@AlGwHI8r@;o-N7x%$1;udwciI<2)#OK6G zLdP^>jVI$H#kF6MXQ4Ox5dlPBBAdE4#AWh+M0s)@353`F;>lH~_!Zxdjr1#yO?3Gc zr>4~LEzC=6Rd^t+cJYI>r9s6j+Ewx?n_M?JrCLgZCdnyv>L(X}($U9Ne5m^ye#P_q gz2#Tje8_R%!l;pL3a5=sDc(LZC%8E7skJ`;1Id|+KmY&$ diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po index 21f4a26f22..98204431be 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 06:36-0500\n" "PO-Revision-Date: 2005-11-10 23:22-0500\n" "Last-Translator: Vladimir Labath \n" "Language-Team: Slovak \n" @@ -16,6 +16,37 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +#: contrib/redirects/models/redirects.py:7 +msgid "redirect from" +msgstr "presmerovaný z" + +#: contrib/redirects/models/redirects.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'." + +#: contrib/redirects/models/redirects.py:9 +msgid "redirect to" +msgstr "presmerovaný na " + +#: contrib/redirects/models/redirects.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Tu môže byť buď absolútna cesta (ako hore) alebo plné URL začínajúce s " +"'http://'." + +#: contrib/redirects/models/redirects.py:12 +msgid "redirect" +msgstr "presmerovanie" + +#: contrib/redirects/models/redirects.py:13 +msgid "redirects" +msgstr "presmerovania" + #: contrib/comments/models/comments.py:8 #: contrib/comments/models/comments.py:161 msgid "object ID" @@ -286,6 +317,125 @@ 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/freeform.html:4 +msgid "Your name:" +msgstr "Vaše meno:" + +#: contrib/comments/templates/comments/freeform.html:5 +#: contrib/comments/templates/comments/form.html:27 +msgid "Comment:" +msgstr "Komentár:" + +#: contrib/comments/templates/comments/freeform.html:9 +#: contrib/comments/templates/comments/form.html:32 +msgid "Preview comment" +msgstr "Pozri komentár" + +#: 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 +msgid "Forgotten your password?" +msgstr "Zabudol si svoje 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/change_form.html:9 +#: contrib/admin/templates/admin/base.html:23 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: 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 +msgid "Ratings" +msgstr "Hodnotenia" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "Požadované" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "Voliteľné" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "Pošli foto" + +#: contrib/flatpages/models/flatpages.py:6 contrib/admin/views/doc.py:267 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models/flatpages.py:7 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj " +"záverečné lomítka." + +#: contrib/flatpages/models/flatpages.py:8 +msgid "title" +msgstr "názov" + +#: contrib/flatpages/models/flatpages.py:9 +msgid "content" +msgstr "obsah" + +#: contrib/flatpages/models/flatpages.py:10 +msgid "enable comments" +msgstr "povolené komentáre" + +#: contrib/flatpages/models/flatpages.py:11 +msgid "template name" +msgstr "meno predlohy" + +#: contrib/flatpages/models/flatpages.py:12 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije " +"'flatpages/default'." + +#: contrib/flatpages/models/flatpages.py:13 +msgid "registration required" +msgstr "musíte byť zaregistrovaný" + +#: contrib/flatpages/models/flatpages.py:13 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku." + +#: contrib/flatpages/models/flatpages.py:17 +msgid "flat page" +msgstr "plochá stránka" + +#: contrib/flatpages/models/flatpages.py:18 +msgid "flat pages" +msgstr "ploché stránky" + #: contrib/admin/filterspecs.py:40 #, python-format msgid "" @@ -360,7 +510,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 +520,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 +536,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 +544,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 +628,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:" @@ -565,10 +715,6 @@ msgstr "Text" msgid "Time" msgstr "Čas" -#: contrib/admin/views/doc.py:267 contrib/flatpages/models/flatpages.py:6 -msgid "URL" -msgstr "URL" - #: contrib/admin/views/doc.py:268 msgid "U.S. state (two uppercase letters)" msgstr "U.S. štát (dve veľké písmena)" @@ -577,20 +723,38 @@ msgstr "U.S. štát (dve veľké písmena)" msgid "XML text" msgstr "XML text" +#: contrib/admin/templates/widget/file.html:2 +msgid "Currently:" +msgstr "Aktuálny:" + +#: contrib/admin/templates/widget/file.html:3 +msgid "Change:" +msgstr "Zmeň:" + +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "Dátum:" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "Čas" + #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Documentation" msgstr "Dokumentácia" #: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_list.html:4 +#: contrib/admin/templates/admin/change_form.html:9 #: contrib/admin/templates/admin/base.html:23 #: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:9 +#: contrib/admin/templates/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,29 +768,11 @@ 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/500.html:4 #: contrib/admin/templates/admin/change_form.html:12 +#: contrib/admin/templates/admin/base.html:28 #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/registration/logged_out.html:4 @@ -665,13 +811,15 @@ msgstr "" "Tento object nemá históriu zmien. Možno nebol pridaný prostredníctvom tohoto " "web admina" -#: contrib/admin/templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django web admin" +#: contrib/admin/templates/admin/change_list.html:10 +#, python-format +msgid "Add %(name)s" +msgstr "Pridaj %(name)s" -#: contrib/admin/templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administrácia Django" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(title)s " +msgstr " Od %(title)s " #: contrib/admin/templates/admin/500.html:4 msgid "Server error" @@ -693,14 +841,17 @@ msgstr "" "Vznikla chyba. Prostredníctvom e-mailu bol o nej informovaný správca a " "chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť." -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Stránka nebola nájdená" +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Go" +msgstr "Choď" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Ľutujeme, ale požadovaná stránka nebola nájdená." +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Django web admin" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Administrácia Django" #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -727,23 +878,37 @@ msgstr "Moje udalosti" msgid "None available" msgstr "Nepovolené" -#: contrib/admin/templates/admin/change_list.html:10 -#, python-format -msgid "Add %(name)s" -msgstr "Pridaj %(name)s" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Stránka nebola nájdená" -#: contrib/admin/templates/admin/login.html:15 -msgid "Username:" -msgstr "Meno:" - -#: contrib/admin/templates/admin/login.html:18 -msgid "Password:" -msgstr "Heslo:" +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Ľutujeme, ale požadovaná stránka nebola nájdená." #: contrib/admin/templates/admin/login.html:20 msgid "Have you forgotten your password?" msgstr "Zabudli ste vaše heslo?" +#: contrib/admin/templates/admin/change_form.html:20 +msgid "View on site" +msgstr "Pozri na webe" + +#: contrib/admin/templates/admin/change_form.html:28 +msgid "Please correct the error below." +msgid_plural "Please correct the errors below." +msgstr[0] "Opravte chybu, čo je nižšie, prosím." +msgstr[1] "Opravte chyby, čo sú nižšie, prosím." + +#: contrib/admin/templates/admin/change_form.html:45 +msgid "Ordering" +msgstr "Určenie" + +#: contrib/admin/templates/admin/change_form.html:48 +msgid "Order:" +msgstr "Poradie:" + #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Vítajte," @@ -772,33 +937,6 @@ msgstr "" msgid "Yes, I'm sure" msgstr "Ano, som si istý" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(title)s " -msgstr " Od %(title)s " - -#: contrib/admin/templates/admin/search_form.html:8 -msgid "Go" -msgstr "Choď" - -#: contrib/admin/templates/admin/change_form.html:20 -msgid "View on site" -msgstr "Pozri na webe" - -#: contrib/admin/templates/admin/change_form.html:28 -msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "Opravte chybu, čo je nižšie, prosím." -msgstr[1] "Opravte chyby, čo sú nižšie, prosím." - -#: contrib/admin/templates/admin/change_form.html:45 -msgid "Ordering" -msgstr "Určenie" - -#: contrib/admin/templates/admin/change_form.html:48 -msgid "Order:" -msgstr "Poradie:" - #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Vymazať" @@ -1003,101 +1141,6 @@ msgstr "Editujte tento objekt (nové okno)" msgid "As above, but opens the admin page in a new window." msgstr "Ako vyššie, ale stranka admina sa otvorí v novom okne." -#: contrib/admin/templates/widget/date_time.html:3 -msgid "Date:" -msgstr "Dátum:" - -#: contrib/admin/templates/widget/date_time.html:4 -msgid "Time:" -msgstr "Čas" - -#: contrib/admin/templates/widget/file.html:2 -msgid "Currently:" -msgstr "Aktuálny:" - -#: contrib/admin/templates/widget/file.html:3 -msgid "Change:" -msgstr "Zmeň:" - -#: contrib/redirects/models/redirects.py:7 -msgid "redirect from" -msgstr "presmerovaný z" - -#: contrib/redirects/models/redirects.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'." - -#: contrib/redirects/models/redirects.py:9 -msgid "redirect to" -msgstr "presmerovaný na " - -#: contrib/redirects/models/redirects.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Tu môže byť buď absolútna cesta (ako hore) alebo plné URL začínajúce s " -"'http://'." - -#: contrib/redirects/models/redirects.py:12 -msgid "redirect" -msgstr "presmerovanie" - -#: contrib/redirects/models/redirects.py:13 -msgid "redirects" -msgstr "presmerovania" - -#: contrib/flatpages/models/flatpages.py:7 -msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj " -"záverečné lomítka." - -#: contrib/flatpages/models/flatpages.py:8 -msgid "title" -msgstr "názov" - -#: contrib/flatpages/models/flatpages.py:9 -msgid "content" -msgstr "obsah" - -#: contrib/flatpages/models/flatpages.py:10 -msgid "enable comments" -msgstr "povolené komentáre" - -#: contrib/flatpages/models/flatpages.py:11 -msgid "template name" -msgstr "meno predlohy" - -#: contrib/flatpages/models/flatpages.py:12 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Príklad: 'flatpages/contact_page'. Ak sa toto nevykonalo, systém použije " -"'flatpages/default'." - -#: contrib/flatpages/models/flatpages.py:13 -msgid "registration required" -msgstr "musíte byť zaregistrovaný" - -#: contrib/flatpages/models/flatpages.py:13 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "" -"Ak je toto označené, potom len prihlásený užívateľ môže vidieť túto stránku." - -#: contrib/flatpages/models/flatpages.py:17 -msgid "flat page" -msgstr "plochá stránka" - -#: contrib/flatpages/models/flatpages.py:18 -msgid "flat pages" -msgstr "ploché stránky" - #: utils/translation.py:350 msgid "DATE_FORMAT" msgstr "" @@ -1791,7 +1834,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 index afb105aeee398164f8b58743b6fa6973b25fb450..e5bc4d0f2df8c1d80521d1fe820aeaf4d1763cc6 100644 GIT binary patch delta 25 hcmaF%k@49_#tqtDTt>PEMhb?8Rz{|qO}#ei0RV*82-N@p delta 25 hcmaF%k@49_#tqtDT!y-aMhZs8R)&U~O}#ei0RV*32-5%n 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ć \n" -"Language-Team: Nesh & Petar \n" +"Language-Team: Nesh & Petar \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Poedit-Language: Serbian\n" "X-Poedit-Country: YUGOSLAVIA\n" "X-Poedit-SourceCharset: utf-8\n" @@ -75,8 +77,7 @@ msgstr "datum/vreme slanja" msgid "is public" msgstr "da li je javni" -#: contrib/comments/models/comments.py:26 -#: contrib/admin/views/doc.py: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 "" "

    Od %s:

    \n" "
      \n" -#: contrib/admin/filterspecs.py:70 -#: contrib/admin/filterspecs.py:88 +#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88 #: contrib/admin/filterspecs.py:143 msgid "All" msgstr "Sve" @@ -354,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 (500)" msgstr "Greška na serveru (500)" #: contrib/admin/templates/admin/500.html:10 -msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." -msgstr "Dogodila se greška koja je prijavljena administratorima i biće popravljena uskoro. Hvala Vam na strpljenju." +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"Dogodila se greška koja je prijavljena administratorima i biće popravljena " +"uskoro. Hvala Vam na strpljenju." #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 @@ -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 forgotten your password?" msgstr "Da li ste zaboravili Vašu lozinku??" @@ -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\").

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

      Da bi ste instalirali \"bookmarklet\", odvučite link u vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup nekima od strana mora biti sa kompjutera čija je IP adresa označena kao \"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je vaš IP označen kao \"internal\").

      \n" +"

      Da bi ste instalirali \"bookmarklet\", odvučite link u " +"vaše \"bookmark\"-e, ili kliknite desnim tasterom i dodajte ga. Sada možete " +"da izaberete \"bookmark\" sa bilo koje strane na sajtu. Napomena: pristup " +"nekima od strana mora biti sa kompjutera čija je IP adresa označena kao " +"\"internal\" (kontaktirajte sistem administratora ako niste sigurni da li je " +"vaš IP označen kao \"internal\").

      \n" #: contrib/admin/templates/admin_doc/bookmarklets.html:19 msgid "Documentation for this page" msgstr "Dokumentacija za ovu stranu" #: contrib/admin/templates/admin_doc/bookmarklets.html:20 -msgid "Jumps you from any page to the documentation for the view that generates that page." -msgstr "Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji generiše tu stranu." +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." +msgstr "" +"Skače sa bilo koje strane na stranu sa dokumentacijom za \"view\" koji " +"generiše tu stranu." #: contrib/admin/templates/admin_doc/bookmarklets.html:22 msgid "Show object ID" msgstr "Prikaži ID objekta" #: contrib/admin/templates/admin_doc/bookmarklets.html:23 -msgid "Shows the content-type and unique ID for pages that represent a single object." -msgstr "Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan objekt." +msgid "" +"Shows the content-type and unique ID for pages that represent a single " +"object." +msgstr "" +"Prikazuje \"content-type\" i jedinstveni ID strane koje predstavlja jedan " +"objekt." #: contrib/admin/templates/admin_doc/bookmarklets.html:25 msgid "Edit this object (current window)" @@ -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 index 5afe00f360c889865b2c1f0dfcbc555343bd8b1d..c9ff90560883cce5fb77bed8f3b031e659ff32e9 100644 GIT binary patch delta 25 hcmaFPEMhb?8Rz_x~c 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 \n" "Language-Team: Django translators \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 forgotten your password?" msgstr "Har du glömt ditt lösenord?" @@ -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 index 39f33ecb4122f567d1280be507f0b3f8e47e8145..551e6bcc594932f8e1df107f17b779e27e8b4ca9 100644 GIT binary patch delta 25 hcmX@{l<~w<#tlC`xr}rTj1&wFt&B`JGkYD?004^q2`T^p delta 25 hcmX@{l<~w<#tlC`xeRp;jTDTGtqct}GkYD?004^l2`B&n 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 \n" "Language-Team: Simplified Chinese \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 forgotten your password?" msgstr "忘记你的密码？" @@ -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 index 0a2f071b632989867e81a1565a30564b80ef2066..5e2e3c0e234fe99757b5614836b29df88ee4b641 100644 GIT binary patch delta 25 hcmccql=1pg#tm~kxr}rTj1&wFt&GezFY`3i1OSMg2>Sp4 delta 25 hcmccql=1pg#tm~kxeRp;jTDTGtqhGeFY`3i1OSMb2>Ad2 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 \n" "Language-Team: LANGUAGE \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 forgotten your password?" msgstr "你 忘記你的密碼了嗎？" @@ -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/admin/media/js/admin/ordering.js b/django/contrib/admin/media/js/admin/ordering.js index fb0f5b007e..53c42f3609 100644 --- a/django/contrib/admin/media/js/admin/ordering.js +++ b/django/contrib/admin/media/js/admin/ordering.js @@ -1,8 +1,8 @@ addEvent(window, 'load', reorder_init); var lis; -var top = 90; -var left = 545; +var top = 0; +var left = 0; var height = 30; function reorder_init() { 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 %} +
      + +{% if user.is_anonymous %} +

      {% trans "Username:" %}
      {% trans "Password:" %} ({% trans "Forgotten your password?" %})

      +{% else %} +

      {% trans "Username:" %} {{ user.username }} ({% trans "Log out" %})

      +{% endif %} + +{% if ratings_optional or ratings_required %} +

      {% trans "Ratings" %} ({% if ratings_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):

      + +{% for value in rating_range %}{% endfor %} +{% for rating in rating_choices %} +{% for value in rating_range %}{% endfor %} +{% endfor %} +
       {{ value }}
      {{ rating }}
      + +{% endif %} + +{% if photos_optional or photos_required %} +

      {% trans "Post a photo" %} ({% if photos_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):

      + +{% endif %} + +

      {% trans "Comment:" %}

      + + + + +

      +
      +{% 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 %} +
      +

      {% trans "Your name:" %}

      +

      {% trans "Comment:" %}

      + + + +

      +
      +{% endif %} diff --git a/django/contrib/comments/templatetags/comments.py b/django/contrib/comments/templatetags/comments.py index 6fb3d2ee97..bd8b5bb2e6 100644 --- a/django/contrib/comments/templatetags/comments.py +++ b/django/contrib/comments/templatetags/comments.py @@ -2,62 +2,15 @@ from django.contrib.comments.models import Comment, FreeComment from django.contrib.comments.models import PHOTOS_REQUIRED, PHOTOS_OPTIONAL, RATINGS_REQUIRED, RATINGS_OPTIONAL, IS_PUBLIC from django.contrib.comments.models import MIN_PHOTO_DIMENSION, MAX_PHOTO_DIMENSION from django import template +from django.core.template import loader from django.core.exceptions import ObjectDoesNotExist from django.contrib.contenttypes.models import ContentType import re register = template.Library() -COMMENT_FORM = ''' -{% load i18n %} -{% if display_form %} -
      - -{% if user.is_anonymous %} -

      {% trans "Username:" %}
      {% trans "Password:" %} ({% trans "Forgotten your password?" %})

      -{% else %} -

      {% trans "Username:" %} {{ user.username }} ({% trans "Log out" %})

      -{% endif %} - -{% if ratings_optional or ratings_required %} -

      {% trans "Ratings" %} ({% if ratings_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):

      - -{% for value in rating_range %}{% endfor %} -{% for rating in rating_choices %} -{% for value in rating_range %}{% endfor %} -{% endfor %} -
       {{ value }}
      {{ rating }}
      - -{% endif %} - -{% if photos_optional or photos_required %} -

      {% trans "Post a photo" %} ({% if photos_required %}{% trans "Required" %}{% else %}{% trans "Optional" %}{% endif %}):

      - -{% endif %} - -

      {% trans "Comment:" %}

      - - - - -

      -
      -{% endif %} -''' - -FREE_COMMENT_FORM = ''' -{% load i18n %} -{% if display_form %} -
      -

      {% trans "Your name:" %}

      -

      {% trans "Comment:" %}

      - - - -

      -
      -{% 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 +57,15 @@ class CommentFormNode(template.Node): context['options'] = ','.join(options) if self.free: context['hash'] = Comment.objects.get_security_hash(context['options'], '', '', context['target']) - default_form = FREE_COMMENT_FORM + default_form = 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'] = Comment.objects.get_rating_options(self.rating_options) context['hash'] = Comment.objects.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 = loader.get_template(COMMENT_FORM) + output = default_form.render(context) context.pop() return output diff --git a/django/core/handlers/modpython.py b/django/core/handlers/modpython.py index f44626873a..7407310514 100644 --- a/django/core/handlers/modpython.py +++ b/django/core/handlers/modpython.py @@ -132,6 +132,10 @@ class ModPythonHandler(BaseHandler): # that use settings now can work from django.conf import settings + if settings.ENABLE_PSYCO: + import psyco + psyco.profile() + # if we need to set up middleware, now that settings works we can do it now. if self._request_middleware is None: self.load_middleware() diff --git a/django/core/handlers/wsgi.py b/django/core/handlers/wsgi.py index 0e6560be74..14a65ce110 100644 --- a/django/core/handlers/wsgi.py +++ b/django/core/handlers/wsgi.py @@ -147,6 +147,10 @@ class WSGIHandler(BaseHandler): def __call__(self, environ, start_response): from django.conf import settings + if settings.ENABLE_PSYCO: + import psyco + psyco.profile() + # Set up middleware if needed. We couldn't do this earlier, because # settings weren't available. if self._request_middleware is None: diff --git a/django/core/management.py b/django/core/management.py index c746933784..53f3ce7bc1 100644 --- a/django/core/management.py +++ b/django/core/management.py @@ -731,6 +731,7 @@ def inspectdb(db_name): "Generator that introspects the tables in the given database name and returns a Django model, one line at a time." from django.db import connection, get_introspection_module from django.conf import settings + import keyword introspection_module = get_introspection_module() @@ -759,37 +760,49 @@ def inspectdb(db_name): relations = {} for i, row in enumerate(introspection_module.get_table_description(cursor, table_name)): column_name = row[0] + comment_notes = [] # Holds Field notes, to be displayed in a Python comment. + extra_params = {} # Holds Field parameters such as 'db_column'. + + if keyword.iskeyword(column_name): + extra_params['db_column'] = column_name + column_name += '_field' + comment_notes.append('Field renamed because it was a Python reserved word.') + if relations.has_key(i): - rel = relations[i] - rel_to = rel[1] == table_name and "'self'" or table2model(rel[1]) + rel_to = relations[i][1] == table_name and "'self'" or table2model(relations[i][1]) + field_type = 'ForeignKey(%s' % rel_to if column_name.endswith('_id'): - field_desc = '%s = models.ForeignKey(%s)' % (column_name[:-3], rel_to) + column_name = column_name[:-3] else: - field_desc = '%s = models.ForeignKey(%s, db_column=%r)' % (column_name, rel_to, column_name) + extra_params['db_column'] = column_name else: try: field_type = introspection_module.DATA_TYPES_REVERSE[row[1]] except KeyError: field_type = 'TextField' - field_type_was_guessed = True - else: - field_type_was_guessed = False + comment_notes.append('This field type is a guess.') # This is a hook for DATA_TYPES_REVERSE to return a tuple of # (field_type, extra_params_dict). if type(field_type) is tuple: field_type, extra_params = field_type - else: - extra_params = {} + field_type, new_params = field_type + extra_params.update(new_params) if field_type == 'CharField' and row[3]: extra_params['maxlength'] = row[3] - field_desc = '%s = models.%s(' % (column_name, field_type) - field_desc += ', '.join(['%s=%s' % (k, v) for k, v in extra_params.items()]) - field_desc += ')' - if field_type_was_guessed: - field_desc += ' # This is a guess!' + field_type += '(' + + + field_desc = '%s = models.%s' % (column_name, field_type) + if extra_params: + if not field_desc.endswith('('): + field_desc += ', ' + field_desc += ', '.join(['%s=%r' % (k, v) for k, v in extra_params.items()]) + field_desc += ')' + if comment_notes: + field_desc += ' # ' + ' '.join(comment_notes) yield ' %s' % field_desc yield ' class Meta:' yield ' db_table = %r' % table_name diff --git a/django/db/backends/sqlite3/introspection.py b/django/db/backends/sqlite3/introspection.py index 74c19e22bf..26b7cc0695 100644 --- a/django/db/backends/sqlite3/introspection.py +++ b/django/db/backends/sqlite3/introspection.py @@ -40,7 +40,7 @@ class FlexibleFieldLookupDict: import re m = re.search(r'^\s*(?:var)?char\s*\(\s*(\d+)\s*\)\s*$', key) if m: - return ('CharField', {'maxlength': m.group(1)}) + return ('CharField', {'maxlength': int(m.group(1))}) raise KeyError DATA_TYPES_REVERSE = FlexibleFieldLookupDict() diff --git a/docs/admin_css.txt b/docs/admin_css.txt index ec7029f739..419e0bcd42 100644 --- a/docs/admin_css.txt +++ b/docs/admin_css.txt @@ -26,10 +26,13 @@ whole group. Column Types ============ +.. admonition:: Note + + In the Django development version, all admin pages (except the dashboard) are fluid-width. All fixed-width classes have been removed. + The base template for each admin page has a block that defines the column structure for the page. This sets a class on the page content area -(``div#content``) so everything on the page knows how wide it should be. So far -there are three options available, and one special hybrid option. +(``div#content``) so everything on the page knows how wide it should be. There are three column types available. colM This is the default column setting for all pages. The "M" stands for "main". @@ -43,27 +46,25 @@ colMS colSM Same as above, with the sidebar on the left. The source order of the columns doesn't matter. -colM superwide +colM superwide (removed in Django development version) This is for ridiculously wide pages. Doesn't really work very well for anything but colM. With superwide, you've got 1000px to work with. Don't waste them. -flex +flex (removed in Django development version) This is for liquid-width pages, such as changelists. Currently only works with single-column pages (does not combine with ``.colMS`` or ``.colSM``). Form pages should never use ``.flex``. -For instance, you could stick this in a template to make a superwide page:: +For instance, you could stick this in a template to make a two-column page with the sidebar on the right:: - {% block coltype %}colM superwide{% endblock %} + {% block coltype %}colMS{% endblock %} -or this to make a liquid-width page (note that ``flex`` replaces ``colM``, so -both classes are not required):: - - {% block coltype %}flex{% endblock %} Widths ====== +**Removed in Django development version (see note above).** + There's a whole mess of classes in the stylesheet for custom pixel widths on objects. They come in handy for tables and table cells, if you want to avoid using the ``width`` attribute. Each class sets the width to the number of pixels diff --git a/docs/db-api.txt b/docs/db-api.txt index 4476ba9bc8..b6f08be9a0 100644 --- a/docs/db-api.txt +++ b/docs/db-api.txt @@ -329,7 +329,7 @@ Given an instance of an object, related objects can be looked-up directly using convenience functions. For example, if ``p`` is a ``Poll`` instance, ``p.get_choice_list()`` will return a list of all associated choices. Astute readers will note that this is the same as -``choices.get_list(poll_id__exact=p.id)``, except clearer. +``choices.get_list(poll__id__exact=p.id)``, except clearer. Each type of relationship creates a set of methods on each object in the relationship. These methods are created in both directions, so objects that are diff --git a/docs/django-admin.txt b/docs/django-admin.txt index 750bb58970..36ebe8ba67 100644 --- a/docs/django-admin.txt +++ b/docs/django-admin.txt @@ -92,6 +92,24 @@ Use this if you have a legacy database with which you'd like to use Django. The script will inspect the database and create a model for each table within it. +As you might expect, the created models will have an attribute for every field +in the table. Note that ``inspectdb`` has a few special cases in its field-name +output: + + * If ``inspectdb`` cannot map a column's type to a model field type, it'll + use ``TextField`` and will insert the Python comment + ``'This field type is a guess.'`` next to the field in the generated + model. + + * **New in Django development version.** If the database column name is a + Python reserved word (such as ``'pass'``, ``'class'`` or ``'for'``), + ``inspectdb`` will append ``'_field'`` to the attribute name. For + example, if a table has a column ``'for'``, the generated model will have + a field ``'for_field'``, with the ``db_column`` attribute set to + ``'for'``. ``inspectdb`` will insert the Python comment + ``'Field renamed because it was a Python reserved word.'`` next to the + field. + This feature is meant as a shortcut, not as definitive model generation. After you run it, you'll want to look over the generated models yourself to make customizations. In particular, you'll need to do this: diff --git a/docs/faq.txt b/docs/faq.txt index 786653b9d0..0dd4cbcc37 100644 --- a/docs/faq.txt +++ b/docs/faq.txt @@ -342,9 +342,9 @@ Using a ``FileField`` or an ``ImageField`` in a model takes a few steps: If I make changes to a model, how do I update the database? ----------------------------------------------------------- -If you don't care about clearing data, just pipe the output of the -appropriate ``django-admin.py sqlreset`` command into your database's -command-line utility. For example:: +If you don't mind clearing data, just pipe the output of the appropriate +``django-admin.py sqlreset`` command into your database's command-line utility. +For example:: django-admin.py sqlreset appname | psql dbname @@ -396,6 +396,7 @@ dictionaries in order of query execution. Each dictionary has the following:: ``time`` -- How long the statement took to execute, in seconds. ``db.queries`` includes all SQL statements -- INSERTs, UPDATES, SELECTs, etc. +Each time your app hits the database, the query will be recorded. Can I use Django with a pre-existing database? ---------------------------------------------- diff --git a/docs/settings.txt b/docs/settings.txt index 75044cc61e..0fd0a8075f 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -343,6 +343,17 @@ Subject-line prefix for e-mail messages sent with ``django.core.mail.mail_admins or ``django.core.mail.mail_managers``. You'll probably want to include the trailing space. +ENABLE_PSYCO +------------ + +Default: ``False`` + +**New in Django development version.** + +Whether to enable Psyco, which optimizes Python code. Requires Psyco_. + +.. _Psyco: http://psyco.sourceforge.net/ + IGNORABLE_404_ENDS ------------------