diff options
| author | Adrian Holovaty <adrian@holovaty.com> | 2005-11-04 14:53:24 +0000 |
|---|---|---|
| committer | Adrian Holovaty <adrian@holovaty.com> | 2005-11-04 14:53:24 +0000 |
| commit | 9f92a2b92ba9145ca573c40113d571375367e5bd (patch) | |
| tree | 2c2f82b1b13e901fb9db29c69deb6a66b07e8869 | |
| parent | d35d1f15814c2cf520e2c71a7f483673d0b422a5 (diff) | |
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
| -rw-r--r-- | django/conf/global_settings.py | 7 | ||||
| -rw-r--r-- | django/conf/locale/cs/LC_MESSAGES/django.po | 238 | ||||
| -rw-r--r-- | django/conf/locale/de/LC_MESSAGES/django.po | 244 | ||||
| -rw-r--r-- | django/conf/locale/en/LC_MESSAGES/django.po | 206 | ||||
| -rw-r--r-- | django/conf/locale/es/LC_MESSAGES/django.po | 242 | ||||
| -rw-r--r-- | django/conf/locale/fr/LC_MESSAGES/django.po | 244 | ||||
| -rw-r--r-- | django/conf/locale/gl/LC_MESSAGES/django.po | 240 | ||||
| -rw-r--r-- | django/conf/locale/it/LC_MESSAGES/django.po | 240 | ||||
| -rw-r--r-- | django/conf/locale/pt_BR/LC_MESSAGES/django.po | 240 | ||||
| -rw-r--r-- | django/conf/locale/ru/LC_MESSAGES/django.po | 240 | ||||
| -rw-r--r-- | django/conf/locale/sr/LC_MESSAGES/django.po | 238 | ||||
| -rw-r--r-- | django/conf/locale/zh_CN/LC_MESSAGES/django.po | 234 |
12 files changed, 1306 insertions, 1307 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 <translate@svarz.cz>\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 <em>(500)</em>" +msgstr "Chyba serveru <em>(500)</em>" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"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 <em>(500)</em>" -msgstr "Chyba serveru <em>(500)</em>" - -#: 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 "<a href=\"/password_reset/\">Zapomněl(a) jste své heslo?</a>" msgid "Log in" msgstr "Přihlášení" -#: 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/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/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/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 <gb@bofh.ms>\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 <em>(500)</em>" +msgstr "Serverfehler <em>(500)</em>" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"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 <em>(500)</em>" -msgstr "Serverfehler <em>(500)</em>" - -#: 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." - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Seite nicht gefunden" +"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: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 <a href=\"/password_reset/\">ihr Passwort vergessen</a>?" msgid "Log in" msgstr "Anmelden" -#: 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/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/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/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 Kennwortnderung" 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 <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\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 <em>(500)</em>" +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 <em>(500)</em>" -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," -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:" +#: 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/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,32 +183,32 @@ 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" +#: 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 "" -#: 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." +#: contrib/admin/templates/registration/password_change_form.html:17 +msgid "Old password:" msgstr "" -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" +#: contrib/admin/templates/registration/password_change_form.html:19 +msgid "New password:" msgstr "" -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Confirm password:" msgstr "" -#: contrib/admin/templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." +#: contrib/admin/templates/registration/password_change_form.html:23 +msgid "Change my password" msgstr "" -#: contrib/admin/templates/registration/logged_out.html:10 -msgid "Log in again" +#: 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 @@ -214,28 +222,6 @@ msgid "" "should be receiving it shortly." msgstr "" -#: contrib/admin/templates/registration/password_change_form.html:12 -msgid "" -"Please enter your old password, for security's sake, and then enter your new " -"password twice so we can verify you typed it in correctly." -msgstr "" - -#: contrib/admin/templates/registration/password_change_form.html:17 -msgid "Old password:" -msgstr "" - -#: contrib/admin/templates/registration/password_change_form.html:19 -msgid "New password:" -msgstr "" - -#: contrib/admin/templates/registration/password_change_form.html:21 -msgid "Confirm password:" -msgstr "" - -#: contrib/admin/templates/registration/password_change_form.html:23 -msgid "Change my password" -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 <ricardo.cardenes@gmail." "com>\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 <em>(500)</em>" +msgstr "Error de servidor <em>(500)</em>" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"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 administracin de Django" 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 <em>(500)</em>" -msgstr "Error de servidor <em>(500)</em>" - -#: 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 "Ha <a href=\"/password_reset/\">olvidado su clave</a>?" msgid "Log in" msgstr "Registrarse" -#: 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/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/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/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 xito" 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 "Gracias por usar nuestro sitio!" 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 <laurent.rahuel@gmail.com>\n" "Language-Team: franais <fr@li.org>\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 <em>(500)</em>" +msgstr "Erreur du serveur <em>(500)</em>" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"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 <em>(500)</em>" -msgstr "Erreur du serveur <em>(500)</em>" - -#: 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 <a href=\"/password_reset/\">perdu votre mot de passe</a>?" msgid "Log in" msgstr "Connectez vous" -#: 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/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/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/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 avec succs" 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 <fonzzo.django@gmail.com>\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 <em>(500)</em>" +msgstr "Erro do servidor <em>(500)</em>" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"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 <em>(500)</em>" -msgstr "Erro do servidor <em>(500)</em>" - -#: 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 "<a href=\"/password_reset/\">Esqueceu o contrasinal</a>?" msgid "Log in" msgstr "Entrar" -#: 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/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/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/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 <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\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 <em>(500)</em>" +msgstr "Errore del Server <em>(500)</em>" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"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 <em>(500)</em>" -msgstr "Errore del Server <em>(500)</em>" - -#: 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 <a href=\"/password_reset/\">dimenticato la tua password</a>?" msgid "Log in" msgstr "Accedi" -#: 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/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/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/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 stata cambiata con successo" 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 <jpaulofarias@gmail.com>\n" "Language-Team: Português do Brasil <pt-br@li.org>\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 <em>(500)</em>" +msgstr "Erro no Servidor <em>(500)</em>" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"Houve um erro. Este foi reportado aos administradores do site através d e-" +"mail e deve ser consertado em breve. Obrigado pela compreensão." + #: 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 <em>(500)</em>" -msgstr "Erro no Servidor <em>(500)</em>" - -#: 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ê <a href=\"/password_reset/\"esqueceu a senha</a>?" msgid "Log in" msgstr "Acessar" -#: 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/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/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/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 <ds@@dial.com.ru>\n" "Language-Team: LANGUAGE <LL@li.org>\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 <em>(500)</em>" +msgstr " <em>(500)</em>" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +" . e-mail " +" . ." + #: contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "" @@ -62,35 +104,29 @@ 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 <em>(500)</em>" -msgstr " <em>(500)</em>" - -#: 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 " <a href=\"/password_reset/\"> </a>?" msgid "Log in" msgstr "" -#: 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/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/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr " ." -#: 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 stata cambiata con successo" 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ć <petar.maric@gmail.com>\n" "Language-Team: Nesh <nesh@studioquatro.co.yu> & Petar <petar.maric@gmail." @@ -17,17 +17,59 @@ msgstr "" "X-Poedit-SourceCharset: utf-8\n" "X-Poedit-Basepath: ../../../../\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 "Dobrodošli," + +#: 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/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 "Početna strana" +#: 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/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/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 <em>(500)</em>" +msgstr "Greška na serveru <em>(500)</em>" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"Dogodila se greška koja je prijavljena administratorima i biće popravljena " +"uskoro. Hvala Vam na strpljenju." + #: 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 <em>(500)</em>" -msgstr "Greška na serveru <em>(500)</em>" - -#: 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 <a href=\"/password_reset/\">zaboravili Vašu lozinku?</a>?" msgid "Log in" msgstr "Prijavi se" -#: contrib/admin/templates/admin/base.html:23 -msgid "Welcome," -msgstr "Dobrodošli," - -#: 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/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/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 <limodou@gmail.com>\n" "Language-Team: Simplified Chinese <limodou@gmail.com>\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 <em>(500)</em>" +msgstr "服务器错误 <em>(500)</em>" + +#: contrib/admin/templates/admin/500.html:10 +msgid "" +"There's been an error. It's been reported to the site administrators via e-" +"mail and should be fixed shortly. Thanks for your patience." +msgstr "" +"存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢" +"谢你的关心。" + #: 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 <em>(500)</em>" -msgstr "服务器错误 <em>(500)</em>" - -#: 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 "<a href=\"/password_reset/\">忘记你的密码</a>？" msgid "Log in" msgstr "登录" -#: 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/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/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "感谢今天在本网站花费了您的一些宝贵时间。" -#: 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 |