From d35d1f15814c2cf520e2c71a7f483673d0b422a5 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Fri, 4 Nov 2005 14:48:57 +0000 Subject: [PATCH 1/4] Fixed bug in django.utils.decorators.decorator_from_middleware -- it wasn't raising exceptions. Refs #641 git-svn-id: http://code.djangoproject.com/svn/django/trunk@1076 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/utils/decorators.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/django/utils/decorators.py b/django/utils/decorators.py index 074532e741..3ec5b4cbbf 100644 --- a/django/utils/decorators.py +++ b/django/utils/decorators.py @@ -23,7 +23,7 @@ def decorator_from_middleware(middleware_class): result = middleware.process_exception(request, e) if result is not None: return result - raise e + raise if hasattr(middleware, 'process_response'): result = middleware.process_response(request, response) if result is not None: From 9f92a2b92ba9145ca573c40113d571375367e5bd Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Fri, 4 Nov 2005 14:53:24 +0000 Subject: [PATCH 2/4] Renamed 'Traditional Chinese' to 'Simplified Chinese' and updated po files git-svn-id: http://code.djangoproject.com/svn/django/trunk@1077 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/global_settings.py | 7 +- django/conf/locale/cs/LC_MESSAGES/django.po | 238 ++++++++--------- django/conf/locale/de/LC_MESSAGES/django.po | 244 +++++++++--------- django/conf/locale/en/LC_MESSAGES/django.po | 208 +++++++-------- django/conf/locale/es/LC_MESSAGES/django.po | 242 ++++++++--------- django/conf/locale/fr/LC_MESSAGES/django.po | 244 +++++++++--------- django/conf/locale/gl/LC_MESSAGES/django.po | 240 ++++++++--------- django/conf/locale/it/LC_MESSAGES/django.po | 240 ++++++++--------- .../conf/locale/pt_BR/LC_MESSAGES/django.po | 240 ++++++++--------- django/conf/locale/ru/LC_MESSAGES/django.po | 240 ++++++++--------- django/conf/locale/sr/LC_MESSAGES/django.po | 238 ++++++++--------- .../conf/locale/zh_CN/LC_MESSAGES/django.po | 234 ++++++++--------- 12 files changed, 1307 insertions(+), 1308 deletions(-) diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 70d38d6993..371eac25ad 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -30,9 +30,8 @@ TIME_ZONE = 'America/Chicago' # http://blogs.law.harvard.edu/tech/stories/storyReader$15 LANGUAGE_CODE = 'en-us' -# Languages we provide translations for out of the base. The -# language name should be the utf-8 encoded local name for the -# language. +# Languages we provide translations for, out of the box. The language name +# should be the utf-8 encoded local name for the language. LANGUAGES = ( ('cs', _('Czech')), ('de', _('German')), @@ -44,7 +43,7 @@ LANGUAGES = ( ('pt-br', _('Brazilian')), ('ru', _('Russian')), ('sr', _('Serbian')), - ('zh-cn', _('Traditional Chinese')), + ('zh-cn', _('Simplified Chinese')), ) # Not-necessarily-technical managers of the site. They get broken link diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index 1c091b014c..94c5e896b5 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\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-04 08:50-0600\n" "PO-Revision-Date: 2005-10-31 19:42+0100\n" "Last-Translator: Radek Svarz \n" "Language-Team: Czech\n" @@ -15,17 +15,59 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "Vítejte," + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr "Změnit heslo" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "Odhlásit se" + #: contrib/admin/templates/admin/base.html:29 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 msgid "Home" msgstr "Domů" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Stránka nenalezena" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena." + +#: contrib/admin/templates/admin/500.html:4 +#, fuzzy +msgid "Server error" +msgstr "Chyba serveru (500)" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "Chyba serveru (500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "Chyba serveru (500)" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"Nastala chyba. Ta byla oznámena administrátorovi serveru pomocí e-mailu a " +"měla by být brzy odstraněna. Děkujeme za trpělivost." + #: contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "Historie" @@ -62,35 +104,28 @@ msgstr "Django správa webu" msgid "Django administration" msgstr "Django správa" -#: contrib/admin/templates/admin/500.html:4 -#, fuzzy -msgid "Server error" -msgstr "Chyba serveru (500)" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Chyba serveru (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Chyba serveru (500)" - -#: contrib/admin/templates/admin/500.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, fuzzy, python-format 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." +"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 "" -"Nastala chyba. Ta byla oznámena administrátorovi serveru pomocí e-mailu a " -"měla by být brzy odstraněna. Děkujeme za trpělivost." +"Mazání %(object_name)s '%(object)s' by vyústilo v mazání souvisejících " +"objektů, ale Váš účet nemá oprávnění pro mazání následujících typů objektů:" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Stránka nenalezena" +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"Jste si jist(á), že chcete smazat %(object_name)s \"%(object)s\"? Všechny " +"následující související položky budou smazány:" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena." +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" +msgstr "Ano, jsem si jist" #: contrib/admin/templates/admin/index.html:27 msgid "Add" @@ -132,40 +167,13 @@ msgstr "Zapomněl(a) jste své heslo?" msgid "Log in" msgstr "Přihlášení" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr "Vítejte," +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Děkujeme Vám za Váš strávený čas na našich webových stránkách." -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr "Změnit heslo" - -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Odhlásit se" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, fuzzy, python-format -msgid "" -"Deleting the %(object_name)s '%(object)s' would result in deleting related " -"objects, but your account doesn't have permission to delete the following " -"types of objects:" -msgstr "" -"Mazání %(object_name)s '%(object)s' by vyústilo v mazání souvisejících " -"objektů, ale Váš účet nemá oprávnění pro mazání následujících typů objektů:" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " -"the following related items will be deleted:" -msgstr "" -"Jste si jist(á), že chcete smazat %(object_name)s \"%(object)s\"? Všechny " -"následující související položky budou smazány:" - -#: contrib/admin/templates/admin/delete_confirmation.html:18 -msgid "Yes, I'm sure" -msgstr "Ano, jsem si jist" +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Přihlašte se znova" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -183,49 +191,6 @@ msgstr "Změna hesla byla úspěšná" msgid "Your password was changed." msgstr "Vaše heslo bylo změněno." -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr "Obnovení hesla" - -#: contrib/admin/templates/registration/password_reset_form.html:12 -msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll reset " -"your password and e-mail the new one to you." -msgstr "" -"Zapomněl(a) jste heslo? Vložte níže Vaši e-mailovou adresu a my Vaše heslo " -"obnovíme a zašleme Vám e-mailem nové." - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "E-mailová adresa:" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "Obnovit mé heslo" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "Děkujeme Vám za Váš strávený čas na našich webových stránkách." - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "Přihlašte se znova" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -msgid "Password reset successful" -msgstr "Obnovení hesla bylo úspěšné" - -#: contrib/admin/templates/registration/password_reset_done.html:12 -msgid "" -"We've e-mailed a new password to the e-mail address you submitted. You " -"should be receiving it shortly." -msgstr "" -"Poslali jsme Vám e-mailem nové heslo na adresu, kterou jste zadal(a). Měl(a) " -"byste ji dostat během okamžiku." - #: contrib/admin/templates/registration/password_change_form.html:12 msgid "" "Please enter your old password, for security's sake, and then enter your new " @@ -250,6 +215,25 @@ msgstr "Potvrdit heslo:" msgid "Change my password" msgstr "Změnit mé heslo:" +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Password reset" +msgstr "Obnovení hesla" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "Obnovení hesla bylo úspěšné" + +#: contrib/admin/templates/registration/password_reset_done.html:12 +msgid "" +"We've e-mailed a new password to the e-mail address you submitted. You " +"should be receiving it shortly." +msgstr "" +"Poslali jsme Vám e-mailem nové heslo na adresu, kterou jste zadal(a). Měl(a) " +"byste ji dostat během okamžiku." + #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "Dostal(a) jste tento e-mail, protože jste požádal(a) o obnovení hesla" @@ -281,6 +265,22 @@ msgstr "Děkujeme za používání našeho webu!" msgid "The %(site_name)s team" msgstr "Tým %(site_name)s" +#: contrib/admin/templates/registration/password_reset_form.html:12 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll reset " +"your password and e-mail the new one to you." +msgstr "" +"Zapomněl(a) jste heslo? Vložte níže Vaši e-mailovou adresu a my Vaše heslo " +"obnovíme a zašleme Vám e-mailem nové." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "E-mailová adresa:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Obnovit mé heslo" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "čas akce" @@ -655,50 +655,50 @@ msgstr "Důležitá data" msgid "Message" msgstr "Zpráva" -#: conf/global_settings.py:37 +#: conf/global_settings.py:36 msgid "Czech" msgstr "Česky" -#: conf/global_settings.py:38 +#: conf/global_settings.py:37 msgid "German" msgstr "Německy" -#: conf/global_settings.py:39 +#: conf/global_settings.py:38 msgid "English" msgstr "Anglicky" -#: conf/global_settings.py:40 +#: conf/global_settings.py:39 msgid "Spanish" msgstr "Španělsky" -#: conf/global_settings.py:41 +#: conf/global_settings.py:40 msgid "French" msgstr "Francouzsky" -#: conf/global_settings.py:42 +#: conf/global_settings.py:41 #, fuzzy msgid "Galician" msgstr "Galicijský" -#: conf/global_settings.py:43 +#: conf/global_settings.py:42 msgid "Italian" msgstr "Italsky" -#: conf/global_settings.py:44 +#: conf/global_settings.py:43 msgid "Brazilian" msgstr "Brazilsky" -#: conf/global_settings.py:45 +#: conf/global_settings.py:44 msgid "Russian" msgstr "Rusky" -#: conf/global_settings.py:46 +#: conf/global_settings.py:45 #, fuzzy msgid "Serbian" msgstr "Srbsky" -#: conf/global_settings.py:47 -msgid "Traditional Chinese" +#: conf/global_settings.py:46 +msgid "Simplified Chinese" msgstr "" #: core/validators.py:58 diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 337076bae4..bc585a3c08 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -7,24 +7,67 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-04 08:50-0600\n" "PO-Revision-Date: 2005-10-08 00:03+0200\n" "Last-Translator: Georg Bauer \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "Willkommen," + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr "Passwort ndern" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "Abmelden" + #: contrib/admin/templates/admin/base.html:29 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 msgid "Home" msgstr "Start" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Seite nicht gefunden" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "" +"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden." + +#: contrib/admin/templates/admin/500.html:4 +msgid "Server error" +msgstr "Serverfehler" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "Serverfehler (500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "Serverfehler (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 "" +"Es hat einen Fehler gegeben. Dieser Fehler wurde an die Serververwalter per " +"eMail weitergegeben und sollte bald behoben sein. Vielen Dank fr Ihr " +"Verstndnis." + #: contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "Geschichte" @@ -61,36 +104,29 @@ msgstr "Django Systemverwaltung" msgid "Django administration" msgstr "Django Verwaltung" -#: contrib/admin/templates/admin/500.html:4 -msgid "Server error" -msgstr "Serverfehler" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Serverfehler (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Serverfehler (500)" - -#: contrib/admin/templates/admin/500.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, python-format 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." +"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 "" -"Es hat einen Fehler gegeben. Dieser Fehler wurde an die Serververwalter per " -"eMail weitergegeben und sollte bald behoben sein. Vielen Dank fr Ihr " -"Verstndnis." +"Die Lschung des %(object_name)s '%(object)s' htte die Lschung von " +"abhngigen Daten zur Folge, aber Sie haben nicht die ntigen Rechte um die " +"folgenden abhngigen Daten zu lschen:" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Seite nicht gefunden" - -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" msgstr "" -"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden." +"Sind Sie sicher, das Sie %(object_name)s \"%(object)s\" lschen wollen? Es " +"werden zustzlich die folgenden abhngigen Daten mit gelscht:" + +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" +msgstr "Ja, ich bin sicher" #: contrib/admin/templates/admin/index.html:27 msgid "Add" @@ -132,41 +168,13 @@ msgstr "Haben Sie ihr Passwort vergessen?" msgid "Log in" msgstr "Anmelden" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr "Willkommen," +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Danke, dass Sie eine Weile bei uns waren." -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr "Passwort ndern" - -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Abmelden" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, python-format -msgid "" -"Deleting the %(object_name)s '%(object)s' would result in deleting related " -"objects, but your account doesn't have permission to delete the following " -"types of objects:" -msgstr "" -"Die Lschung des %(object_name)s '%(object)s' htte die Lschung von " -"abhngigen Daten zur Folge, aber Sie haben nicht die ntigen Rechte um die " -"folgenden abhngigen Daten zu lschen:" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " -"the following related items will be deleted:" -msgstr "" -"Sind Sie sicher, das Sie %(object_name)s \"%(object)s\" lschen wollen? Es " -"werden zustzlich die folgenden abhngigen Daten mit gelscht:" - -#: contrib/admin/templates/admin/delete_confirmation.html:18 -msgid "Yes, I'm sure" -msgstr "Ja, ich bin sicher" +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Neu anmelden" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -184,50 +192,6 @@ msgstr "Erfolgreiche Kennwort msgid "Your password was changed." msgstr "Ihr Kennwort wurde gendert." -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr "Kennwort zurcksetzen" - -#: 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 "" -"Sie haben Ihr Kennwort vergessen? Geben Sie bitte Ihre eMail-Adresse ein und " -"wir setzen das Kennwort auf einen neuen Wert und schicken den per eMail an " -"Sie raus." - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "eMail-Adresse:" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "Mein Kennwort zurcksetzen" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "Danke, dass Sie eine Weile bei uns waren." - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "Neu anmelden" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -msgid "Password reset successful" -msgstr "Erfolgreich Kennwort zurckgesetzt" - -#: 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 "" -"Wir haben Ihnen ein neues Kennwort per eMail zugeschickt an die Adresse, die " -"Sie uns gegeben haben. Es sollte in Krze ankommen." - #: contrib/admin/templates/registration/password_change_form.html:12 msgid "" "Please enter your old password, for security's sake, and then enter your new " @@ -253,6 +217,25 @@ msgstr "Kennwortwiederholung:" msgid "Change my password" msgstr "Mein Kennwort ndern" +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Password reset" +msgstr "Kennwort zurcksetzen" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "Erfolgreich Kennwort zurckgesetzt" + +#: 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 "" +"Wir haben Ihnen ein neues Kennwort per eMail zugeschickt an die Adresse, die " +"Sie uns gegeben haben. Es sollte in Krze ankommen." + #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "Sie erhalten diese Mail, weil Sie ein neues Kennwort" @@ -284,6 +267,23 @@ msgstr "Vielen Dank, das Sie unsere Seiten benutzen!" msgid "The %(site_name)s team" msgstr "Das Team von %(site_name)s" +#: 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 "" +"Sie haben Ihr Kennwort vergessen? Geben Sie bitte Ihre eMail-Adresse ein und " +"wir setzen das Kennwort auf einen neuen Wert und schicken den per eMail an " +"Sie raus." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "eMail-Adresse:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Mein Kennwort zurcksetzen" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "Zeit der Aktion" @@ -656,48 +656,48 @@ msgstr "Wichtige Daten" msgid "Message" msgstr "Mitteilung" -#: conf/global_settings.py:37 +#: conf/global_settings.py:36 msgid "Czech" msgstr "Tschechisch" -#: conf/global_settings.py:38 +#: conf/global_settings.py:37 msgid "German" msgstr "Deutsch" -#: conf/global_settings.py:39 +#: conf/global_settings.py:38 msgid "English" msgstr "Englisch" -#: conf/global_settings.py:40 +#: conf/global_settings.py:39 msgid "Spanish" msgstr "Spanisch" -#: conf/global_settings.py:41 +#: conf/global_settings.py:40 msgid "French" msgstr "Franzsisch" -#: conf/global_settings.py:42 +#: conf/global_settings.py:41 msgid "Galician" msgstr "Galicisch" -#: conf/global_settings.py:43 +#: conf/global_settings.py:42 msgid "Italian" msgstr "Italienisch" -#: conf/global_settings.py:44 +#: conf/global_settings.py:43 msgid "Brazilian" msgstr "Brasilianisch" -#: conf/global_settings.py:45 +#: conf/global_settings.py:44 msgid "Russian" msgstr "Russisch" -#: conf/global_settings.py:46 +#: conf/global_settings.py:45 msgid "Serbian" msgstr "Serbisch" -#: conf/global_settings.py:47 -msgid "Traditional Chinese" +#: conf/global_settings.py:46 +msgid "Simplified Chinese" msgstr "" #: core/validators.py:58 diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 539b8b5015..78ba5ccdd0 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-04 08:50-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,17 +16,56 @@ msgstr "" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr "" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "" + #: contrib/admin/templates/admin/base.html:29 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 msgid "Home" msgstr "" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "" + +#: contrib/admin/templates/admin/500.html:4 +msgid "Server error" +msgstr "" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "" + +#: 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 "" + #: contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "" @@ -61,31 +100,23 @@ msgstr "" msgid "Django administration" msgstr "" -#: contrib/admin/templates/admin/500.html:4 -msgid "Server error" -msgstr "" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "" - -#: contrib/admin/templates/admin/500.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, python-format 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." +"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 "" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" msgstr "" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" msgstr "" #: contrib/admin/templates/admin/index.html:27 @@ -128,35 +159,12 @@ msgstr "" msgid "Log in" msgstr "" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." msgstr "" -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr "" - -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, python-format -msgid "" -"Deleting the %(object_name)s '%(object)s' would result in deleting related " -"objects, but your account doesn't have permission to delete the following " -"types of objects:" -msgstr "" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " -"the following related items will be deleted:" -msgstr "" - -#: contrib/admin/templates/admin/delete_confirmation.html:18 -msgid "Yes, I'm sure" +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" msgstr "" #: contrib/admin/templates/registration/password_change_done.html:4 @@ -175,45 +183,6 @@ msgstr "" msgid "Your password was changed." msgstr "" -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr "" - -#: contrib/admin/templates/registration/password_reset_form.html:12 -msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll reset " -"your password and e-mail the new one to you." -msgstr "" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "" - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -msgid "Password reset successful" -msgstr "" - -#: contrib/admin/templates/registration/password_reset_done.html:12 -msgid "" -"We've e-mailed a new password to the e-mail address you submitted. You " -"should be receiving it shortly." -msgstr "" - #: contrib/admin/templates/registration/password_change_form.html:12 msgid "" "Please enter your old password, for security's sake, and then enter your new " @@ -236,6 +205,23 @@ msgstr "" msgid "Change my password" msgstr "" +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Password reset" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_done.html:12 +msgid "" +"We've e-mailed a new password to the e-mail address you submitted. You " +"should be receiving it shortly." +msgstr "" + #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "" @@ -267,6 +253,20 @@ msgstr "" msgid "The %(site_name)s team" msgstr "" +#: contrib/admin/templates/registration/password_reset_form.html:12 +msgid "" +"Forgotten your password? Enter your e-mail address below, and we'll reset " +"your password and e-mail the new one to you." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "" @@ -628,48 +628,48 @@ msgstr "" msgid "Message" msgstr "" -#: conf/global_settings.py:37 +#: conf/global_settings.py:36 msgid "Czech" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:37 msgid "German" msgstr "" -#: conf/global_settings.py:39 +#: conf/global_settings.py:38 msgid "English" msgstr "" -#: conf/global_settings.py:40 +#: conf/global_settings.py:39 msgid "Spanish" msgstr "" -#: conf/global_settings.py:41 +#: conf/global_settings.py:40 msgid "French" msgstr "" -#: conf/global_settings.py:42 +#: conf/global_settings.py:41 msgid "Galician" msgstr "" -#: conf/global_settings.py:43 +#: conf/global_settings.py:42 msgid "Italian" msgstr "" -#: conf/global_settings.py:44 +#: conf/global_settings.py:43 msgid "Brazilian" msgstr "" -#: conf/global_settings.py:45 +#: conf/global_settings.py:44 msgid "Russian" msgstr "" -#: conf/global_settings.py:46 +#: conf/global_settings.py:45 msgid "Serbian" msgstr "" -#: conf/global_settings.py:47 -msgid "Traditional Chinese" +#: conf/global_settings.py:46 +msgid "Simplified Chinese" msgstr "" #: core/validators.py:58 diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index 7a00bc51a3..fa94d3ec10 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-04 08:50-0600\n" "PO-Revision-Date: 2005-10-04 20:59GMT\n" "Last-Translator: Ricardo Javier Crdenes Medina \n" @@ -17,17 +17,60 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.10.2\n" -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "Bienvenido," + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr "Cambiar clave" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "Terminar" + #: contrib/admin/templates/admin/base.html:29 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 msgid "Home" msgstr "Inicio" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Pgina no encontrada" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Lo sentimos, pero no se encuentra la pgina solicitada." + +#: contrib/admin/templates/admin/500.html:4 +#, fuzzy +msgid "Server error" +msgstr "Error del servidor (500)" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "Error del servidor (500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "Error de 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 "" +"Ha ocurrido un error. Se ha informado a los administradores del sitio " +"mediante correo electrnico y debera arreglarse en breve. Gracias por su " +"paciencia" + #: contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "Histrico" @@ -64,36 +107,29 @@ msgstr "Sitio de administraci msgid "Django administration" msgstr "Administracin de Django" -#: contrib/admin/templates/admin/500.html:4 -#, fuzzy -msgid "Server error" -msgstr "Error del servidor (500)" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Error del servidor (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Error de servidor (500)" - -#: contrib/admin/templates/admin/500.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, fuzzy, python-format 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." +"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 "" -"Ha ocurrido un error. Se ha informado a los administradores del sitio " -"mediante correo electrnico y debera arreglarse en breve. Gracias por su " -"paciencia" +"Eliminar el %(object_name)s '%(object)s' provocara la eliminacin de " +"objetos relacionados, pero su cuenta no tiene permiso para borrar los " +"siguientes tipos de objetos:" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Pgina no encontrada" +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"Est seguro de que quiere borrar los %(object_name)s \"%(object)s\"? Se " +"borrarn los siguientes objetos relacionados:" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Lo sentimos, pero no se encuentra la pgina solicitada." +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" +msgstr "S, estoy seguro" #: contrib/admin/templates/admin/index.html:27 msgid "Add" @@ -135,41 +171,13 @@ msgstr " msgid "Log in" msgstr "Registrarse" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr "Bienvenido," +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy." -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr "Cambiar clave" - -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Terminar" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, fuzzy, 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 "" -"Eliminar el %(object_name)s '%(object)s' provocara la eliminacin de " -"objetos relacionados, pero su cuenta no tiene permiso para borrar los " -"siguientes tipos de objetos:" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " -"the following related items will be deleted:" -msgstr "" -"Est seguro de que quiere borrar los %(object_name)s \"%(object)s\"? Se " -"borrarn los siguientes objetos relacionados:" - -#: contrib/admin/templates/admin/delete_confirmation.html:18 -msgid "Yes, I'm sure" -msgstr "S, estoy seguro" +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Registrarse de nuevo" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -187,49 +195,6 @@ msgstr "Cambio de clave con msgid "Your password was changed." msgstr "Su clave ha cambiado." -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr "Recuperar clave" - -#: 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 "" -"Ha olvidado su clave? Introduzca su direccin de correo, y crearemos una " -"nueva que le enviaremos por correo." - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "Direccin de correo:" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "Recuperar mi clave" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy." - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "Registrarse de nuevo" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -msgid "Password reset successful" -msgstr "Recuperacin de clave con xito" - -#: 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 "" -"Le hemos enviado una clave nueva a la direccin que ha suministrado. Debera " -"recibirla en 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 " @@ -254,6 +219,25 @@ msgstr "Confirme clave:" msgid "Change my password" msgstr "Cambiar mi clave" +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Password reset" +msgstr "Recuperar clave" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "Recuperacin de clave con xito" + +#: 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 "" +"Le hemos enviado una clave nueva a la direccin que ha suministrado. Debera " +"recibirla en breve." + #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "Recibe este mensaje debido a que solicit recuperar la clave" @@ -285,6 +269,22 @@ msgstr " msgid "The %(site_name)s team" msgstr "El equipo de %(site_name)s" +#: 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 "" +"Ha olvidado su clave? Introduzca su direccin de correo, y crearemos una " +"nueva que le enviaremos por correo." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "Direccin de correo:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Recuperar mi clave" + #: contrib/admin/models/admin.py:6 #, fuzzy msgid "action time" @@ -652,48 +652,48 @@ msgstr "" msgid "Message" msgstr "" -#: conf/global_settings.py:37 +#: conf/global_settings.py:36 msgid "Czech" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:37 msgid "German" msgstr "" -#: conf/global_settings.py:39 +#: conf/global_settings.py:38 msgid "English" msgstr "" -#: conf/global_settings.py:40 +#: conf/global_settings.py:39 msgid "Spanish" msgstr "" -#: conf/global_settings.py:41 +#: conf/global_settings.py:40 msgid "French" msgstr "" -#: conf/global_settings.py:42 +#: conf/global_settings.py:41 msgid "Galician" msgstr "" -#: conf/global_settings.py:43 +#: conf/global_settings.py:42 msgid "Italian" msgstr "" -#: conf/global_settings.py:44 +#: conf/global_settings.py:43 msgid "Brazilian" msgstr "" -#: conf/global_settings.py:45 +#: conf/global_settings.py:44 msgid "Russian" msgstr "" -#: conf/global_settings.py:46 +#: conf/global_settings.py:45 msgid "Serbian" msgstr "" -#: conf/global_settings.py:47 -msgid "Traditional Chinese" +#: conf/global_settings.py:46 +msgid "Simplified Chinese" msgstr "" #: core/validators.py:58 diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index 6e88cc51f4..d0b99803ab 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-04 08:50-0600\n" "PO-Revision-Date: 2005-10-18 12:27+0200\n" "Last-Translator: Laurent Rahuel \n" "Language-Team: franais \n" @@ -15,17 +15,60 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "Bienvenue," + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr "Modifier votre mot de passe" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "Dconnection" + #: contrib/admin/templates/admin/base.html:29 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 msgid "Home" msgstr "Accueil" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Cette page n'a pas t trouve" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Nous sommes dsols, mais la page demande est introuvable." + +#: contrib/admin/templates/admin/500.html:4 +#, fuzzy +msgid "Server error" +msgstr "Erreur du serveur (500)" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "Erreur du serveur (500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "Erreur du serveur (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 "" +"Une erreur est survenue. Elle a t transmise par courriel aux " +"administrateurs du site et sera corrige dans les meilleurs dlais. Merci " +"pour votre patience." + #: contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "Historique" @@ -62,36 +105,29 @@ msgstr "Site d'administration de Django" msgid "Django administration" msgstr "Administration de Django" -#: contrib/admin/templates/admin/500.html:4 -#, fuzzy -msgid "Server error" -msgstr "Erreur du serveur (500)" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Erreur du serveur (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Erreur du serveur (500)" - -#: contrib/admin/templates/admin/500.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, fuzzy, python-format 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." +"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 "" -"Une erreur est survenue. Elle a t transmise par courriel aux " -"administrateurs du site et sera corrige dans les meilleurs dlais. Merci " -"pour votre patience." +"Supprimer %(object_name)s '%(object)s' provoquerait la suppression des " +"objets qui lui sont lis mais votre compte ne possde pas la permission de " +"supprimer les types d'objets suivants:" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Cette page n'a pas t trouve" +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"tes vous certain de vouloir supprimer %(object_name)s \"%(object)s\"? Tous " +"les lments lis suivants seront supprims:" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Nous sommes dsols, mais la page demande est introuvable." +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" +msgstr "Oui, je suis certain" #: contrib/admin/templates/admin/index.html:27 msgid "Add" @@ -133,41 +169,13 @@ msgstr "Avez vous perdu votre mot de passe?" msgid "Log in" msgstr "Connectez vous" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr "Bienvenue," +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Merci pour le temps que vous avez accord au site aujourd'hui." -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr "Modifier votre mot de passe" - -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Dconnection" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, fuzzy, 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 "" -"Supprimer %(object_name)s '%(object)s' provoquerait la suppression des " -"objets qui lui sont lis mais votre compte ne possde pas la permission de " -"supprimer les types d'objets suivants:" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " -"the following related items will be deleted:" -msgstr "" -"tes vous certain de vouloir supprimer %(object_name)s \"%(object)s\"? Tous " -"les lments lis suivants seront supprims:" - -#: contrib/admin/templates/admin/delete_confirmation.html:18 -msgid "Yes, I'm sure" -msgstr "Oui, je suis certain" +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Connectez vous nouveau" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -185,50 +193,6 @@ msgstr "Mot de passe modifi msgid "Your password was changed." msgstr "Votre mot de passe a t modifi." -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr "Rinitialisation de votre mot de passe" - -#: 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 "" -"Mot de passe perdu ? Saisissez votre adresse de courriel ci-dessous et nous " -"annulerons votre mot de passe actuel avant de vous en faire parvenir un " -"nouveau par courriel." - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "Courriel:" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "Rinitialiser mon mot de passe" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "Merci pour le temps que vous avez accord au site aujourd'hui." - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "Connectez vous nouveau" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -msgid "Password reset successful" -msgstr "Mot de passe rinitialis avec succs" - -#: 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 "" -"Nous vous avons envoy par courriel un nouveau mot de passe. Vous devriez le " -"recevoir rapidement." - #: contrib/admin/templates/registration/password_change_form.html:12 msgid "" "Please enter your old password, for security's sake, and then enter your new " @@ -254,6 +218,25 @@ msgstr "Confirmation de votre nouveau mot de passe" msgid "Change my password" msgstr "Modifier mon mot de passe" +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Password reset" +msgstr "Rinitialisation de votre mot de passe" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "Mot de passe rinitialis avec succs" + +#: 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 "" +"Nous vous avons envoy par courriel un nouveau mot de passe. Vous devriez le " +"recevoir rapidement." + #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "" @@ -286,6 +269,23 @@ msgstr "Merci d'utiliser notre site!" msgid "The %(site_name)s team" msgstr "L'quipe %(site_name)s" +#: 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 "" +"Mot de passe perdu ? Saisissez votre adresse de courriel ci-dessous et nous " +"annulerons votre mot de passe actuel avant de vous en faire parvenir un " +"nouveau par courriel." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "Courriel:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Rinitialiser mon mot de passe" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "heure de l'action" @@ -660,50 +660,50 @@ msgstr "Dates importantes" msgid "Message" msgstr "Message" -#: conf/global_settings.py:37 +#: conf/global_settings.py:36 msgid "Czech" msgstr "Tchque" -#: conf/global_settings.py:38 +#: conf/global_settings.py:37 msgid "German" msgstr "Allemand" -#: conf/global_settings.py:39 +#: conf/global_settings.py:38 msgid "English" msgstr "Anglais" -#: conf/global_settings.py:40 +#: conf/global_settings.py:39 msgid "Spanish" msgstr "Espagnol" -#: conf/global_settings.py:41 +#: conf/global_settings.py:40 msgid "French" msgstr "Franais" -#: conf/global_settings.py:42 +#: conf/global_settings.py:41 msgid "Galician" msgstr "Galicien" -#: conf/global_settings.py:43 +#: conf/global_settings.py:42 #, fuzzy msgid "Italian" msgstr "Italien" -#: conf/global_settings.py:44 +#: conf/global_settings.py:43 msgid "Brazilian" msgstr "Brsilien" -#: conf/global_settings.py:45 +#: conf/global_settings.py:44 msgid "Russian" msgstr "Russe" -#: conf/global_settings.py:46 +#: conf/global_settings.py:45 #, fuzzy msgid "Serbian" msgstr "Serbe" -#: conf/global_settings.py:47 -msgid "Traditional Chinese" +#: conf/global_settings.py:46 +msgid "Simplified Chinese" msgstr "" #: core/validators.py:58 diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po index 504316742c..b6ddd32a90 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.po +++ b/django/conf/locale/gl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-04 08:50-0600\n" "PO-Revision-Date: 2005-10-16 14:29+0100\n" "Last-Translator: Afonso Fernández Nogueira \n" "Language-Team: Galego\n" @@ -17,17 +17,59 @@ msgstr "" "X-Poedit-Language: Galician\n" "X-Poedit-SourceCharset: utf-8\n" -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "Benvido," + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr "Cambiar contrasinal" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "Saír" + #: contrib/admin/templates/admin/base.html:29 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 msgid "Home" msgstr "Inicio" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Páxina non atopada" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Sentímolo, pero non se atopou a páxina solicitada." + +#: contrib/admin/templates/admin/500.html:4 +#, fuzzy +msgid "Server error" +msgstr "Erro do servidor (500)" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "Erro do servidor (500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "Erro do 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 "" +"Houbo un erro. Xa se informou aos administradores do sitio por correo " +"electrónico e debería quedar arranxado pronto. Grazas pola súa paciencia." + #: contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "Histórico" @@ -64,35 +106,29 @@ msgstr "Administración de sitio Django" msgid "Django administration" msgstr "Administración de Django" -#: contrib/admin/templates/admin/500.html:4 -#, fuzzy -msgid "Server error" -msgstr "Erro do servidor (500)" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Erro do servidor (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Erro do servidor (500)" - -#: contrib/admin/templates/admin/500.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, fuzzy, python-format 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." +"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 "" -"Houbo un erro. Xa se informou aos administradores do sitio por correo " -"electrónico e debería quedar arranxado pronto. Grazas pola súa paciencia." +"Borrar o %(object_name)s '%(object)s' resultaría na eliminación de obxectos " +"relacionados, pero a súa conta non ten permiso para borrar os seguintes " +"tipos de obxectos:" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Páxina non atopada" +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"Seguro que quere borrar o %(object_name)s \"%(object)s\"? Eliminaranse os " +"seguintes obxectos relacionados:" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Sentímolo, pero non se atopou a páxina solicitada." +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" +msgstr "Si, estou seguro" #: contrib/admin/templates/admin/index.html:27 msgid "Add" @@ -134,41 +170,13 @@ msgstr "Esqueceu o contrasinal?" msgid "Log in" msgstr "Entrar" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr "Benvido," +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Grazas polo tempo que dedicou ao sitio web." -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr "Cambiar contrasinal" - -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Saír" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, fuzzy, 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 "" -"Borrar o %(object_name)s '%(object)s' resultaría na eliminación de obxectos " -"relacionados, pero a súa conta non ten permiso para borrar os seguintes " -"tipos de obxectos:" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " -"the following related items will be deleted:" -msgstr "" -"Seguro que quere borrar o %(object_name)s \"%(object)s\"? Eliminaranse os " -"seguintes obxectos relacionados:" - -#: contrib/admin/templates/admin/delete_confirmation.html:18 -msgid "Yes, I'm sure" -msgstr "Si, estou seguro" +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Entrar de novo" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -186,49 +194,6 @@ msgstr "O seu contrasinal cambiouse correctamente." msgid "Your password was changed." msgstr "Cambiouse o seu contrasinal." -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr "Recuperar o contrasinal" - -#: 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 o contrasinal? Introduza o seu enderezo de correo electrónico " -"embaixo e enviarémoslle un novo contrasinal." - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "Enderezo de correo electrónico:" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "Recuperar o meu contrasinal" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "Grazas polo tempo que dedicou ao sitio web." - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "Entrar de novo" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -msgid "Password reset successful" -msgstr "O contrasinal foi recuperado correctamente" - -#: 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 "" -"Acabamos de enviarlle un novo contrasinal ao enderezo de correo indicado. " -"Debería recibilo en 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 " @@ -253,6 +218,25 @@ msgstr "Confirmar contrasinal:" msgid "Change my password" msgstr "Cambiar o contrasinal" +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Password reset" +msgstr "Recuperar o contrasinal" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "O contrasinal foi recuperado correctamente" + +#: 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 "" +"Acabamos de enviarlle un novo contrasinal ao enderezo de correo indicado. " +"Debería recibilo en breve." + #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "Recibe esta mensaxe porque solicitou recuperar o contrasinal" @@ -284,6 +268,22 @@ msgstr "Grazas por usar o noso sitio web!" msgid "The %(site_name)s team" msgstr "O equipo de %(site_name)s" +#: 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 o contrasinal? Introduza o seu enderezo de correo electrónico " +"embaixo e enviarémoslle un novo contrasinal." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "Enderezo de correo electrónico:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Recuperar o meu contrasinal" + #: contrib/admin/models/admin.py:6 #, fuzzy msgid "action time" @@ -651,48 +651,48 @@ msgstr "" msgid "Message" msgstr "" -#: conf/global_settings.py:37 +#: conf/global_settings.py:36 msgid "Czech" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:37 msgid "German" msgstr "" -#: conf/global_settings.py:39 +#: conf/global_settings.py:38 msgid "English" msgstr "" -#: conf/global_settings.py:40 +#: conf/global_settings.py:39 msgid "Spanish" msgstr "" -#: conf/global_settings.py:41 +#: conf/global_settings.py:40 msgid "French" msgstr "" -#: conf/global_settings.py:42 +#: conf/global_settings.py:41 msgid "Galician" msgstr "" -#: conf/global_settings.py:43 +#: conf/global_settings.py:42 msgid "Italian" msgstr "" -#: conf/global_settings.py:44 +#: conf/global_settings.py:43 msgid "Brazilian" msgstr "" -#: conf/global_settings.py:45 +#: conf/global_settings.py:44 msgid "Russian" msgstr "" -#: conf/global_settings.py:46 +#: conf/global_settings.py:45 msgid "Serbian" msgstr "" -#: conf/global_settings.py:47 -msgid "Traditional Chinese" +#: conf/global_settings.py:46 +msgid "Simplified Chinese" msgstr "" #: core/validators.py:58 diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index 889cac0424..3c52a0393c 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-04 08:50-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,17 +16,59 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "Benvenuto," + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr "Cambia la password" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "Esci" + #: contrib/admin/templates/admin/base.html:29 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 msgid "Home" msgstr "Pagina iniziale" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Pagina non trovata" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Spiacente, ma la pagina richiesta non esiste." + +#: contrib/admin/templates/admin/500.html:4 +#, fuzzy +msgid "Server error" +msgstr "Errore del server (500)" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "Errore del server (500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "Errore del Server (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 "" +"C' stato un errore. E' stato riportato agli amministratori del sito via e-" +"mail e verr risolto a breve. Grazie per la pazienza." + #: contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "Storia" @@ -63,35 +105,29 @@ msgstr "Amministrazione sito Django" msgid "Django administration" msgstr "Amministrazione Django" -#: contrib/admin/templates/admin/500.html:4 -#, fuzzy -msgid "Server error" -msgstr "Errore del server (500)" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Errore del server (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Errore del Server (500)" - -#: contrib/admin/templates/admin/500.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, fuzzy, python-format 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." +"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 "" -"C' stato un errore. E' stato riportato agli amministratori del sito via e-" -"mail e verr risolto a breve. Grazie per la pazienza." +"La rimozione di %(object_name)s '%(object)s' causerebbe la cancellazione " +"degli oggetti relazionati, ma il tuo account non ha i permessi per rimuovere " +"i seguenti tipi di oggetti:" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Pagina non trovata" +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"Sei sicuro di voler rimuovere %(object_name)s \"%(object)s\"? I seguenti " +"oggetti relazionati saranno rimossi:" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Spiacente, ma la pagina richiesta non esiste." +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" +msgstr "S, sono sicuro" #: contrib/admin/templates/admin/index.html:27 msgid "Add" @@ -133,41 +169,13 @@ msgstr "Hai dimenticato la tua password?" msgid "Log in" msgstr "Accedi" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr "Benvenuto," +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Grazie per aver speso il tuo tempo prezioso con questo sito." -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr "Cambia la password" - -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Esci" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, fuzzy, 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 "" -"La rimozione di %(object_name)s '%(object)s' causerebbe la cancellazione " -"degli oggetti relazionati, ma il tuo account non ha i permessi per rimuovere " -"i seguenti tipi di oggetti:" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " -"the following related items will be deleted:" -msgstr "" -"Sei sicuro di voler rimuovere %(object_name)s \"%(object)s\"? I seguenti " -"oggetti relazionati saranno rimossi:" - -#: contrib/admin/templates/admin/delete_confirmation.html:18 -msgid "Yes, I'm sure" -msgstr "S, sono sicuro" +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Accedi di nuovo" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -185,49 +193,6 @@ msgstr "La password msgid "Your password was changed." msgstr "La tua password stata cambiata." -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr "Resetta la password" - -#: 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 "" -"Hai dimenticato la tua password? Inserisci il tuo indirizzo e-mail qui " -"sotto, la tua password sar resettata e te ne verr spedita una nuova." - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "Indirizzo e-mail:" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "Resetta la mia password" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "Grazie per aver speso il tuo tempo prezioso con questo sito." - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "Accedi di nuovo" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -msgid "Password reset successful" -msgstr "Password resettata con successo" - -#: 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 "" -"Ti abbiamo inviato la nuova password all'indirizzo e-mail da te selezionato. " -"Dovresti riceverla a 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 " @@ -252,6 +217,25 @@ msgstr "Conferma password:" msgid "Change my password" msgstr "Cambia la mia password" +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Password reset" +msgstr "Resetta la password" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "Password resettata con successo" + +#: 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 "" +"Ti abbiamo inviato la nuova password all'indirizzo e-mail da te selezionato. " +"Dovresti riceverla a breve." + #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "" @@ -284,6 +268,22 @@ msgstr "Ti ringraziamo per l'utilizzo del nostro sito!" msgid "The %(site_name)s team" msgstr "Il team di %(site_name)s" +#: contrib/admin/templates/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 "" +"Hai dimenticato la tua password? Inserisci il tuo indirizzo e-mail qui " +"sotto, la tua password sar resettata e te ne verr spedita una nuova." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "Indirizzo e-mail:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Resetta la mia password" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "data azione" @@ -653,49 +653,49 @@ msgstr "Date importanti" msgid "Message" msgstr "Messaggio" -#: conf/global_settings.py:37 +#: conf/global_settings.py:36 msgid "Czech" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:37 msgid "German" msgstr "Tedesco" -#: conf/global_settings.py:39 +#: conf/global_settings.py:38 msgid "English" msgstr "Inglese" -#: conf/global_settings.py:40 +#: conf/global_settings.py:39 msgid "Spanish" msgstr "Spagnolo" -#: conf/global_settings.py:41 +#: conf/global_settings.py:40 msgid "French" msgstr "Francese" -#: conf/global_settings.py:42 +#: conf/global_settings.py:41 msgid "Galician" msgstr "Galiziano" -#: conf/global_settings.py:43 +#: conf/global_settings.py:42 msgid "Italian" msgstr "Italiano" -#: conf/global_settings.py:44 +#: conf/global_settings.py:43 msgid "Brazilian" msgstr "Brasiliano" -#: conf/global_settings.py:45 +#: conf/global_settings.py:44 msgid "Russian" msgstr "Russo" -#: conf/global_settings.py:46 +#: conf/global_settings.py:45 #, fuzzy msgid "Serbian" msgstr "Serbo" -#: conf/global_settings.py:47 -msgid "Traditional Chinese" +#: conf/global_settings.py:46 +msgid "Simplified Chinese" msgstr "" #: core/validators.py:58 diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index c8a19d92f7..7b90746d0c 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-04 08:50-0600\n" "PO-Revision-Date: 2005-10-11 09:12GMT-3\n" "Last-Translator: João Paulo Farias \n" "Language-Team: Português do Brasil \n" @@ -16,17 +16,59 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "Bem vindo," + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr "Alterar senha" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "Encerrar sessão" + #: contrib/admin/templates/admin/base.html:29 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 msgid "Home" msgstr "Início" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Página não encontrada" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Desculpe, mas a página requisitada não pode ser encontrada." + +#: contrib/admin/templates/admin/500.html:4 +#, fuzzy +msgid "Server error" +msgstr "Erro no servidor (500)" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "Erro no servidor (500)" + +#: contrib/admin/templates/admin/500.html:9 +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." + #: contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "Histórico" @@ -63,35 +105,29 @@ msgstr "Site de administração do Django" msgid "Django administration" msgstr "Administração do Django" -#: contrib/admin/templates/admin/500.html:4 -#, fuzzy -msgid "Server error" -msgstr "Erro no servidor (500)" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Erro no servidor (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Erro no Servidor (500)" - -#: contrib/admin/templates/admin/500.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, fuzzy, python-format 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." +"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 "" -"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." +"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/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Página não encontrada" +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"Você tem certeza que quer remover o \"%(object)s\" %(object_name)s? Todos os " +"seguintes itens relacionados serão removidos:" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Desculpe, mas a página requisitada não pode ser encontrada." +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" +msgstr "Sim, tenho certeza" #: contrib/admin/templates/admin/index.html:27 msgid "Add" @@ -133,41 +169,13 @@ msgstr "Você ?" msgid "Log in" msgstr "Acessar" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr "Bem vindo," +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Obrigado por visitar nosso Web site hoje." -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr "Alterar senha" - -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Encerrar sessão" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, fuzzy, 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:" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " -"the following related items will be deleted:" -msgstr "" -"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:18 -msgid "Yes, I'm sure" -msgstr "Sim, tenho certeza" +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Acessar novamente" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -185,49 +193,6 @@ msgstr "Senha alterada com sucesso" msgid "Your password was changed." msgstr "Sua senha foi alterada." -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:4 -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ê." - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "Endereço de e-mail:" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "Reinicializar minha senha" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "Obrigado por visitar nosso Web site hoje." - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "Acessar novamente" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -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." - #: contrib/admin/templates/registration/password_change_form.html:12 msgid "" "Please enter your old password, for security's sake, and then enter your new " @@ -252,6 +217,25 @@ msgstr "Confirme a senha:" msgid "Change my password" msgstr "Alterar minha senha" +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Password reset" +msgstr "Reinicializar senha" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +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." + #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "Você está recebendo este e-mail porque você pediu uma nova senha" @@ -283,6 +267,22 @@ msgstr "Obrigado por usar nosso site!" msgid "The %(site_name)s team" msgstr "Time do %(site_name)s" +#: 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ê." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "Endereço de e-mail:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Reinicializar minha senha" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "hora da ação" @@ -657,49 +657,49 @@ msgstr "Datas importantes" msgid "Message" msgstr "Mensagem" -#: conf/global_settings.py:37 +#: conf/global_settings.py:36 msgid "Czech" msgstr "Tcheco" -#: conf/global_settings.py:38 +#: conf/global_settings.py:37 msgid "German" msgstr "Alemão" -#: conf/global_settings.py:39 +#: conf/global_settings.py:38 msgid "English" msgstr "Inglês" -#: conf/global_settings.py:40 +#: conf/global_settings.py:39 msgid "Spanish" msgstr "Espanhol" -#: conf/global_settings.py:41 +#: conf/global_settings.py:40 msgid "French" msgstr "Francês" -#: conf/global_settings.py:42 +#: conf/global_settings.py:41 msgid "Galician" msgstr "Galiciano" -#: conf/global_settings.py:43 +#: conf/global_settings.py:42 msgid "Italian" msgstr "Italiano" -#: conf/global_settings.py:44 +#: conf/global_settings.py:43 msgid "Brazilian" msgstr "Brazileiro" -#: conf/global_settings.py:45 +#: conf/global_settings.py:44 msgid "Russian" msgstr "Russo" -#: conf/global_settings.py:46 +#: conf/global_settings.py:45 #, fuzzy msgid "Serbian" msgstr "Sérvio" -#: conf/global_settings.py:47 -msgid "Traditional Chinese" +#: conf/global_settings.py:46 +msgid "Simplified Chinese" msgstr "" #: core/validators.py:58 diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index bcecf85709..48f678c87d 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-04 08:50-0600\n" "PO-Revision-Date: 2005-10-05 00:00\n" "Last-Translator: Dmitry Sorokin \n" "Language-Team: LANGUAGE \n" @@ -15,17 +15,59 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr " ," + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr " " + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "" + #: contrib/admin/templates/admin/base.html:29 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 msgid "Home" msgstr "" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr " " + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr " , ." + +#: contrib/admin/templates/admin/500.html:4 +#, fuzzy +msgid "Server error" +msgstr " (500)" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr " (500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr " (500)" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +" . e-mail " +" . ." + #: contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "" @@ -62,35 +104,29 @@ msgstr " msgid "Django administration" msgstr " Django" -#: contrib/admin/templates/admin/500.html:4 -#, fuzzy -msgid "Server error" -msgstr " (500)" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr " (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr " (500)" - -#: contrib/admin/templates/admin/500.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, fuzzy, python-format 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." +"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 "" -" . e-mail " -" . ." +" %(object_name)s '%(object)s' " +", " +":" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr " " +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +" , %(object_name)s \"%(object)s\"? " +" :" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr " , ." +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" +msgstr ", " #: contrib/admin/templates/admin/index.html:27 msgid "Add" @@ -132,41 +168,13 @@ msgstr " msgid "Log in" msgstr "" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr " ," +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr " ." -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr " " - -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, fuzzy, python-format -msgid "" -"Deleting the %(object_name)s '%(object)s' would result in deleting related " -"objects, but your account doesn't have permission to delete the following " -"types of objects:" -msgstr "" -" %(object_name)s '%(object)s' " -", " -":" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " -"the following related items will be deleted:" -msgstr "" -" , %(object_name)s \"%(object)s\"? " -" :" - -#: contrib/admin/templates/admin/delete_confirmation.html:18 -msgid "Yes, I'm sure" -msgstr ", " +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr " " #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -184,49 +192,6 @@ msgstr "La password msgid "Your password was changed." msgstr " ." -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr " " - -#: contrib/admin/templates/registration/password_reset_form.html:12 -msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll reset " -"your password and e-mail the new one to you." -msgstr "" -" ? e-mail , " -" e-mail ." - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "E-mail :" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr " " - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr " ." - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr " " - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -msgid "Password reset successful" -msgstr " " - -#: contrib/admin/templates/registration/password_reset_done.html:12 -msgid "" -"We've e-mailed a new password to the e-mail address you submitted. You " -"should be receiving it shortly." -msgstr "" -" . " -" ." - #: contrib/admin/templates/registration/password_change_form.html:12 msgid "" "Please enter your old password, for security's sake, and then enter your new " @@ -251,6 +216,25 @@ msgstr " msgid "Change my password" msgstr " " +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Password reset" +msgstr " " + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr " " + +#: contrib/admin/templates/registration/password_reset_done.html:12 +msgid "" +"We've e-mailed a new password to the e-mail address you submitted. You " +"should be receiving it shortly." +msgstr "" +" . " +" ." + #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr " " @@ -282,6 +266,22 @@ msgstr " msgid "The %(site_name)s team" msgstr " di %(site_name)s" +#: 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 "" +" ? e-mail , " +" e-mail ." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "E-mail :" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr " " + #: contrib/admin/models/admin.py:6 #, fuzzy msgid "action time" @@ -649,48 +649,48 @@ msgstr "" msgid "Message" msgstr "" -#: conf/global_settings.py:37 +#: conf/global_settings.py:36 msgid "Czech" msgstr "" -#: conf/global_settings.py:38 +#: conf/global_settings.py:37 msgid "German" msgstr "" -#: conf/global_settings.py:39 +#: conf/global_settings.py:38 msgid "English" msgstr "" -#: conf/global_settings.py:40 +#: conf/global_settings.py:39 msgid "Spanish" msgstr "" -#: conf/global_settings.py:41 +#: conf/global_settings.py:40 msgid "French" msgstr "" -#: conf/global_settings.py:42 +#: conf/global_settings.py:41 msgid "Galician" msgstr "" -#: conf/global_settings.py:43 +#: conf/global_settings.py:42 msgid "Italian" msgstr "" -#: conf/global_settings.py:44 +#: conf/global_settings.py:43 msgid "Brazilian" msgstr "" -#: conf/global_settings.py:45 +#: conf/global_settings.py:44 msgid "Russian" msgstr "" -#: conf/global_settings.py:46 +#: conf/global_settings.py:45 msgid "Serbian" msgstr "" -#: conf/global_settings.py:47 -msgid "Traditional Chinese" +#: conf/global_settings.py:46 +msgid "Simplified Chinese" msgstr "" #: core/validators.py:58 diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index d9f1325faa..701fc86ab2 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Serbian (latin) translation v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-04 08:50-0600\n" "PO-Revision-Date: 2005-11-03 00:28+0100\n" "Last-Translator: Petar Marić \n" "Language-Team: Nesh & Petar (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." + #: contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "Istorija" @@ -64,35 +106,28 @@ msgstr "Django administracija sajta" msgid "Django administration" msgstr "Django administracija" -#: contrib/admin/templates/admin/500.html:4 -#, fuzzy -msgid "Server error" -msgstr "Greška na serveru (500)" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Greška na serveru (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Greška na serveru (500)" - -#: contrib/admin/templates/admin/500.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, fuzzy, python-format 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." +"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 "" -"Dogodila se greška koja je prijavljena administratorima i biće popravljena " -"uskoro. Hvala Vam na strpljenju." +"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/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Strana nije pronađena" +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće " +"obrisani i sledeći pridruženi objekti:" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Tražena strana ne postoji." +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" +msgstr "Da, siguran sam" #: contrib/admin/templates/admin/index.html:27 msgid "Add" @@ -134,40 +169,13 @@ msgstr "Da li ste zaboravili Vašu lozinku??" msgid "Log in" msgstr "Prijavi se" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr "Dobrodošli," +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Hvala Vam na poseti." -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr "Izmeni lozinku" - -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Odjavi se" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, fuzzy, 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:" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " -"the following related items will be deleted:" -msgstr "" -"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće " -"obrisani i sledeći pridruženi objekti:" - -#: contrib/admin/templates/admin/delete_confirmation.html:18 -msgid "Yes, I'm sure" -msgstr "Da, siguran sam" +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Prijavi se ponovo" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -185,49 +193,6 @@ msgstr "Lozinka je uspešno izmenjena" msgid "Your password was changed." msgstr "Vaša lozinka je izmenjena." -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:4 -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." - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "E-mail adresa:" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "Resetuj moju lozinku" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "Hvala Vam na poseti." - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "Prijavi se ponovo" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -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." - #: contrib/admin/templates/registration/password_change_form.html:12 msgid "" "Please enter your old password, for security's sake, and then enter your new " @@ -252,6 +217,25 @@ msgstr "Potvrdite novu lozinku:" msgid "Change my password" msgstr "Izmeni moju lozinku" +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Password reset" +msgstr "Resetovanje lozinke" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +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." + #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "Primili ste ovaj e-mail jer ste tražili resetovanje lozinke" @@ -283,6 +267,22 @@ msgstr "Hvala Vam na poseti!" msgid "The %(site_name)s team" msgstr "%(site_name)s tim" +#: 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." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "E-mail adresa:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Resetuj moju lozinku" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "Datum/vreme akcije" @@ -657,48 +657,48 @@ msgstr "Važni datumi" msgid "Message" msgstr "Poruka" -#: conf/global_settings.py:37 +#: conf/global_settings.py:36 msgid "Czech" msgstr "Češki" -#: conf/global_settings.py:38 +#: conf/global_settings.py:37 msgid "German" msgstr "Nemački" -#: conf/global_settings.py:39 +#: conf/global_settings.py:38 msgid "English" msgstr "Engleski" -#: conf/global_settings.py:40 +#: conf/global_settings.py:39 msgid "Spanish" msgstr "Španski" -#: conf/global_settings.py:41 +#: conf/global_settings.py:40 msgid "French" msgstr "Francuski" -#: conf/global_settings.py:42 +#: conf/global_settings.py:41 msgid "Galician" msgstr "" -#: conf/global_settings.py:43 +#: conf/global_settings.py:42 msgid "Italian" msgstr "Italijanski" -#: conf/global_settings.py:44 +#: conf/global_settings.py:43 msgid "Brazilian" msgstr "Brazilski" -#: conf/global_settings.py:45 +#: conf/global_settings.py:44 msgid "Russian" msgstr "Ruski" -#: conf/global_settings.py:46 +#: conf/global_settings.py:45 msgid "Serbian" msgstr "Srpski" -#: conf/global_settings.py:47 -msgid "Traditional Chinese" +#: conf/global_settings.py:46 +msgid "Simplified Chinese" msgstr "" # nesh: Ovo je opis za stari SlugField diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po index 575bd0f2fd..88ff9f4c8d 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-03 12:26+0100\n" +"POT-Creation-Date: 2005-11-04 08:50-0600\n" "PO-Revision-Date: 2005-10-30 15:46+0800\n" "Last-Translator: limodou \n" "Language-Team: Simplified Chinese \n" @@ -18,17 +18,59 @@ msgstr "" "X-Poedit-Country: CHINA\n" "X-Poedit-SourceCharset: utf-8\n" -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "欢迎，" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr "修改口令" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "注销" + #: contrib/admin/templates/admin/base.html:29 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 msgid "Home" msgstr "首页" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "页面没有找到" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "很报歉，请求页面无法找到。" + +#: contrib/admin/templates/admin/500.html:4 +#, fuzzy +msgid "Server error" +msgstr "服务器错误(500)" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "服务器错误(500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "服务器错误 (500)" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢" +"谢你的关心。" + #: contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "历史" @@ -63,35 +105,27 @@ msgstr "Django管理站点" msgid "Django administration" msgstr "Django管理员" -#: contrib/admin/templates/admin/500.html:4 -#, fuzzy -msgid "Server error" -msgstr "服务器错误(500)" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "服务器错误(500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "服务器错误 (500)" - -#: contrib/admin/templates/admin/500.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, fuzzy, python-format 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." +"Deleting the %(object_name)s '%(object)s' would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" -"存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢" -"谢你的关心。" +"删除 %(object_name)s '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下" +"列类型的对象：" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "页面没有找到" +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"你确信相要删除 %(object_name)s \"%(object)s\"？所有相关的项目都将被删除：" -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "很报歉，请求页面无法找到。" +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" +msgstr "是的，我确定" #: contrib/admin/templates/admin/index.html:27 msgid "Add" @@ -133,39 +167,13 @@ msgstr "忘记你的密码？" msgid "Log in" msgstr "登录" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr "欢迎，" +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "感谢今天在本网站花费了您的一些宝贵时间。" -#: contrib/admin/templates/admin/base.html:23 -msgid "Change password" -msgstr "修改口令" - -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "注销" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, fuzzy, python-format -msgid "" -"Deleting the %(object_name)s '%(object)s' would result in deleting related " -"objects, but your account doesn't have permission to delete the following " -"types of objects:" -msgstr "" -"删除 %(object_name)s '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下" -"列类型的对象：" - -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " -"the following related items will be deleted:" -msgstr "" -"你确信相要删除 %(object_name)s \"%(object)s\"？所有相关的项目都将被删除：" - -#: contrib/admin/templates/admin/delete_confirmation.html:18 -msgid "Yes, I'm sure" -msgstr "是的，我确定" +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "重新登录" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -183,48 +191,6 @@ msgstr "口令修改成功" msgid "Your password was changed." msgstr "你的口令已经被修改。" -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr "口令重设" - -#: contrib/admin/templates/registration/password_reset_form.html:12 -msgid "" -"Forgotten your password? Enter your e-mail address below, and we'll reset " -"your password and e-mail the new one to you." -msgstr "" -"忘记你的口令？在下面输入你的邮箱地址，我们将重设你的口令并且将新的口令通过邮" -"件发送给你。" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "邮箱地址：" - -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "重设我的口令" - -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "感谢今天在本网站花费了您的一些宝贵时间。" - -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "重新登录" - -#: contrib/admin/templates/registration/password_reset_done.html:6 -#: contrib/admin/templates/registration/password_reset_done.html:10 -msgid "Password reset successful" -msgstr "口令重设成功" - -#: contrib/admin/templates/registration/password_reset_done.html:12 -msgid "" -"We've e-mailed a new password to the e-mail address you submitted. You " -"should be receiving it shortly." -msgstr "" -"我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。" - #: contrib/admin/templates/registration/password_change_form.html:12 msgid "" "Please enter your old password, for security's sake, and then enter your new " @@ -249,6 +215,24 @@ msgstr "确认口令：" msgid "Change my password" msgstr "修改我的口令" +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Password reset" +msgstr "口令重设" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "口令重设成功" + +#: contrib/admin/templates/registration/password_reset_done.html:12 +msgid "" +"We've e-mailed a new password to the e-mail address you submitted. You " +"should be receiving it shortly." +msgstr "" +"我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。" + #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "你所收到的这封邮件是由于你请求了口令重设" @@ -280,6 +264,22 @@ msgstr "感谢使用我们的站点！" msgid "The %(site_name)s team" msgstr "%(site_name)s 小组" +#: 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 "" +"忘记你的口令？在下面输入你的邮箱地址，我们将重设你的口令并且将新的口令通过邮" +"件发送给你。" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "邮箱地址：" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "重设我的口令" + #: contrib/admin/models/admin.py:6 msgid "action time" msgstr "动作时间" @@ -643,49 +643,49 @@ msgstr "重要日期" msgid "Message" msgstr "消息" -#: conf/global_settings.py:37 +#: conf/global_settings.py:36 msgid "Czech" msgstr "捷克语" -#: conf/global_settings.py:38 +#: conf/global_settings.py:37 msgid "German" msgstr "德语" -#: conf/global_settings.py:39 +#: conf/global_settings.py:38 msgid "English" msgstr "英语" -#: conf/global_settings.py:40 +#: conf/global_settings.py:39 msgid "Spanish" msgstr "西斑牙语" -#: conf/global_settings.py:41 +#: conf/global_settings.py:40 msgid "French" msgstr "法语" -#: conf/global_settings.py:42 +#: conf/global_settings.py:41 msgid "Galician" msgstr "加利西亚语" -#: conf/global_settings.py:43 +#: conf/global_settings.py:42 msgid "Italian" msgstr "意大利语" -#: conf/global_settings.py:44 +#: conf/global_settings.py:43 msgid "Brazilian" msgstr "巴西语" -#: conf/global_settings.py:45 +#: conf/global_settings.py:44 msgid "Russian" msgstr "俄语" -#: conf/global_settings.py:46 +#: conf/global_settings.py:45 #, fuzzy msgid "Serbian" msgstr "塞尔维亚语" -#: conf/global_settings.py:47 -msgid "Traditional Chinese" +#: conf/global_settings.py:46 +msgid "Simplified Chinese" msgstr "" #: core/validators.py:58 From 0ac931f38c414797e98febf83cc36f1e070a71b6 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Fri, 4 Nov 2005 14:56:12 +0000 Subject: [PATCH 3/4] Companion .mo-file checkin to [1077] git-svn-id: http://code.djangoproject.com/svn/django/trunk@1078 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/locale/cs/LC_MESSAGES/django.mo | Bin 16988 -> 16988 bytes django/conf/locale/de/LC_MESSAGES/django.mo | Bin 17824 -> 17824 bytes django/conf/locale/en/LC_MESSAGES/django.mo | Bin 421 -> 421 bytes django/conf/locale/es/LC_MESSAGES/django.mo | Bin 5203 -> 5203 bytes django/conf/locale/fr/LC_MESSAGES/django.mo | Bin 17763 -> 17763 bytes django/conf/locale/gl/LC_MESSAGES/django.mo | Bin 5322 -> 5322 bytes django/conf/locale/it/LC_MESSAGES/django.mo | Bin 16820 -> 16820 bytes .../conf/locale/pt_BR/LC_MESSAGES/django.mo | Bin 16668 -> 16668 bytes django/conf/locale/ru/LC_MESSAGES/django.mo | Bin 5134 -> 5134 bytes django/conf/locale/sr/LC_MESSAGES/django.mo | Bin 16564 -> 16564 bytes .../conf/locale/zh_CN/LC_MESSAGES/django.mo | Bin 15626 -> 15626 bytes 11 files changed, 0 insertions(+), 0 deletions(-) diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index dd2e7649e6891de8b9a41f286cc0f5cec859e788..cba1758ff86d39a076f7eb80ff5e1920d0afda2e 100644 GIT binary patch delta 25 gcmcc9!g!~JaRZ+Qmx+Rbg_Ws+u7TNR2@Mx10BS)7@&Et; delta 25 gcmcc9!g!~JaRZ+Qm$8DOk(H5|wt?Yh2@Mx10BPX{=l}o! diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index 73ce9d047600948438135522050afee211debf63..961d600197addf778e65bbebb4f8c2aa74901410 100644 GIT binary patch delta 25 hcmZ3`&A6bOal=AQE)xX<3oBCtT?4btt2Mt$0|0K32x0&L delta 25 hcmZ3`&A6bOal=AQE@K5lBP$~_Z3Dy2t2Mt$0|0I@2v`6B diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo index ba26220d0ebaefb3fcc4fe2d5ffb94e85aa73fa0..ad17099cc68091edd33070fb1652ea130ffdab67 100644 GIT binary patch delta 20 ccmZ3=yp(yu9xf9F0}Crt16>2NiO22(072*m%K!iX delta 20 ccmZ3=yp(yu9xh`ALnA9AGi?LIiO22(070Av!2kdN diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index 71a633795c1cb239b9774e2b4ee95986fdc073b2..984604e4b525ba1d159c0854cef28f5eb45ec8e7 100644 GIT binary patch delta 23 ecmcbtaam)-J8mu$1p^B!Qv+QCv&}!aqd5R(Xa}(X delta 23 ecmcbtaam)-J8mvx1w$h%BQtFS!_7aqqd5R(2nVMC diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo index 64ab862e5b1886a30bced53775b8ec0e043d951c..22cabf66b2b78f9a031c9eda5583144ad5edbe4c 100644 GIT binary patch delta 25 gcmaFd#rU|3aYLmBmx+Rbg_Ws+u7TO+W{n3j0CxlkfB*mh delta 25 gcmaFd#rU|3aYLmBm$8DOk(H5|wt?a1W{n3j0CuDZb^rhX diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo index b16c2bad9b8c9f2f9af038680a72baf544f7f4e8..569bed31a86059bce044c8038d70fe9ebf0d4835 100644 GIT binary patch delta 23 fcmX@5c}jD`J8mu$1p^B!Qv+QCv&}!aFL3|>W%LLb delta 23 fcmX@5c}jD`J8mvx1w$h%BQtFS!_7aqFL3|>Wt0dG diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo index 94a16a3c63a05de5abd2d413cdc921bafe390624..e8a2605518b9da927f2e6aa16a6ed4e05548a71d 100644 GIT binary patch delta 25 gcmdne%($hQaYKs+mx+Rbg_Ws+u7TO+J`FWV0BoZNZ2$lO delta 25 gcmdne%($hQaYKs+m$8DOk(H5|wt?a1J`FWV0Bl1CV*mgE diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo index 1a614f851e45de286609047e1e7bf3d8c150f44c..76e2adf48294457723af8e390497b56091a5356a 100644 GIT binary patch delta 25 gcmbQ!#5kvkaYL3mmx+Rbg_Ws+u7TO+67?050A|7mhX4Qo delta 25 gcmbQ!#5kvkaYL3mm$8DOk(H5|wt?a167?050A^wbeEZ;l>U5(2`!N9`G)Iit3Z1Y03Ofdjr90z9r delta 23 ecmeCG>Z;l>U5(3F!O+Oc$V}V7aPva7Ofdjqya!zX From 9d188cf3bb7b97b4610b368b8f71a9db8e11a4b5 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Fri, 4 Nov 2005 15:30:15 +0000 Subject: [PATCH 4/4] Added Norwegian translation -- Thanks Espen git-svn-id: http://code.djangoproject.com/svn/django/trunk@1080 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/global_settings.py | 1 + django/conf/locale/cs/LC_MESSAGES/django.mo | Bin 16988 -> 16988 bytes django/conf/locale/cs/LC_MESSAGES/django.po | 12 +- django/conf/locale/de/LC_MESSAGES/django.mo | Bin 17824 -> 17824 bytes django/conf/locale/de/LC_MESSAGES/django.po | 12 +- django/conf/locale/en/LC_MESSAGES/django.mo | Bin 421 -> 421 bytes django/conf/locale/en/LC_MESSAGES/django.po | 12 +- django/conf/locale/es/LC_MESSAGES/django.mo | Bin 5203 -> 5203 bytes django/conf/locale/es/LC_MESSAGES/django.po | 12 +- django/conf/locale/fr/LC_MESSAGES/django.mo | Bin 17763 -> 17763 bytes django/conf/locale/fr/LC_MESSAGES/django.po | 12 +- django/conf/locale/gl/LC_MESSAGES/django.mo | Bin 5322 -> 5322 bytes django/conf/locale/gl/LC_MESSAGES/django.po | 12 +- django/conf/locale/it/LC_MESSAGES/django.mo | Bin 16820 -> 16820 bytes django/conf/locale/it/LC_MESSAGES/django.po | 12 +- .../conf/locale/no_NB/LC_MESSAGES/django.mo | Bin 0 -> 17318 bytes .../conf/locale/no_NB/LC_MESSAGES/django.po | 984 ++++++++++++++++++ .../conf/locale/pt_BR/LC_MESSAGES/django.mo | Bin 16668 -> 16668 bytes .../conf/locale/pt_BR/LC_MESSAGES/django.po | 12 +- django/conf/locale/ru/LC_MESSAGES/django.mo | Bin 5134 -> 5134 bytes django/conf/locale/ru/LC_MESSAGES/django.po | 12 +- django/conf/locale/sr/LC_MESSAGES/django.mo | Bin 16564 -> 16564 bytes django/conf/locale/sr/LC_MESSAGES/django.po | 12 +- .../conf/locale/zh_CN/LC_MESSAGES/django.mo | Bin 15626 -> 15626 bytes .../conf/locale/zh_CN/LC_MESSAGES/django.po | 12 +- 25 files changed, 1073 insertions(+), 44 deletions(-) create mode 100644 django/conf/locale/no_NB/LC_MESSAGES/django.mo create mode 100644 django/conf/locale/no_NB/LC_MESSAGES/django.po diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 371eac25ad..4a137cf2b3 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -40,6 +40,7 @@ LANGUAGES = ( ('fr', _('French')), ('gl', _('Galician')), ('it', _('Italian')), + ('no-nb', _('Norwegian')), ('pt-br', _('Brazilian')), ('ru', _('Russian')), ('sr', _('Serbian')), diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index cba1758ff86d39a076f7eb80ff5e1920d0afda2e..82973470106c4a46dc0ea7208aee4e3356c2c0bb 100644 GIT binary patch delta 19 acmcc9!g!~Jaf6@+i=~y3\n" "Language-Team: Czech\n" @@ -685,19 +685,23 @@ msgid "Italian" msgstr "Italsky" #: conf/global_settings.py:43 +msgid "Norwegian" +msgstr "" + +#: conf/global_settings.py:44 msgid "Brazilian" msgstr "Brazilsky" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Russian" msgstr "Rusky" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 #, fuzzy msgid "Serbian" msgstr "Srbsky" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Simplified Chinese" msgstr "" diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index 961d600197addf778e65bbebb4f8c2aa74901410..61cf03fb7432db1fd0f9921906c4e806db99d3cb 100644 GIT binary patch delta 19 bcmZ3`&A6bOal;Z#7E3E5%grk^e@FuWNwNn| delta 19 bcmZ3`&A6bOal;Z#77Hs=gUu^6e@FuWNr(qX diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index bc585a3c08..3299a3f36f 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-04 08:50-0600\n" +"POT-Creation-Date: 2005-11-04 09:29-0600\n" "PO-Revision-Date: 2005-10-08 00:03+0200\n" "Last-Translator: Georg Bauer \n" "MIME-Version: 1.0\n" @@ -685,18 +685,22 @@ msgid "Italian" msgstr "Italienisch" #: conf/global_settings.py:43 +msgid "Norwegian" +msgstr "" + +#: conf/global_settings.py:44 msgid "Brazilian" msgstr "Brasilianisch" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Russian" msgstr "Russisch" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 msgid "Serbian" msgstr "Serbisch" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Simplified Chinese" msgstr "" diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo index ad17099cc68091edd33070fb1652ea130ffdab67..73d55e8c6f11378dc8cdd79e5e5eae115042d63c 100644 GIT binary patch delta 14 WcmZ3=yp(yueilnBBg=`09{~U+a|O5n delta 14 WcmZ3=yp(yueijQWQ-g_z9{~U+R|T;E diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 78ba5ccdd0..611d2e0746 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-04 08:50-0600\n" +"POT-Creation-Date: 2005-11-04 09:29-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -657,18 +657,22 @@ msgid "Italian" msgstr "" #: conf/global_settings.py:43 -msgid "Brazilian" +msgid "Norwegian" msgstr "" #: conf/global_settings.py:44 -msgid "Russian" +msgid "Brazilian" msgstr "" #: conf/global_settings.py:45 -msgid "Serbian" +msgid "Russian" msgstr "" #: conf/global_settings.py:46 +msgid "Serbian" +msgstr "" + +#: conf/global_settings.py:47 msgid "Simplified Chinese" msgstr "" diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index 984604e4b525ba1d159c0854cef28f5eb45ec8e7..4e8c6e290555cc2fa127febf0d11d565c0934417 100644 GIT binary patch delta 17 Ycmcbtaam)-M{X8ND\n" @@ -681,18 +681,22 @@ msgid "Italian" msgstr "" #: conf/global_settings.py:43 -msgid "Brazilian" +msgid "Norwegian" msgstr "" #: conf/global_settings.py:44 -msgid "Russian" +msgid "Brazilian" msgstr "" #: conf/global_settings.py:45 -msgid "Serbian" +msgid "Russian" msgstr "" #: conf/global_settings.py:46 +msgid "Serbian" +msgstr "" + +#: conf/global_settings.py:47 msgid "Simplified Chinese" msgstr "" diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo index 22cabf66b2b78f9a031c9eda5583144ad5edbe4c..464c81b67c1277e0ba7aa76266acf397e9414f76 100644 GIT binary patch delta 19 acmaFd#rU|3aYKy;i=~y3<>m&B$1(s=0|#vY delta 19 acmaFd#rU|3aYKy;i-nb`!R7{y$1(s<*#~9- diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index d0b99803ab..3d7fb33a85 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-04 08:50-0600\n" +"POT-Creation-Date: 2005-11-04 09:29-0600\n" "PO-Revision-Date: 2005-10-18 12:27+0200\n" "Last-Translator: Laurent Rahuel \n" "Language-Team: franais \n" @@ -690,19 +690,23 @@ msgid "Italian" msgstr "Italien" #: conf/global_settings.py:43 +msgid "Norwegian" +msgstr "" + +#: conf/global_settings.py:44 msgid "Brazilian" msgstr "Brsilien" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Russian" msgstr "Russe" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 #, fuzzy msgid "Serbian" msgstr "Serbe" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Simplified Chinese" msgstr "" diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo index 569bed31a86059bce044c8038d70fe9ebf0d4835..fba30cef6bab1da61ea118195562b9c99d06afe6 100644 GIT binary patch delta 17 ZcmX@5c}jD`M{X8ND\n" "Language-Team: Galego\n" @@ -680,18 +680,22 @@ msgid "Italian" msgstr "" #: conf/global_settings.py:43 -msgid "Brazilian" +msgid "Norwegian" msgstr "" #: conf/global_settings.py:44 -msgid "Russian" +msgid "Brazilian" msgstr "" #: conf/global_settings.py:45 -msgid "Serbian" +msgid "Russian" msgstr "" #: conf/global_settings.py:46 +msgid "Serbian" +msgstr "" + +#: conf/global_settings.py:47 msgid "Simplified Chinese" msgstr "" diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo index e8a2605518b9da927f2e6aa16a6ed4e05548a71d..82fe59f4462499c5c176e28eb9bf0e9c17f59796 100644 GIT binary patch delta 19 acmdne%($hQaYMTXi=~y3<>qb;O-TSp=muH< delta 19 acmdne%($hQaYMTXi-nb`!RBraO-TSpz6MhO diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index 3c52a0393c..573012ce87 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-04 08:50-0600\n" +"POT-Creation-Date: 2005-11-04 09:29-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -682,19 +682,23 @@ msgid "Italian" msgstr "Italiano" #: conf/global_settings.py:43 +msgid "Norwegian" +msgstr "" + +#: conf/global_settings.py:44 msgid "Brazilian" msgstr "Brasiliano" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Russian" msgstr "Russo" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 #, fuzzy msgid "Serbian" msgstr "Serbo" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Simplified Chinese" msgstr "" diff --git a/django/conf/locale/no_NB/LC_MESSAGES/django.mo b/django/conf/locale/no_NB/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..16046ade759d2679e9293c01e5de030fdd9d6e9a GIT binary patch literal 17318 zcmcJVd5|1eeaD|;b6CL!jJb{77M53wcW32`*lQtKmR8crT1l2xvPBGX&rHv3YmOdw z_w0Irn8W4@XE+UZ0>(!OM}R=UB!o+G90w>v6{IRU+VH!K#1X z25D-#;8VdjflOs?0nY(H25Q^~K>nNW@umJh1~vY_gHHw@0`CS-V3JG0kAlwxe*kK{ zhrqMJHN4b36X05KBlsln2zV}72iJpd2QLJ_0KNeH2`IXp{46)_B&haV!SlhR;FaKQ zUJrOo#0{c0Wbi^5sEi} zyTI3h-vQ47=Q;cfz#gb|d;)wU_#mixD`z_XNEWiE2#5(FR1n0>VLlrWJ>c% zP;|Z@6#xG%D8BhIsBz}ba&$ZhZlZoIsQumw9sxfO!eZuGf#bVLQ0LMEMdwd}lJf^a z@$EyP_ICzCa1gu$RR4!T?eA#_gU)v=xDI>;cn$br@M`d3a0HA$THq87Mk$2FJh;fa}4pfhU3g0*XFA2Su-kLCy0&U>%%dF~0@AAFP27 zfNKBZbKQKGgF4q)Q2V|b+zQ?V^55LYm+1C0Q1hP5BE%0Dc-#a&k@_xB=Xn*VeOw1V z35-FV)AgX{xe-+VxBB$|{{sL%WQVgGvtd=l>y@X6qk$Jc=3t2g`lZJ^eF7pQSR3u>OPfT%We zKd5p30n~nf1ghPCfKLX^xSRiEQ0qMvRJ+r`r-5gK8vg?S`{kheZ3izt0lg3IqW=09 zIsX4P_}kR~6%?QCJkOYygSUfBiGp_h$30#EYTnDhC2$KUdVCSo`F$DGKJEpz?gv4& z{}HHl{nX=sfm{XVen`J_Fnhs{eJM_7nMf8`L^7@M+*H zL0Hhd71VfN0JXmRK#lV~@O1FUpw9W1pvHSH%2w-H3yR++K=I!tp!Tr`ybAmP2uquv zfL-v}9C{CY8>sa@3FUSMp!mBDY8|(ZeiGEZ@fA??JL^(6-nk$wV@hBE9s$eXYe4P$hu}f*A#gLeXWH@Y+d)WS z?gazzKf#;9=fgxz@WbFU!BaM3V}UQ^YYTWC2y2*+fY*ZG1LwgDUgG%tjo`V|KL=g` zJ_w5c&g8Pu{u7T&py=~zP~*H4!!Iy(KgWCTO z!2{swm%Dxopy--_qF)b`oW2Fz4SvSge+fRD`Z;WlBQqO8@lg(nk8TEaPVe&dTR`#8 z-JsUsp)brJ#8IY>GZ-P(&l?Q+-6IL-uL#btR9I^Bt5|Q|_aDlLFbSzXg~!tV_(DdM?LQc4tkBqNfmKcU=C8UFkR74hO7lo`rbDaGgWJj9fHDevv-r= z7W|990d?LNQ#f+_5g+M;>M_4(pWN5)1Ajz$E#*AQ=@jvdJ{LK#wnxD8A5##0t8@Mm z)Mr1XO8G0wRTO=4$}N<)QKUECO1Xg|9v}W(?JFMwf7d@B1n;8!fv?~1@x`EYPx1Kx z5638Pq5KZz2qmPPMJYaa^N>8;{3Q9OA3GPs`dXacpc@Pl%o`VZgbH8zL2N2lrrT^|Mqj>Zi;06 zX8*1O)+nb^E~oq%gulxrxLQ1tnV1M>y&vy=nAE_jE3{&VnolosXr zlvzsg`6v&kQMOSQin$@71EVYBRTa$L4Ce5`IL6WN0YK86U+8}8MVK5g~ zCW1T(vZxtV@}QNZQIIc$ZGMePCO8mv!ZggIpw(^WailaeFar#??U0;&L~SO2PWwYM13z zT(>?C>*Lv`#~qbsk3Zg)fM(k9iuJYPEQ{OvEfRSw0n+IDZk$F#E6$E*3b)IH`*&;K z#TX^CrIN=<+ia;;&6Z9YH_aAk+)KJa*7XldVLR6$R5=7_oiB)lN%<%za-$ZpLBTY=r^pk%yqw3p!zzEhTBScr~ae?OL3+`VFSd)}#yL zwUeCnaNN;i1Pk=?1+B1_CM{+vnXRvgDhp=Ymid_@SI^GxJTgB!H*;kB!QH#fHnuR8 z$F0b0iz+33MXhp_@&IWx#%jbF8xUtKSh5R9qYRFP^&A0)>Eq~_O$4x_&LIuLN+s!X z1l1(U+GBaJ5VGn{lv>_^X-1D`K=HiSi8398A99*yW^ujE9yox7h_$A6!QG693Zl?V z>a2>HE}Wy}IV;RpYiQ4QS?irUr|0G#rB5`nndKvjQ8d`D6Do@ z3{>h(wH)%=V~kztV1)_NYZo1T(TLtXRQ! z;}dY)~ykZH3$N$W|TM{OrVMf1&pqo5V6Q39flV9^P?^`&SG{RD$XUIvT) z_E+CeTWUv3RyRXGhGgMs)JAt~PvdIXGdp0^id5DPq*ah6-H!Xt%ub216z#?^SV*JV zOV&;mvmCKAPp#dA4qR;)8>hleo6SxHF@Z)q6ZFx5?m=ZCsx(A%%T361J*rN^h7$9E z<_*hmAIn~h*@Ctrx|PgqtCOU;G`<8UGqYU7)oLtpS8Lm_uX?h8U3C%dUVsWlwYZb! z_^nE@NhvX{VY4n-m4 zu8<%3vOKb@+w7TL-F9SlTm9uB2!#Fw40q;616*a?I6r9Nk*UD!o#;We!%ELm6@aW-e)qbLM)1yO=Yxhw~{I zW7_OV+LP#vD2*!|G}ce0*o&?PuVwvKXp3%KM2dCTbX_dz%UxM}D`-Hz65U^WxfBO; z?3ES@o1KNQ%&k@lo6BZeHqAcPZFPK&YpQDY`P*2XbWbm42l4(oFak$9LQIxr*Im%|2_cS#x2;V0(Nk%#R$6+)%UoircV1^=N}?REb;c&27lp zx1p?I$4|x2on}};f>)iRXmdP6py+>{G4cfAbeGrvd4S_v!m??~33h)ij+#}ho>Wqb zg5~&Hf&C?tp|Pw>hU)ajA3dO{6K!#i9cWo|s}bb66tXfQCgR?$bkjKRjd2BYqq-}E ziQ9oYN83#|MbRzDm*NWdVG=CCW*AKc*&1xljuG z?bS4F`|j_efl-YI!n~VGh2R_^;rez0e;`WBwn3CKT`-fTEPZ3t+O+=S4I9QcPVq!* z`&*>nMk;}AWDY>DAdhayopYpXcQvnN$l%j9@Yr(p0@L4+Kfa6{=!9)qdk0V^Y-1iR z(#Ra0J5k$OCpxy^dM+M_9#|{O`g{`AtD~|tS-Do|T^jD*b)FO!wG7s?`6-g)Qn-hG z|8M1%7Qzuv(VDi8zY&d(+sIsno0Lak%T6mVY~A{9+8mcF#({BjT1`_pqjHKl@5y<% z0d39=lm_?_mWb_KJTjhPENKcmR%X2etA#sQL)Kp_4CSl3aiuXYTU54Ka-6-;II;(Z zWuHtl?+nM(T7aP1;nUeR6PF*!M0c#$F_*a@$E82QfGetL$!lGIF}r26v4uSEOiy7zvpGiX@7N#S z$m`NW|!%_z)>$U z^p|wNK4eSkTmp>tG6q90SPHEXkNpRYbp-Z+huuOu@ZdC-Q*dD|Me3?rS}Uz6UkG&`mR|)^Lu6 zNUu3)ZOp!7>m)CjhhWy|gp-558OoUy{A;x=JS9PO46FO1i@xXnaMF9QL!96^jNXG7 zIvn2Iwu^BCvxQ)C(y9`jSsD)Rt&*W(YQJ=b)AlJdhpa!obAE0#v=kiZV7SyURISWg zgL`_-y3AZ{nbZns3)6hzY`a%QaAZ^?QN#C#3jsWOmrQ+@MH#&Pdv!F1Ynwroo(reg z{SZBi@I!TpLpMSzJ|HA*A_KN$=!fOt^bPGo>*WpZZs!FR>d3`0?A4uh%dHsSqFM?L zD}dJ5Qe5IuyeI|2ylN;qGX{9F7S5%#O9JQ*Ja!HF=bfPlQv(nYq|i zNo}>+!Aw?G{UXazCB!4Mi&W&#?H>s#Om$~}Ge$bP*EqxNT94_1d+%aws4Cm6s7pzB zB?9H_PxAf59uwAt3EjM+Xy2QiHn=VFCV}_KE89hA1;PQqQGnOJU(G48}tkwfI1Q0Q^?d%Fy zSgtYsr_AW$>xppMc0X1}!;!1s;DSX>z8MRT9KX~)+F=!SV_Kq-nJJ!o#{T4Wc3d_7 ziOVuIov_k?cMHsT@Bz>c>;PF?Nwurkl1N6Nn7vf;{)3Hk4r+PQf6jQS_oI735hFGk z$DnYZN6{thR~k{Tc+QOOZu`Y!9@c6$KG&tvMGsj5DPYG7Y*J2!i`T9(k8}Lff^W>e zG*NJQa<)2o2o=oK)4{$iTd&-*Vv;V;C-aTvfTdQGmF004Y$t$|`Y;r!C4%Y13 zJ3qNKjcg=vavKv&2N!JEaPj2%=TC09DA;i6^aYnrZg}yA4K$qGPsmV%`*w$Cw(Osr z+dH{!OR#hA^xW)uFWtLmX3cI+Y;vAZ1uC2yayppFutI|!X}h`*cIz0>s$X7DWA~y& z#AXw{+Vw6+G&zsOHy!Lr(j_Pxw%5!NN*-+L{L+Rs!bdPz60 zO8#L;;o8mdj$D1~h6KZ~zgmkizf{=>9I}`-7>3}{p_B@p;s!xQ=BOvt#!>hh z1D!?G>&{?48amg3h8p(K^D4(Xc&LH3ipLsw1}B6J%PM0Mz^aQxEI3>w8m~6xUKP&t z%MOok`2KD&zEOV|6rl}pLyFXn*{$M@ZSUgC97U9NLlDj2b1pM!Q02l9>1=DcqP$pC zmL#+BD%6Qn0nV2Y;at7QxG0wr)Q;W5VPd!-yb>?$Y8(A;;7rK;XSi}R_Cw~QS(jOz zTYnovX_w5VU9tv&b++WbQG*#5Yjs&|hYp*hj%g8=rAfkS z)6m&w+0m%ch?!weaC9O#JQ3_urX?X7UscXRiI&Vcv4>DkmQ*f?w~Q*8e58UbV{X5Y zF{x+F>*=_HFzE!GNFt_->EpRqM-TOy3jdI+7<3*Xu_m&Foi6bOE zPPYzuLw*}XLSYQ|;d)4dI5_rt_irTW5-B9nZ){s~`*F@IJIv1y@-Cy@hSwEM4sUaK za0aDe96ZK2CYIUk zIXk|CMaV4W6HYKz$-Y?SAoi82ifa8l3~4>fGiVm*Qnj4q#hbwXB6=L&u2Uo}ZZ6By z(2W$JY)#BaB4{X|b@!$i1w#=HbLk9GRU*qm~(>HH&Pdy-ZmnE)!~y zibI2DUMJv;wDjI;1%>!HXx>O3(KTKV9EuxxjM9*F;BC!{s=7ceb%_@7BgtDSboE7_ zyJNMv7}%MZ3L`Bw->E zdMFJ;0;U-&3lsbFi_5%dhjE=-!M-I8bD+h6mXii{prVkPR5N<5CC3d8U*$H$6Aq=L zJL$1|)R9qSL36!zIvRykb=>MIfA6z0if3&8^@a)?*=l3WVUCfjiOn1#W(+UR#%62k zW=?-D0v)T^A$q-Mh(E37)e8GMWpLy; zyee(-fekUdkKwZ!P*PT5Ot4QjlT4M62%`01B>W_DGD%FiNk#ypW3}nr04M{FoE>Nk z+t4w=U?N>WK|O52u%3;5Dn|^I5+~vhFwl@#YnX@j4(gw_?b`13J1T)KtqQwj&A1`c zotsK3U3Wch814lUsbjRFBn=LsvHwPN#)xPsj8rVl*vt;vcK5M+NbJ;YN{0bP6Fa)* zP#7$t7I6tL%j*pNG}6pvb@o7Y?yEdPE6eoYRN ztna|Fd&ub2&3uR`dgs&LPv{Jyangl_@8qsR>BdkggrbAr z>8>0s{G8&?{k&y0q9UC6d>nh&8Dr>5bqwWm%zUw4Z)NNEk))3N9(s*VIqdPvVevt& zeo|+4<)|5dIU(234#XBUXrbkTL4JozvZWhj)B|NzEBgoLVkK3Z0DN_&9GnK^)&3*ED&up z-@rrS7Izk&{YxwUrln5RyRo$x+nRuC8~?Ht^tnXVBYL7q6wF#mT7=v#i6rhR)4Iz< ziy^}!o~I!!9|!Bj`y_zU@j~&?2p?g z%qNXvaybx~zsf@#!*)CC>B?nGj$4WFGK-A#A;-Xd78DFxu5k7oPdM+Hh-u%%7_(`kF*Q}* zXm!$K)<*pK9*ggrvNm~SBLH=u{*m)08TplmDDp>c0I@t5m-hxW;5;c&t4Ik=3zti- zQP9%b#h7GPxP$Fh+_0am(VSbWSqJ90#WyQ>UiY1T6npUh*ggE^Z&>$@G`rRl*DQD2 z0i<-f3Y_(R1^%OsQ^}oqB z(Po!mYxH_qp){{S;GQtGNhO)9{HYHIWBtdogT2-yMfK5Zfs{dgG?HRKfwL(ldklDze<0fP_N30E$3$nyTX^3lZA1H{x#nd*I{p_g4E15vbCDoNmjWd!- zEZV8^z$cR$`V)AYOoDGr2NR1W`13Ktc_gcP**i-l3fry@Jt~4bTxIXBN~VaGiVcnu zlJE$*{!9rYMZq2P^GUoaG=~3)?v_Z7Km)75$4y->$tIV4gvH3kvb!axL~zm!xXAo3 Da29PJ literal 0 HcmV?d00001 diff --git a/django/conf/locale/no_NB/LC_MESSAGES/django.po b/django/conf/locale/no_NB/LC_MESSAGES/django.po new file mode 100644 index 0000000000..761a564872 --- /dev/null +++ b/django/conf/locale/no_NB/LC_MESSAGES/django.po @@ -0,0 +1,984 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) 2005 and beyond +# This file is distributed under the same license as the PACKAGE package. +# Espen Grindhaug , Nov 2005. +# +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-11-04 09:29-0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Espen Grndhaug \n" +"Language-Team: Norwegian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Welcome," +msgstr "Velkommen" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Change password" +msgstr "Endre passord" + +#: contrib/admin/templates/admin/base.html:23 +msgid "Log out" +msgstr "Log ut" + +#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/object_history.html:5 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:4 +#: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +msgid "Home" +msgstr "Hjem" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Fant ikke siden" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Beklager, men siden du spør etter finnest ikke." + +#: contrib/admin/templates/admin/500.html:4 +msgid "Server error" +msgstr "Tjener feil" + +#: contrib/admin/templates/admin/500.html:6 +msgid "Server error (500)" +msgstr "Tjener feil (500)" + +#: contrib/admin/templates/admin/500.html:9 +msgid "Server Error (500)" +msgstr "Tjener feil (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 "" +"Det har vært en feil. Feilen er blitt rapportert til administrator via e-" +"mail, og vill bli fikset snart. Takk for din tålmodighet." + +#: contrib/admin/templates/admin/object_history.html:5 +msgid "History" +msgstr "Historie" + +#: contrib/admin/templates/admin/object_history.html:18 +msgid "Date/time" +msgstr "Dato/tid" + +#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47 +msgid "User" +msgstr "Bruker" + +#: contrib/admin/templates/admin/object_history.html:20 +msgid "Action" +msgstr "Funksjon" + +#: contrib/admin/templates/admin/object_history.html:26 +msgid "DATE_WITH_TIME_FULL" +msgstr "N j, Y, P" + +#: contrib/admin/templates/admin/object_history.html:36 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" +"Dette objektet har ingen endrings historie. Den var sannsynligvis ikke laget " +"via denne siden" + +#: contrib/admin/templates/admin/base_site.html:4 +msgid "Django site admin" +msgstr "Django administrasjonsside" + +#: contrib/admin/templates/admin/base_site.html:7 +msgid "Django administration" +msgstr "Django administrasjon" + +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(object)s' would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"Vist du sletter %(object_name)s '%(object)s' vill du også slette relaterte " +"objekter, men du har ikke tillatelse til å slette de følgende objektene:" + +#: contrib/admin/templates/admin/delete_confirmation.html:14 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"Er du sikker på at du vill slette %(object_name) \"%(object)s\"? Alle de " +"følgende relaterte objektene vill bli slettet:" + +#: contrib/admin/templates/admin/delete_confirmation.html:18 +msgid "Yes, I'm sure" +msgstr "Ja, jeg er sikker" + +#: contrib/admin/templates/admin/index.html:27 +msgid "Add" +msgstr "Legg til" + +#: contrib/admin/templates/admin/index.html:33 +msgid "Change" +msgstr "Endre" + +#: contrib/admin/templates/admin/index.html:43 +msgid "You don't have permission to edit anything." +msgstr "Du har ikke rettigheter til å endre." + +#: contrib/admin/templates/admin/index.html:51 +msgid "Recent Actions" +msgstr "Siste handlinger" + +#: contrib/admin/templates/admin/index.html:52 +msgid "My Actions" +msgstr "Mine handlinger" + +#: contrib/admin/templates/admin/index.html:56 +msgid "None available" +msgstr "Ingen tilgjengelige" + +#: 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?" + +#: contrib/admin/templates/admin/login.html:24 +msgid "Log in" +msgstr "Log inn" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Takk for å bruke tid på internett siden i dag." + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Log inn igjen" + +#: contrib/admin/templates/registration/password_change_done.html:4 +#: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_change_form.html:6 +#: contrib/admin/templates/registration/password_change_form.html:10 +msgid "Password change" +msgstr "Endre passord" + +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_done.html:10 +msgid "Password change successful" +msgstr "Passordet er endret" + +#: contrib/admin/templates/registration/password_change_done.html:12 +msgid "Your password was changed." +msgstr "Ditt passord er endret." + +#: 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 "" +"Venligst skriv inn ditt gamle passord, for sikkerthets grunner, så skriv inn " +"ditt nye passord to ganger slik at vi kan kontrollere at det er rett." + +#: contrib/admin/templates/registration/password_change_form.html:17 +msgid "Old password:" +msgstr "Gammelt passord:" + +#: contrib/admin/templates/registration/password_change_form.html:19 +msgid "New password:" +msgstr "Nytt passord:" + +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Confirm password:" +msgstr "Gjenta nytt passord:" + +#: contrib/admin/templates/registration/password_change_form.html:23 +msgid "Change my password" +msgstr "Endre passord" + +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Password reset" +msgstr "Tilbakestill passord" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "Passordet ble tilbakestilt" + +#: 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 "" +"Vi sender deg et nytt passord til epost adressen du oppgav. Du villmotta det " +"snart." + +#: contrib/admin/templates/registration/password_reset_email.html:2 +msgid "You're receiving this e-mail because you requested a password reset" +msgstr "" +"Du har mottatt denne epost-en fordi du ba om å tilbakestille passordet ditt" + +#: contrib/admin/templates/registration/password_reset_email.html:3 +#, python-format +msgid "for your user account at %(site_name)s" +msgstr "for din konto hos %(site_name)s" + +#: contrib/admin/templates/registration/password_reset_email.html:5 +#, python-format +msgid "Your new password is: %(new_password)s" +msgstr "Ditt nye passord er: %(new_password)s" + +#: contrib/admin/templates/registration/password_reset_email.html:7 +msgid "Feel free to change this password by going to this page:" +msgstr "Du kan endre dette passordet ved å gå til denne siden:" + +#: contrib/admin/templates/registration/password_reset_email.html:11 +msgid "Your username, in case you've forgotten:" +msgstr "I tilfellet du har glemt brukernavnet ditt, så er det:" + +#: contrib/admin/templates/registration/password_reset_email.html:13 +msgid "Thanks for using our site!" +msgstr "Takk for at du bruker vår side!" + +#: contrib/admin/templates/registration/password_reset_email.html:15 +#, python-format +msgid "The %(site_name)s team" +msgstr "Hilsen %(site_name)s" + +#: 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 "" +"Har du glemt passordet ditt? Skriv inn epost adressen din under, så sender " +"vi deg et nytt passord via epost." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "Epost adresse:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Tilbakestill mitt passord" + +#: contrib/admin/models/admin.py:6 +msgid "action time" +msgstr "handlings tid" + +#: contrib/admin/models/admin.py:9 +msgid "object id" +msgstr "objekt id" + +#: contrib/admin/models/admin.py:10 +msgid "object repr" +msgstr "objekt repr" + +#: contrib/admin/models/admin.py:11 +msgid "action flag" +msgstr "handlings flagg" + +#: contrib/admin/models/admin.py:12 +msgid "change message" +msgstr "endre melding" + +#: contrib/admin/models/admin.py:15 +msgid "log entry" +msgstr "logg notis" + +#: contrib/admin/models/admin.py:16 +msgid "log entries" +msgstr "logg innlegg" + +#: utils/dates.py:6 +msgid "Monday" +msgstr "Mondag" + +#: utils/dates.py:6 +msgid "Tuesday" +msgstr "Tirsdag" + +#: utils/dates.py:6 +msgid "Wednesday" +msgstr "Onsdag" + +#: utils/dates.py:6 +msgid "Thursday" +msgstr "Torsdag" + +#: utils/dates.py:6 +msgid "Friday" +msgstr "Fredag" + +#: utils/dates.py:7 +msgid "Saturday" +msgstr "Lørdag" + +#: utils/dates.py:7 +msgid "Sunday" +msgstr "Søndag" + +#: utils/dates.py:14 +msgid "January" +msgstr "Januar" + +#: utils/dates.py:14 +msgid "February" +msgstr "Februar" + +#: utils/dates.py:14 utils/dates.py:27 +msgid "March" +msgstr "Mars" + +#: utils/dates.py:14 utils/dates.py:27 +msgid "April" +msgstr "April" + +#: utils/dates.py:14 utils/dates.py:27 +msgid "May" +msgstr "Mai" + +#: utils/dates.py:14 utils/dates.py:27 +msgid "June" +msgstr "Juni" + +#: utils/dates.py:15 utils/dates.py:27 +msgid "July" +msgstr "Juli" + +#: utils/dates.py:15 +msgid "August" +msgstr "August" + +#: utils/dates.py:15 +msgid "September" +msgstr "September" + +#: utils/dates.py:15 +msgid "October" +msgstr "Oktober" + +#: utils/dates.py:15 +msgid "November" +msgstr "November" + +#: utils/dates.py:16 +msgid "December" +msgstr "Desember" + +#: utils/dates.py:27 +msgid "Jan." +msgstr "Jan." + +#: utils/dates.py:27 +msgid "Feb." +msgstr "Fef." + +#: utils/dates.py:28 +msgid "Aug." +msgstr "Aug." + +#: utils/dates.py:28 +msgid "Sept." +msgstr "Sept." + +#: utils/dates.py:28 +msgid "Oct." +msgstr "Okt." + +#: utils/dates.py:28 +msgid "Nov." +msgstr "Nov." + +#: utils/dates.py:28 +msgid "Dec." +msgstr "Des." + +#: models/core.py:5 +msgid "domain name" +msgstr "domene navn" + +#: models/core.py:6 +msgid "display name" +msgstr "vist navn" + +#: models/core.py:8 +msgid "site" +msgstr "side" + +#: models/core.py:9 +msgid "sites" +msgstr "sider" + +#: models/core.py:22 +msgid "label" +msgstr "merkelapp" + +#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19 +msgid "name" +msgstr "navn" + +#: models/core.py:25 +msgid "package" +msgstr "pakke" + +#: models/core.py:26 +msgid "packages" +msgstr "pakker" + +#: models/core.py:36 +msgid "python module name" +msgstr "python modul navn" + +#: models/core.py:38 +msgid "content type" +msgstr "innholds type" + +#: models/core.py:39 +msgid "content types" +msgstr "innholds typer" + +#: models/core.py:62 +msgid "redirect from" +msgstr "videresend fra" + +#: models/core.py:63 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Denne burde vær en fullstendig sti, uten domene navnet. Foreksempel: '/" +"nyheter/les/" + +#: models/core.py:64 +msgid "redirect to" +msgstr "videresend til" + +#: models/core.py:65 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Denne kan enten være en fullstendig sti (som over), eller en hel " +"internettadresse som starter med 'http://'" + +#: models/core.py:67 +msgid "redirect" +msgstr "videresend" + +#: models/core.py:68 +msgid "redirects" +msgstr "vidersesendelser" + +#: models/core.py:81 +msgid "URL" +msgstr "Internettadresse" + +#: models/core.py:82 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Eksempel: '/om/kontakt/'. Vær sikker på at du har en skråstrek forran og bak." + +#: models/core.py:83 +msgid "title" +msgstr "tittel" + +#: models/core.py:84 +msgid "content" +msgstr "innhold" + +#: models/core.py:85 +msgid "enable comments" +msgstr "tillat kommentarer" + +#: models/core.py:86 +msgid "template name" +msgstr "mal navn" + +#: models/core.py:87 +msgid "" +"Example: 'flatfiles/contact_page'. If this isn't provided, the system will " +"use 'flatfiles/default'." +msgstr "" +"Eksempel: 'flatfiler/kontakt_side'. Vist denne ikke denne er gitt, vill " +"'flatfiles/default' bli brukt." + +#: models/core.py:88 +msgid "registration required" +msgstr "registrering kreves" + +#: models/core.py:88 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Vist denne er krysset av er det bare brukere som er logget inn som kan se " +"siden." + +#: models/core.py:92 +msgid "flat page" +msgstr "flatside" + +#: models/core.py:93 +msgid "flat pages" +msgstr "flatsider" + +#: models/core.py:114 +msgid "session key" +msgstr "sesjon nøkkel" + +#: models/core.py:115 +msgid "session data" +msgstr "sesjon data" + +#: models/core.py:116 +msgid "expire date" +msgstr "utløpsdato" + +#: models/core.py:118 +msgid "session" +msgstr "sesjon" + +#: models/core.py:119 +msgid "sessions" +msgstr "sesjoner" + +#: models/auth.py:8 +msgid "codename" +msgstr "kodenavn" + +#: models/auth.py:10 +msgid "Permission" +msgstr "Rettighet" + +#: models/auth.py:11 models/auth.py:58 +msgid "Permissions" +msgstr "Rettigheter" + +#: models/auth.py:22 +msgid "Group" +msgstr "Gruppe" + +#: models/auth.py:23 models/auth.py:60 +msgid "Groups" +msgstr "Grupper" + +#: models/auth.py:33 +msgid "username" +msgstr "brukernavn" + +#: models/auth.py:34 +msgid "first name" +msgstr "fornavn" + +#: models/auth.py:35 +msgid "last name" +msgstr "etternavn" + +#: models/auth.py:36 +msgid "e-mail address" +msgstr "e-post adresse" + +#: models/auth.py:37 +msgid "password" +msgstr "passord" + +#: models/auth.py:37 +msgid "Use an MD5 hash -- not the raw password." +msgstr "Bruk en MD5 nøkkel -- ikke passordet i ren tekst" + +#: models/auth.py:38 +msgid "staff status" +msgstr "administrasjons status" + +#: models/auth.py:38 +msgid "Designates whether the user can log into this admin site." +msgstr "Bestemmer om brukeren kan logge inn på denne administrasjons siden." + +#: models/auth.py:39 +msgid "active" +msgstr "aktiv" + +#: models/auth.py:40 +msgid "superuser status" +msgstr "super bruker" + +#: models/auth.py:41 +msgid "last login" +msgstr "liste logg inn" + +#: models/auth.py:42 +msgid "date joined" +msgstr "registrerings dato" + +#: 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 "" +"I tillegg til rettighetene som blir gitt manuelt, får også brukeren full " +"tilgang til gruppene han/hun er i." + +#: models/auth.py:48 +msgid "Users" +msgstr "Brukere" + +#: models/auth.py:57 +msgid "Personal info" +msgstr "Personlig informasjon" + +#: models/auth.py:59 +msgid "Important dates" +msgstr "Viktige datoer" + +#: models/auth.py:182 +msgid "Message" +msgstr "Meldinger" + +#: conf/global_settings.py:36 +msgid "Czech" +msgstr "Tsjekkisk" + +#: conf/global_settings.py:37 +msgid "German" +msgstr "Tysk" + +#: conf/global_settings.py:38 +msgid "English" +msgstr "Engelsk" + +#: conf/global_settings.py:39 +msgid "Spanish" +msgstr "Spansk" + +#: conf/global_settings.py:40 +msgid "French" +msgstr "Fransk" + +#: conf/global_settings.py:41 +msgid "Galician" +msgstr "Galisisk" + +#: conf/global_settings.py:42 +msgid "Italian" +msgstr "Italiensk" + +#: conf/global_settings.py:43 +msgid "Norwegian" +msgstr "" + +#: conf/global_settings.py:44 +msgid "Brazilian" +msgstr "Brasiliansk" + +#: conf/global_settings.py:45 +msgid "Russian" +msgstr "Russisk" + +#: conf/global_settings.py:46 +msgid "Serbian" +msgstr "Serbisk" + +#: conf/global_settings.py:47 +msgid "Simplified Chinese" +msgstr "" + +#: core/validators.py:58 +msgid "This value must contain only letters, numbers and underscores." +msgstr "Dette feltet må bare inneholde bokstaver, nummer og understreker." + +#: core/validators.py:62 +msgid "This value must contain only letters, numbers, underscores and slashes." +msgstr "" +"Dette feltet må bare inneholde bokstaver, nummer, understreker og " +"skråstreker." + +#: core/validators.py:70 +msgid "Uppercase letters are not allowed here." +msgstr "Tor skrift er ikke tillatt her." + +#: core/validators.py:74 +msgid "Lowercase letters are not allowed here." +msgstr "Små bokstaver er ikke tillatt her." + +#: core/validators.py:81 +msgid "Enter only digits separated by commas." +msgstr "Skriv inn bare tall, skilt med kommaer." + +#: core/validators.py:93 +msgid "Enter valid e-mail addresses separated by commas." +msgstr "Skriv inn e-post adresser skilt med kommaer." + +#: core/validators.py:100 +msgid "Please enter a valid IP address." +msgstr "Vennligst skriv inn en godkjent IP adresse." + +#: core/validators.py:104 +msgid "Empty values are not allowed here." +msgstr "Dette felte kan ikke være tomt." + +#: core/validators.py:108 +msgid "Non-numeric characters aren't allowed here." +msgstr "Det er bare tall som kan stå i dette feltet." + +#: core/validators.py:112 +msgid "This value can't be comprised solely of digits." +msgstr "Dette feltet kan ikke bare bestå av nummer." + +#: core/validators.py:117 +msgid "Enter a whole number." +msgstr "Skriv inn et helt nummer." + +#: core/validators.py:121 +msgid "Only alphabetical characters are allowed here." +msgstr "Bare alfabetiske bokstaber er tillatt her." + +#: core/validators.py:125 +msgid "Enter a valid date in YYYY-MM-DD format." +msgstr "Skriv inn en dato i ÅÅÅÅ-MM-DD formatet." + +#: core/validators.py:129 +msgid "Enter a valid time in HH:MM format." +msgstr "Skriv inn tiden i TT:MM formatet." + +#: core/validators.py:133 +msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." +msgstr "Skriv inn dato og tid i ÅÅÅÅ-MM-DD TT:MM formatet." + +#: core/validators.py:137 +msgid "Enter a valid e-mail address." +msgstr "Skriv inn en godkjent e-post adresse." + +#: core/validators.py:149 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"Lastopp et bilde. Filen du lastet opp var ikke et bilde, eller så var det et " +"ødelagt bilde" + +#: core/validators.py:156 +#, python-format +msgid "The URL %s does not point to a valid image." +msgstr "Internettadressen %s peker ikke til et godkjent bilde." + +#: core/validators.py:160 +#, python-format +msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." +msgstr "" +"Telefon nummeret må være i XXX-XXX-XXXX formatet. \"%s\" er ikke godkjent." + +#: core/validators.py:168 +#, python-format +msgid "The URL %s does not point to a valid QuickTime video." +msgstr "Internettadressen %s peker ikke til en godkjent QuickTime film." + +#: core/validators.py:172 +msgid "A valid URL is required." +msgstr "En godkjent internettadresse er påbudt." + +#: core/validators.py:186 +#, python-format +msgid "" +"Valid HTML is required. Specific errors are:\n" +"%s" +msgstr "" +"Godkjent HTML er påbudt. Feilene var:\n" +"%s" + +#: core/validators.py:193 +#, python-format +msgid "Badly formed XML: %s" +msgstr "Ikke godkjent XML: %s" + +#: core/validators.py:203 +#, python-format +msgid "Invalid URL: %s" +msgstr "Ikke godkjent internettadresse: %s" + +#: core/validators.py:205 +#, python-format +msgid "The URL %s is a broken link." +msgstr "Internettadresse fører til en side som ikke virker." + +#: core/validators.py:211 +msgid "Enter a valid U.S. state abbreviation." +msgstr "Skriv inn en godkjent amerikansk stats forkortelse." + +#: core/validators.py:226 +#, python-format +msgid "Watch your mouth! The word %s is not allowed here." +msgid_plural "Watch your mouth! The words %s are not allowed here." +msgstr[0] "Pass munnen din! Ordet %s er ikke tillatt her." +msgstr[1] "Pass munnen din! Ordene %s er ikke tillatt her." + +#: core/validators.py:233 +#, python-format +msgid "This field must match the '%s' field." +msgstr "Dette felte må være det samme som i '%s' feltet." + +#: core/validators.py:252 +msgid "Please enter something for at least one field." +msgstr "Vennligst skriv inn noe i minst et felt." + +#: core/validators.py:261 core/validators.py:272 +msgid "Please enter both fields or leave them both empty." +msgstr "Vennligst skriv inn noe i begge felta, eller la dem stå blanke." + +#: core/validators.py:279 +#, python-format +msgid "This field must be given if %(field)s is %(value)s" +msgstr "Dette feltet må bare brukes vist %(field)s er lik %(value)s" + +#: core/validators.py:291 +#, python-format +msgid "This field must be given if %(field)s is not %(value)s" +msgstr "Dette feltet må bare brukes vist %(field)s ikke er lik %(value)s" + +#: core/validators.py:310 +msgid "Duplicate values are not allowed." +msgstr "Like verdier er ikke tillatt." + +#: core/validators.py:333 +#, python-format +msgid "This value must be a power of %s." +msgstr "Denne verdien må være 'power' av %s." + +#: core/validators.py:344 +msgid "Please enter a valid decimal number." +msgstr "Vennligst skriv inn et godkjent desimal tall." + +#: core/validators.py:346 +#, 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." +msgstr[0] "Skriv inn et desimal tall med maksimum %s total antall tall." +msgstr[1] "Skriv inn et desimal tall med maksimum %s total antall tall." + +#: core/validators.py:349 +#, python-format +msgid "Please enter a valid decimal number with at most %s decimal place." +msgid_plural "" +"Please enter a valid decimal number with at most %s decimal places." +msgstr[0] "Skriv inn et desimal tall med maksimum %s tall bak komma. " +msgstr[1] "Skriv inn et desimal tall med maksimum %s tall bak komma. " + +#: core/validators.py:359 +#, python-format +msgid "Make sure your uploaded file is at least %s bytes big." +msgstr "" +"Er du sikker på at fila du prøver å laste opp er minimum %s bytes stor?" + +#: core/validators.py:360 +#, python-format +msgid "Make sure your uploaded file is at most %s bytes big." +msgstr "" +"Er du sikker på at fila du prøver å laste opp er maksimum %s bytes stor?" + +#: core/validators.py:373 +msgid "The format for this field is wrong." +msgstr "Formatet i dette feltet er feil." + +#: core/validators.py:388 +msgid "This field is invalid." +msgstr "Dette feltet er feil." + +#: core/validators.py:423 +#, python-format +msgid "Could not retrieve anything from %s." +msgstr "Klarte ikke å motta noe fra %s." + +#: core/validators.py:426 +#, python-format +msgid "" +"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." +msgstr "" +"Tnternettadressen %(url)s returnerte en ikke godkjent Content-Type '%" +"(contenttype)s'." + +#: core/validators.py:459 +#, python-format +msgid "" +"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " +"\"%(start)s\".)" +msgstr "" +"Vennligst lukk taggen %(tag)s på linje %(line)s. (Linja starer med \"%(start)" +"s\".)" + +#: core/validators.py:463 +#, python-format +msgid "" +"Some text starting on line %(line)s is not allowed in that context. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Noe av teksten som starter på linje %(line)s er ikke tillatt. (Linja starter " +"med \"%(start)s\".)" + +#: core/validators.py:468 +#, python-format +msgid "" +"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"\"%(attr)s\" på linje %(line)s er ikke en godkjent tillegg. (Linja starter " +"med \"%(start)s\".)" + +#: core/validators.py:473 +#, python-format +msgid "" +"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"\"<%(tag)s>\" på linje %(line)s er ikke en godkjent tag. (linja starter med " +"\"%(start)s\".)" + +#: core/validators.py:477 +#, python-format +msgid "" +"A tag on line %(line)s is missing one or more required attributes. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"En tag på linje %(line)s mangler en av de påbydte tillegga. (linja starter " +"med \"%(start)s\".)" + +#: core/validators.py:482 +#, python-format +msgid "" +"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"\"%(attr)s\" tillegg på linje $(line)s har en ikke godkjent verdi. (Linja " +"starter med \"%(start)s\".)" + +#: core/meta/fields.py:95 +msgid " Separate multiple IDs with commas." +msgstr "Separer Id-ene med kommaer." + +#: core/meta/fields.py:98 +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" +"Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mere enn en." + +#~ msgid "Traditional Chinese" +#~ msgstr "Tradisjonell Kinesisk" diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo index 76e2adf48294457723af8e390497b56091a5356a..714d81f6a13e552943c9728bc7e8c6792cbc08e4 100644 GIT binary patch delta 19 acmbQ!#5kvkaYL>;i=~y3<>o^5)sg^1)dq9` delta 19 acmbQ!#5kvkaYL>;i-nb`!RA8s)sg^1s|IZV diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index 7b90746d0c..e423cb6ace 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-04 08:50-0600\n" +"POT-Creation-Date: 2005-11-04 09:29-0600\n" "PO-Revision-Date: 2005-10-11 09:12GMT-3\n" "Last-Translator: João Paulo Farias \n" "Language-Team: Português do Brasil \n" @@ -686,19 +686,23 @@ msgid "Italian" msgstr "Italiano" #: conf/global_settings.py:43 +msgid "Norwegian" +msgstr "" + +#: conf/global_settings.py:44 msgid "Brazilian" msgstr "Brazileiro" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Russian" msgstr "Russo" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 #, fuzzy msgid "Serbian" msgstr "Sérvio" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Simplified Chinese" msgstr "" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo index 73e5adbcfdbb63624e1d7a29d3d5dc24f3e886b7..a9c99e74d21e9eae63cd07c80876dd9da31ba8a8 100644 GIT binary patch delta 17 YcmeCv=+oHnk(\n" "Language-Team: LANGUAGE \n" @@ -678,18 +678,22 @@ msgid "Italian" msgstr "" #: conf/global_settings.py:43 -msgid "Brazilian" +msgid "Norwegian" msgstr "" #: conf/global_settings.py:44 -msgid "Russian" +msgid "Brazilian" msgstr "" #: conf/global_settings.py:45 -msgid "Serbian" +msgid "Russian" msgstr "" #: conf/global_settings.py:46 +msgid "Serbian" +msgstr "" + +#: conf/global_settings.py:47 msgid "Simplified Chinese" msgstr "" diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo index 6577cd7ff0e11b0134c3cbd2eb002f12ba894de7..e4e7ad0d0af5a88df78d4b3a089febe87131b30f 100644 GIT binary patch delta 19 acmdne$hf7Eal;~Y7E3E5%gxKw`6K~J5(aMo delta 19 acmdne$hf7Eal;~Y77Hs=gU!p-`6K~I=muy2 diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index 701fc86ab2..9954f46249 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Serbian (latin) translation v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-04 08:50-0600\n" +"POT-Creation-Date: 2005-11-04 09:29-0600\n" "PO-Revision-Date: 2005-11-03 00:28+0100\n" "Last-Translator: Petar Marić \n" "Language-Team: Nesh & Petar Z;l>OO3_S%E)r_JhdD#06%L6Q~&?~ delta 17 YcmeCG>Z;l>OO3_C%G6-\n" "Language-Team: Simplified Chinese \n" @@ -672,19 +672,23 @@ msgid "Italian" msgstr "意大利语" #: conf/global_settings.py:43 +msgid "Norwegian" +msgstr "" + +#: conf/global_settings.py:44 msgid "Brazilian" msgstr "巴西语" -#: conf/global_settings.py:44 +#: conf/global_settings.py:45 msgid "Russian" msgstr "俄语" -#: conf/global_settings.py:45 +#: conf/global_settings.py:46 #, fuzzy msgid "Serbian" msgstr "塞尔维亚语" -#: conf/global_settings.py:46 +#: conf/global_settings.py:47 msgid "Simplified Chinese" msgstr ""