summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorg Bauer <gb@hugo.westfalen.de>2005-11-09 10:27:41 +0000
committerGeorg Bauer <gb@hugo.westfalen.de>2005-11-09 10:27:41 +0000
commit571d94fd3a1eb8b13e2113ff65f2f0c9ea53c32c (patch)
tree6df5afcaed1fb118fe94c8957cafe5b960ca61e1
parentce0876bcc40e3495e64593ee5e584ff7bdde05b3 (diff)
updated .po/.mo files for new message IDs and new line numbers
git-svn-id: http://code.djangoproject.com/svn/django/trunk@1135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/locale/cs/LC_MESSAGES/django.mobin17670 -> 17670 bytes
-rw-r--r--django/conf/locale/cs/LC_MESSAGES/django.po356
-rw-r--r--django/conf/locale/cy/LC_MESSAGES/django.mobin17472 -> 17296 bytes
-rw-r--r--django/conf/locale/cy/LC_MESSAGES/django.po267
-rw-r--r--django/conf/locale/de/LC_MESSAGES/django.mobin17966 -> 17966 bytes
-rw-r--r--django/conf/locale/de/LC_MESSAGES/django.po364
-rw-r--r--django/conf/locale/en/LC_MESSAGES/django.mobin421 -> 421 bytes
-rw-r--r--django/conf/locale/en/LC_MESSAGES/django.po306
-rw-r--r--django/conf/locale/es/LC_MESSAGES/django.mobin5203 -> 5203 bytes
-rw-r--r--django/conf/locale/es/LC_MESSAGES/django.po358
-rw-r--r--django/conf/locale/fr/LC_MESSAGES/django.mobin17763 -> 17763 bytes
-rw-r--r--django/conf/locale/fr/LC_MESSAGES/django.po364
-rw-r--r--django/conf/locale/gl/LC_MESSAGES/django.mobin5322 -> 5322 bytes
-rw-r--r--django/conf/locale/gl/LC_MESSAGES/django.po356
-rw-r--r--django/conf/locale/it/LC_MESSAGES/django.mobin16820 -> 16820 bytes
-rw-r--r--django/conf/locale/it/LC_MESSAGES/django.po360
-rw-r--r--django/conf/locale/no/LC_MESSAGES/django.mobin17403 -> 17403 bytes
-rw-r--r--django/conf/locale/no/LC_MESSAGES/django.po356
-rw-r--r--django/conf/locale/pt_BR/LC_MESSAGES/django.mobin16668 -> 16668 bytes
-rw-r--r--django/conf/locale/pt_BR/LC_MESSAGES/django.po360
-rw-r--r--django/conf/locale/ro/LC_MESSAGES/django.mobin17447 -> 17447 bytes
-rw-r--r--django/conf/locale/ro/LC_MESSAGES/django.po503
-rw-r--r--django/conf/locale/ru/LC_MESSAGES/django.mobin5134 -> 5134 bytes
-rw-r--r--django/conf/locale/ru/LC_MESSAGES/django.po356
-rw-r--r--django/conf/locale/sk/LC_MESSAGES/django.mobin17529 -> 17529 bytes
-rw-r--r--django/conf/locale/sk/LC_MESSAGES/django.po358
-rw-r--r--django/conf/locale/sr/LC_MESSAGES/django.mobin16564 -> 16564 bytes
-rw-r--r--django/conf/locale/sr/LC_MESSAGES/django.po358
-rw-r--r--django/conf/locale/zh_CN/LC_MESSAGES/django.mobin15626 -> 15626 bytes
-rw-r--r--django/conf/locale/zh_CN/LC_MESSAGES/django.po354
30 files changed, 2759 insertions, 2617 deletions
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index 945c9caf9e..b2d23df416 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cs/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po
index 7b43bb157c..93ff211519 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django Czech translation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:26-0600\n"
"PO-Revision-Date: 2005-11-06 18:39+0100\n"
"Last-Translator: Radek Svarz <translate@svarz.cz>\n"
"Language-Team: Czech\n"
@@ -19,58 +19,45 @@ msgstr ""
"X-Poedit-Language: Czech\n"
"X-Poedit-Country: CZECH REPUBLIC\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Vítejte,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "�as akce"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Změnit heslo"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "object id"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odhlásit se"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "object repr"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "příznak akce"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "zpráva změny"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "log záznam"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "log záznamy"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_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
-msgid "Server error"
-msgstr "Chyba serveru"
-
-#: 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"
@@ -107,28 +94,34 @@ msgstr "Django správa webu"
msgid "Django administration"
msgstr "Django správa"
-#: 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 ve vymazá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/500.html:4
+msgid "Server error"
+msgstr "Chyba serveru"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: 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 ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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 ""
-"Jste si jist(á), že chcete smazat %(object_name)s \"%(object)s\"? Všechny "
-"následující související položky budou smazány:"
+"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/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Ano, jsem si jist"
+#: 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/index.html:27
msgid "Add"
@@ -170,13 +163,40 @@ msgstr "<a href=\"/password_reset/\">Zapomněl(a) jste své heslo?</a>"
msgid "Log in"
msgstr "Přihlášení"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Děkujeme Vám za Váš strávený �as na našich webových stránkách."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Vítejte,"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Přihlašte se znova"
+#: 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 ve vymazání souvisejících "
+"objektů, ale Váš ú�et nemá oprávnění pro mazání následujících typů objektů:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Jste si jist(á), že chcete smazat %(object_name)s \"%(object)s\"? Všechny "
+"následující související položky budou smazány:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Ano, jsem si jist"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -194,6 +214,49 @@ 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 "
@@ -218,25 +281,6 @@ 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"
@@ -268,50 +312,6 @@ 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"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "object id"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "object repr"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "příznak akce"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "zpráva změny"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "log záznam"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "log záznamy"
-
#: utils/dates.py:6
msgid "Monday"
msgstr "Pondělí"
@@ -432,50 +432,50 @@ msgstr "web"
msgid "sites"
msgstr "weby"
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr "nadpis"
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr "jméno"
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr "balík"
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr "balíky"
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr "jméno modulu Pythonu"
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr "typ obsahu"
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr "typy obsahu"
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr "přesměrovat z"
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
msgstr ""
"Toto by měla být absolutní cesta, bez domény. Např. '/udalosti/hledat/'."
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr "přesměrovat na"
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
@@ -483,41 +483,41 @@ msgstr ""
"Toto může být bu� absolutní cesta (jako nahoře) nebo plné URL za�ínající na "
"'http://'."
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr "přesměrovat"
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr "přesměrování"
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr "URL"
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
"Příklad: '/o/kontakt/'. Ujistěte se, že máte po�áte�ní a kone�ná lomítka."
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr "titulek"
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr "obsah"
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr "povolit komentáře"
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr "jméno šablony"
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
@@ -525,41 +525,41 @@ msgstr ""
"Například: 'flatfiles/kontaktni_stranka'. Pokud toto není zadáno, systém "
"použije 'flatfiles/default'."
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr "nutná registrace"
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
"Pokud je zaškrtnuto, pouze přihlášení uživatelé budou moci prohlížet tuto "
"stránku."
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr "statická stránka"
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr "statické stránky"
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr "klí� sezení"
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr "data sezení"
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr "datum expirace"
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr "sezení"
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr "sezení"
@@ -661,54 +661,62 @@ msgid "Czech"
msgstr "ÄŒesky"
#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:38
msgid "German"
msgstr "Německy"
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
msgid "English"
msgstr "Anglicky"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
msgid "Spanish"
msgstr "Španělsky"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "French"
msgstr "Francouzsky"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
#, fuzzy
msgid "Galician"
msgstr "Galicijský"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Italian"
msgstr "Italsky"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "Norwegian"
msgstr "Norsky"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Brazilian"
msgstr "Brazilsky"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
msgid "Russian"
msgstr "Rusky"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Serbian"
msgstr "Srbsky"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:50
msgid "Simplified Chinese"
msgstr "Jednoduchá �ínština"
-#: conf/global_settings.py:48
-msgid "Slovak"
-msgstr ""
-
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr "Tato hodnota musí obsahovat pouze znaky, �ísla nebo podtržítka."
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index a26fdf27b0..a12b20cf26 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cy/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po
index c39680c07d..2a9b6a00f8 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-05 23:23+0000\n"
+"POT-Creation-Date: 2005-11-09 04:27-0600\n"
"PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
"Last-Translator: Jason Davies <jason@jasondavies.com>\n"
"Language-Team: Cymraeg <cy@li.org>\n"
@@ -16,6 +16,34 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "amser gweithred"
+
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id gwrthrych"
+
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "repr gwrthrych"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "fflag gweithred"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "neges newid"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "cofnod"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "cofnodion"
+
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/base.html:29
@@ -279,34 +307,6 @@ msgstr "Diolch am ddefnyddio ein safle!"
msgid "The %(site_name)s team"
msgstr "Y tîm %(site_name)s"
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "amser gweithred"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id gwrthrych"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "repr gwrthrych"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "fflag gweithred"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "neges newid"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "cofnod"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "cofnodion"
-
#: utils/dates.py:6
msgid "Monday"
msgstr "Dydd Llun"
@@ -411,55 +411,55 @@ msgstr "Tach."
msgid "Dec."
msgstr "Rhag."
-#: models/core.py:5
+#: models/core.py:7
msgid "domain name"
msgstr "parth-enw"
-#: models/core.py:6
+#: models/core.py:8
msgid "display name"
msgstr "enw arddangos"
-#: models/core.py:8
+#: models/core.py:10
msgid "site"
msgstr "safle"
-#: models/core.py:9
+#: models/core.py:11
msgid "sites"
msgstr "safleoedd"
-#: models/core.py:22
+#: models/core.py:28
msgid "label"
msgstr "label"
-#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr "enw"
-#: models/core.py:25
+#: models/core.py:31
msgid "package"
msgstr "pecyn"
-#: models/core.py:26
+#: models/core.py:32
msgid "packages"
msgstr "pecynau"
-#: models/core.py:36
+#: models/core.py:42
msgid "python module name"
msgstr "enw modwl python"
-#: models/core.py:38
+#: models/core.py:44
msgid "content type"
msgstr "math cynnwys"
-#: models/core.py:39
+#: models/core.py:45
msgid "content types"
msgstr "mathau cynnwys"
-#: models/core.py:62
+#: models/core.py:68
msgid "redirect from"
msgstr "ailgyfeirio o"
-#: models/core.py:63
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
@@ -467,11 +467,11 @@ msgstr ""
"Ddylai hon bod yn lwybr hollol, heb y parth-enw. Er enghraifft: '/"
"digwyddiadau/chwilio/'."
-#: models/core.py:64
+#: models/core.py:70
msgid "redirect to"
msgstr "ailgyfeirio i"
-#: models/core.py:65
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
@@ -479,42 +479,42 @@ msgstr ""
"Gellir fod naill ai llwybr hollol (fel uwch) neu URL hollol yn ddechrau â "
"'http://'."
-#: models/core.py:67
+#: models/core.py:73
msgid "redirect"
msgstr "ailgyfeiriad"
-#: models/core.py:68
+#: models/core.py:74
msgid "redirects"
msgstr "ailgyfeiriadau"
-#: models/core.py:81
+#: models/core.py:87
msgid "URL"
msgstr "URL"
-#: models/core.py:82
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
"Er enghraifft: '/amdan/cyswllt/'. Sicrhewch gennych slaesau arweiniol ac "
"trywyddiol."
-#: models/core.py:83
+#: models/core.py:89
msgid "title"
msgstr "teitl"
-#: models/core.py:84
+#: models/core.py:90
msgid "content"
msgstr "cynnwys"
-#: models/core.py:85
+#: models/core.py:91
msgid "enable comments"
msgstr "galluogi sylwadau"
-#: models/core.py:86
+#: models/core.py:92
msgid "template name"
msgstr "enw'r templed"
-#: models/core.py:87
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
@@ -522,41 +522,41 @@ msgstr ""
"Er enghraifft: 'flatfiles/tudalen_cyswllt'. Os nid darparwyd, ddefnyddia'r "
"system 'flatfiles/default'."
-#: models/core.py:88
+#: models/core.py:94
msgid "registration required"
msgstr "cofrestriad gofynnol"
-#: models/core.py:88
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
"Os wedi dewis, dim ond defnyddwyr a mewngofnodwyd bydd yn gallu gweld y "
"tudalen."
-#: models/core.py:92
+#: models/core.py:98
msgid "flat page"
msgstr "tudalen fflat"
-#: models/core.py:93
+#: models/core.py:99
msgid "flat pages"
msgstr "tudalennau fflat"
-#: models/core.py:114
+#: models/core.py:117
msgid "session key"
msgstr "goriad sesiwn"
-#: models/core.py:115
+#: models/core.py:118
msgid "session data"
msgstr "data sesiwn"
-#: models/core.py:116
+#: models/core.py:119
msgid "expire date"
msgstr "dyddiad darfod"
-#: models/core.py:118
+#: models/core.py:121
msgid "session"
msgstr "sesiwn"
-#: models/core.py:119
+#: models/core.py:122
msgid "sessions"
msgstr "sesiynau"
@@ -633,8 +633,8 @@ msgid ""
"In addition to the permissions manually assigned, this user will also get "
"all permissions granted to each group he/she is in."
msgstr ""
-"Yn ogystal â'r hawliau trosglwyddwyd dros law, byddai'r defnyddiwr yma "
-"hefyd yn cael y cwbl hawliau a addefwyd i pob grŵp mae o/hi mewn."
+"Yn ogystal â'r hawliau trosglwyddwyd dros law, byddai'r defnyddiwr yma hefyd "
+"yn cael y cwbl hawliau a addefwyd i pob grŵp mae o/hi mewn."
#: models/auth.py:48
msgid "Users"
@@ -653,13 +653,13 @@ msgid "Message"
msgstr "Neges"
#: conf/global_settings.py:36
-msgid "Welsh"
-msgstr "Cymraeg"
-
-#: conf/global_settings.py:37
msgid "Czech"
msgstr "Tsieceg"
+#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr "Cymraeg"
+
#: conf/global_settings.py:38
msgid "German"
msgstr "Almaeneg"
@@ -693,86 +693,93 @@ msgid "Brazilian"
msgstr "Brasileg"
#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
msgid "Russian"
msgstr "Rwsieg"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Serbian"
msgstr "Serbeg"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:50
msgid "Simplified Chinese"
msgstr "Tsieinëeg Symledig"
-#: core/validators.py:58
+#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr "Rhaid i'r werth yma cynnwys lythrennau, rhifau ac tanlinellau yn unig."
-#: core/validators.py:62
-msgid ""
-"This value must contain only letters, numbers, underscores, dashes and "
-"slashes."
+#: core/validators.py:63
+#, fuzzy
+msgid "This value must contain only letters, numbers, underscores and slashes."
msgstr ""
"Rhaid i'r werth yma cynnwys lythrennau, rhifau, tanlinellau ac slaesau yn "
"unig."
-#: core/validators.py:70
+#: core/validators.py:71
msgid "Uppercase letters are not allowed here."
msgstr "Ni chaniateir priflythrennau yma."
-#: core/validators.py:74
+#: core/validators.py:75
msgid "Lowercase letters are not allowed here."
msgstr "Ni chaniateir lythrennau bach yma."
-#: core/validators.py:81
+#: core/validators.py:82
msgid "Enter only digits separated by commas."
msgstr "Rhowch digidau gwahanu gyda atalnodau yn unig."
-#: core/validators.py:93
+#: core/validators.py:94
msgid "Enter valid e-mail addresses separated by commas."
msgstr "Rhowch cyfeiriad e-bost dilys gwahanu gyda atalnodau."
-#: core/validators.py:100
+#: core/validators.py:98
msgid "Please enter a valid IP address."
msgstr "Rhowch cyfeiriad IP dilys, os gwelwch yn dda."
-#: core/validators.py:104
+#: core/validators.py:102
msgid "Empty values are not allowed here."
msgstr "Ni chaniateir gwerthau gwag yma."
-#: core/validators.py:108
+#: core/validators.py:106
msgid "Non-numeric characters aren't allowed here."
msgstr "Ni chaniateir nodau anrhifol yma."
-#: core/validators.py:112
+#: core/validators.py:110
msgid "This value can't be comprised solely of digits."
msgstr "Ni gellir y werth yma"
-#: core/validators.py:117
+#: core/validators.py:115
msgid "Enter a whole number."
msgstr "Rhowch rhif cyfan."
-#: core/validators.py:121
+#: core/validators.py:119
msgid "Only alphabetical characters are allowed here."
msgstr "Caniateir nodau gwyddorol un unig yma."
-#: core/validators.py:125
+#: core/validators.py:123
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Rhowch dyddiad dilys mewn fformat YYYY-MM-DD."
-#: core/validators.py:129
+#: core/validators.py:127
msgid "Enter a valid time in HH:MM format."
msgstr "Rhowch amser ddilys mewn fformat HH:MM."
-#: core/validators.py:133
+#: core/validators.py:131
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "Rhowch dyddiad/amser ddilys mewn fformat YYYY-MM-DD HH:MM."
-#: core/validators.py:137
+#: core/validators.py:135
msgid "Enter a valid e-mail address."
msgstr "Rhowch cyfeiriad e-bost ddilys."
-#: core/validators.py:149
+#: core/validators.py:147
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -780,26 +787,26 @@ msgstr ""
"Llwythwch delwedd dilys. Doedd y delwedd a llwythwyd dim yn ddelwedd dilys, "
"neu roedd o'n ddelwedd llwgr."
-#: core/validators.py:156
+#: core/validators.py:154
#, python-format
msgid "The URL %s does not point to a valid image."
msgstr "Dydy'r URL %s dim yn pwyntio at delwedd dilys."
-#: core/validators.py:160
+#: core/validators.py:158
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
msgstr "Rhaid rifau ffon bod mewn fformat XXX-XXX-XXXX. Mae \"%s\" yn annilys."
-#: core/validators.py:168
+#: core/validators.py:166
#, python-format
msgid "The URL %s does not point to a valid QuickTime video."
msgstr "Dydy'r URL %s dim yn pwyntio at fideo Quicktime dilys."
-#: core/validators.py:172
+#: core/validators.py:170
msgid "A valid URL is required."
msgstr "Mae URL dilys yn ofynnol."
-#: core/validators.py:186
+#: core/validators.py:184
#, python-format
msgid ""
"Valid HTML is required. Specific errors are:\n"
@@ -808,69 +815,69 @@ msgstr ""
"Mae HTML dilys yn ofynnol. Gwallau penodol yw:\n"
"%s"
-#: core/validators.py:193
+#: core/validators.py:191
#, python-format
msgid "Badly formed XML: %s"
msgstr "XML wedi ffurfio'n wael: %s"
-#: core/validators.py:203
+#: core/validators.py:201
#, python-format
msgid "Invalid URL: %s"
msgstr "URL annilys: %s"
-#: core/validators.py:205
+#: core/validators.py:203
#, python-format
msgid "The URL %s is a broken link."
msgstr "Mae'r URL %s yn gyswllt toredig."
-#: core/validators.py:211
+#: core/validators.py:209
msgid "Enter a valid U.S. state abbreviation."
msgstr "Rhowch talfyriad dalaith U.S. dilys."
-#: core/validators.py:226
+#: core/validators.py:224
#, python-format
msgid "Watch your mouth! The word %s is not allowed here."
msgid_plural "Watch your mouth! The words %s are not allowed here."
msgstr[0] "Gwyliwch eich ceg! Ni chaniateir y gair %s yma."
msgstr[1] "Gwyliwch eich ceg! Ni chaniateir y geiriau %s yma."
-#: core/validators.py:233
+#: core/validators.py:231
#, python-format
msgid "This field must match the '%s' field."
msgstr "Rhaid i'r faes yma cydweddu'r faes '%s'."
-#: core/validators.py:252
+#: core/validators.py:250
msgid "Please enter something for at least one field."
msgstr "Rhowch rhywbeth am un maes o leiaf, os gwelwch yn dda."
-#: core/validators.py:261 core/validators.py:272
+#: core/validators.py:259 core/validators.py:270
msgid "Please enter both fields or leave them both empty."
msgstr "Llenwch y ddwy faes, neu gadewch nhw'n wag, os gwelwch yn dda."
-#: core/validators.py:279
+#: core/validators.py:277
#, python-format
msgid "This field must be given if %(field)s is %(value)s"
msgstr "Rhaid roi'r faes yma os mae %(field)s yn %(value)s"
-#: core/validators.py:291
+#: core/validators.py:289
#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
msgstr "Rhaid roi'r faes yma os mae %(field)s dim yn %(value)s"
-#: core/validators.py:310
+#: core/validators.py:308
msgid "Duplicate values are not allowed."
msgstr "Ni chaniateir gwerthau ddyblyg."
-#: core/validators.py:333
+#: core/validators.py:331
#, python-format
msgid "This value must be a power of %s."
msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
-#: core/validators.py:344
+#: core/validators.py:342
msgid "Please enter a valid decimal number."
msgstr "Rhowch rhif degol dilys, os gwelwch yn dda."
-#: core/validators.py:346
+#: core/validators.py:344
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
msgid_plural ""
@@ -878,7 +885,7 @@ msgid_plural ""
msgstr[0] "Rhowch rhif degol dilys gyda cyfanswm %s digidau o fwyaf."
msgstr[1] "Rhowch rhif degol dilys gyda cyfanswm %s digid o fwyaf."
-#: core/validators.py:349
+#: core/validators.py:347
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
msgid_plural ""
@@ -888,64 +895,64 @@ msgstr[0] ""
msgstr[1] ""
"Rhowch rif degol dilydd gyda o fwyaf %s lleoedd degol, os gwelwch yn dda."
-#: core/validators.py:359
+#: core/validators.py:357
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr "Sicrhewch bod yr ffeil a llwythwyd yn o leiaf %s beit."
-#: core/validators.py:360
+#: core/validators.py:358
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr "Sicrhewch bod yr ffeil a llwythwyd yn %s beit o fwyaf."
-#: core/validators.py:373
+#: core/validators.py:371
msgid "The format for this field is wrong."
msgstr "Mae'r fformat i'r faes yma yn anghywir."
-#: core/validators.py:388
+#: core/validators.py:386
msgid "This field is invalid."
msgstr "Mae'r faes yma yn annilydd."
-#: core/validators.py:423
+#: core/validators.py:421
#, python-format
msgid "Could not retrieve anything from %s."
msgstr "Ni gellir adalw unrhywbeth o %s."
-#: core/validators.py:426
+#: core/validators.py:424
#, python-format
msgid ""
"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
msgstr ""
"Dychwelodd yr URL %(url)s y pennawd Content-Type annilys '%(contenttype)s'."
-#: core/validators.py:459
+#: core/validators.py:457
#, python-format
msgid ""
"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
"\"%(start)s\".)"
msgstr ""
-"Caewch y tag anghaedig %(tag)s o linell %(line)s. (Linell yn ddechrau â "
-"\"%(start)s\".)"
+"Caewch y tag anghaedig %(tag)s o linell %(line)s. (Linell yn ddechrau â \"%"
+"(start)s\".)"
-#: core/validators.py:463
+#: core/validators.py:461
#, python-format
msgid ""
"Some text starting on line %(line)s is not allowed in that context. (Line "
"starts with \"%(start)s\".)"
msgstr ""
-"Ni chaniateir rhai o'r destun ar linell %(line)s yn y gyd-destun yna. (Linell "
-"yn ddechrau â \"%(start)s\".)"
+"Ni chaniateir rhai o'r destun ar linell %(line)s yn y gyd-destun yna. "
+"(Linell yn ddechrau â \"%(start)s\".)"
-#: core/validators.py:468
+#: core/validators.py:466
#, python-format
msgid ""
"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
"(start)s\".)"
msgstr ""
-"Mae \"%(attr)s\" ar lein %(line)s yn priodoledd annilydd. (Linell yn ddechrau "
-"â \"%(start)s\".)"
+"Mae \"%(attr)s\" ar lein %(line)s yn priodoledd annilydd. (Linell yn "
+"ddechrau â \"%(start)s\".)"
-#: core/validators.py:473
+#: core/validators.py:471
#, python-format
msgid ""
"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -954,7 +961,7 @@ msgstr ""
"Mae \"<%(tag)s>\" ar lein %(line)s yn tag annilydd. (Linell yn ddechrau â \"%"
"(start)s\".)"
-#: core/validators.py:477
+#: core/validators.py:475
#, python-format
msgid ""
"A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -963,14 +970,14 @@ msgstr ""
"Mae tag ar lein %(line)s yn eisiau un new fwy priodoleddau gofynnol. (Linell "
"yn ddechrau â \"%(start)s\".)"
-#: core/validators.py:482
+#: core/validators.py:480
#, python-format
msgid ""
"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
"starts with \"%(start)s\".)"
msgstr ""
-"Mae gan y priodoledd \"%(attr)s\" ar lein %(line)s gwerth annilydd. (Linell yn "
-"ddechrau â \"%(start)s\".)"
+"Mae gan y priodoledd \"%(attr)s\" ar lein %(line)s gwerth annilydd. (Linell "
+"yn ddechrau â \"%(start)s\".)"
#: core/meta/fields.py:95
msgid " Separate multiple IDs with commas."
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index c6f78038da..a6d0dd3b6b 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.mo
+++ b/django/conf/locale/de/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index db2d632bee..c44e2d76e0 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:27-0600\n"
"PO-Revision-Date: 2005-11-06 13:54+0100\n"
"Last-Translator: Lukas Kolbe <lucky@knup.de>\n"
"Language-Team: \n"
@@ -15,60 +15,45 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Willkommen,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "Zeit der Aktion"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Kennwort ändern"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "Objekt ID"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Abmelden"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "Objekt Darst."
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "Aktionskennzeichen"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "Änderungsmeldung"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "Logeintrag"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "Logeinträge"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_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 für Ihr "
-"Verständnis."
-
#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "Geschichte"
@@ -105,29 +90,36 @@ msgstr "Django Systemverwaltung"
msgid "Django administration"
msgstr "Django Verwaltung"
-#: 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 Löschung des %(object_name)s '%(object)s' hätte die Löschung von "
-"abhängigen Daten zur Folge, aber Sie haben nicht die nötigen Rechte um die "
-"folgenden abhängigen Daten zu löschen:"
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Serverfehler"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: 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 ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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 ""
-"Sind Sie sicher, das Sie %(object_name)s \"%(object)s\" löschen wollen? Es "
-"werden zusätzlich die folgenden abhängigen Daten mit gelöscht:"
+"Es hat einen Fehler gegeben. Dieser Fehler wurde an die Serververwalter per "
+"eMail weitergegeben und sollte bald behoben sein. Vielen Dank für Ihr "
+"Verständnis."
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Ja, ich bin sicher"
+#: 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/index.html:27
msgid "Add"
@@ -169,13 +161,41 @@ msgstr "Haben Sie <a href=\"/password_reset/\">ihr Kennwort vergessen</a>?"
msgid "Log in"
msgstr "Anmelden"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Danke, dass Sie heute eine Weile bei uns waren."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Willkommen,"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Neu anmelden"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Kennwort ä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 Löschung des %(object_name)s '%(object)s' hätte die Löschung von "
+"abhängigen Daten zur Folge, aber Sie haben nicht die nötigen Rechte um die "
+"folgenden abhängigen Daten zu löschen:"
+
+#: 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\" löschen wollen? Es "
+"werden zusätzlich die folgenden abhängigen Daten mit gelöscht:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Ja, ich bin sicher"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -193,6 +213,50 @@ msgstr "Kennwortänderung erfolgreich"
msgid "Your password was changed."
msgstr "Ihr Kennwort wurde geändert."
+#: 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 zurücksetzen"
+
+#: 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 zurücksetzen"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Danke, dass Sie heute 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 "Kennwort erfolgreich zurückgesetzt"
+
+#: 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 Kürze 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 "
@@ -218,25 +282,6 @@ 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 zurücksetzen"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Kennwort erfolgreich zurückgesetzt"
-
-#: 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 Kürze 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"
@@ -268,51 +313,6 @@ 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 zurücksetzen"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "Zeit der Aktion"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "Objekt ID"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "Objekt Darst."
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "Aktionskennzeichen"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "Änderungsmeldung"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "Logeintrag"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "Logeinträge"
-
#: utils/dates.py:6
msgid "Monday"
msgstr "Montag"
@@ -433,39 +433,39 @@ msgstr "Website"
msgid "sites"
msgstr "Websites"
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr "Label"
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr "Name"
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr "Paket"
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr "Pakete"
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr "Python Modulname"
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr "Inhaltstyp"
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr "Inhaltstypen"
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr "Umleitung von"
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
@@ -473,11 +473,11 @@ msgstr ""
"Hier sollte ein absoluter Pfad stehen, ohne den Domainnamen. Beispiel: '/"
"events/search/'."
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr "Umleitung zu"
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
@@ -485,41 +485,41 @@ msgstr ""
"Hier muss entweder ein absoluter Pfad oder eine komplette URL mit http:// am "
"Anfang stehen."
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr "Umleitung"
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr "Umleitungen"
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr "URL"
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
"Beispiel: '/about/contact/'. Wichtig: vorne und hinten muss ein / stehen."
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr "Titel"
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr "Inhalt"
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr "Kommentare aktivieren"
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr "Name der Vorlage"
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
@@ -527,40 +527,40 @@ msgstr ""
"Beispiel: 'flatfiles/contact_page'. Wenn dieses Feld nicht gefüllt ist, wird "
"'flatfiles/default' als Standard gewählt."
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr "Registrierung erforderlich"
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
"Wenn hier ein Haken ist, können nur angemeldete Benutzer diese Seite sehen."
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr "Webseite"
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr "Webseiten"
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr "Sitzungs-ID"
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr "Sitzungsdaten"
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr "Verfallsdatum"
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr "Sitzung"
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr "Sitzungen"
@@ -662,53 +662,61 @@ msgid "Czech"
msgstr "Tschechisch"
#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:38
msgid "German"
msgstr "Deutsch"
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
msgid "English"
msgstr "Englisch"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
msgid "Spanish"
msgstr "Spanisch"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "French"
msgstr "Französisch"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "Galician"
msgstr "Galicisch"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Italian"
msgstr "Italienisch"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "Norwegian"
msgstr "Norwegisch"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Brazilian"
msgstr "Brasilianisch"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
msgid "Russian"
msgstr "Russisch"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Serbian"
msgstr "Serbisch"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:50
msgid "Simplified Chinese"
msgstr "vereinfachtes Chinesisch"
-#: conf/global_settings.py:48
-msgid "Slovak"
-msgstr ""
-
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten."
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index fcfbec08b3..15a531bb4a 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index eedb4271ad..50b45fa473 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-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:26-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,54 +16,43 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: 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"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
msgstr ""
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-msgid "Home"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
msgstr ""
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
msgstr ""
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
msgstr ""
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
+#: contrib/admin/models/admin.py:12
+msgid "change message"
msgstr ""
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
msgstr ""
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
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."
+#: contrib/admin/templates/admin/object_history.html:5
+#: contrib/admin/templates/admin/500.html:4
+#: 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/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
+msgid "Home"
msgstr ""
#: contrib/admin/templates/admin/object_history.html:5
@@ -100,23 +89,31 @@ msgstr ""
msgid "Django administration"
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:"
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
msgstr ""
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: 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 ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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/delete_confirmation.html:18
-msgid "Yes, I'm sure"
+#: 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/index.html:27
@@ -159,12 +156,35 @@ msgstr ""
msgid "Log in"
msgstr ""
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
msgstr ""
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr ""
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr ""
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
msgstr ""
#: contrib/admin/templates/registration/password_change_done.html:4
@@ -183,32 +203,32 @@ msgstr ""
msgid "Your password was changed."
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."
+#: 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_change_form.html:17
-msgid "Old 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 ""
-#: contrib/admin/templates/registration/password_change_form.html:19
-msgid "New password:"
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
msgstr ""
-#: contrib/admin/templates/registration/password_change_form.html:21
-msgid "Confirm password:"
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
msgstr ""
-#: contrib/admin/templates/registration/password_change_form.html:23
-msgid "Change my password"
+#: 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/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"
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
msgstr ""
#: contrib/admin/templates/registration/password_reset_done.html:6
@@ -222,6 +242,28 @@ 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 ""
@@ -253,48 +295,6 @@ 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 ""
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr ""
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr ""
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr ""
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr ""
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr ""
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr ""
-
#: utils/dates.py:6
msgid "Monday"
msgstr ""
@@ -415,126 +415,126 @@ msgstr ""
msgid "sites"
msgstr ""
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr ""
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr ""
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr ""
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr ""
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr ""
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr ""
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr ""
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr ""
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
msgstr ""
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr ""
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
msgstr ""
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr ""
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr ""
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr ""
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr ""
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr ""
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr ""
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr ""
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
msgstr ""
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr ""
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr ""
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr ""
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr ""
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr ""
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr ""
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr ""
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr ""
@@ -633,53 +633,61 @@ msgid "Czech"
msgstr ""
#: conf/global_settings.py:37
-msgid "German"
+msgid "Welsh"
msgstr ""
#: conf/global_settings.py:38
-msgid "English"
+msgid "German"
msgstr ""
#: conf/global_settings.py:39
-msgid "Spanish"
+msgid "English"
msgstr ""
#: conf/global_settings.py:40
-msgid "French"
+msgid "Spanish"
msgstr ""
#: conf/global_settings.py:41
-msgid "Galician"
+msgid "French"
msgstr ""
#: conf/global_settings.py:42
-msgid "Italian"
+msgid "Galician"
msgstr ""
#: conf/global_settings.py:43
-msgid "Norwegian"
+msgid "Italian"
msgstr ""
#: conf/global_settings.py:44
-msgid "Brazilian"
+msgid "Norwegian"
msgstr ""
#: conf/global_settings.py:45
-msgid "Russian"
+msgid "Brazilian"
msgstr ""
#: conf/global_settings.py:46
-msgid "Serbian"
+msgid "Romanian"
msgstr ""
#: conf/global_settings.py:47
-msgid "Simplified Chinese"
+msgid "Russian"
msgstr ""
#: conf/global_settings.py:48
msgid "Slovak"
msgstr ""
+#: conf/global_settings.py:49
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:50
+msgid "Simplified Chinese"
+msgstr ""
+
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr ""
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index 452235e2da..1fcfa87451 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index 920e55b3dd..c73f64db65 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-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:26-0600\n"
"PO-Revision-Date: 2005-10-04 20:59GMT\n"
"Last-Translator: Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail."
"com>\n"
@@ -17,60 +17,46 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.10.2\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bienvenido,"
+#: contrib/admin/models/admin.py:6
+#, fuzzy
+msgid "action time"
+msgstr "Fecha/hora"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Cambiar clave"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr ""
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Terminar"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr ""
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr ""
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr ""
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr ""
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr ""
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_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ágina 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 página 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 electrónico y debería arreglarse en breve. Gracias por su "
-"paciencia"
-
#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "Histórico"
@@ -107,29 +93,36 @@ msgstr "Sitio de administración de Django"
msgid "Django administration"
msgstr "Administración de Django"
-#: 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' provocaría la eliminación de "
-"objetos relacionados, pero su cuenta no tiene permiso para borrar los "
-"siguientes tipos de objetos:"
+#: contrib/admin/templates/admin/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "Error del servidor (500)"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: 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 ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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 ""
-"¿Está seguro de que quiere borrar los %(object_name)s \"%(object)s\"? Se "
-"borrarán los siguientes objetos relacionados:"
+"Ha ocurrido un error. Se ha informado a los administradores del sitio "
+"mediante correo electrónico y debería arreglarse en breve. Gracias por su "
+"paciencia"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Sí, estoy seguro"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Página 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 página solicitada."
#: contrib/admin/templates/admin/index.html:27
msgid "Add"
@@ -171,13 +164,41 @@ msgstr "¿Ha <a href=\"/password_reset/\">olvidado su clave</a>?"
msgid "Log in"
msgstr "Registrarse"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bienvenido,"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Registrarse de nuevo"
+#: 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' provocaría la eliminación 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 "
+"borrarán los siguientes objetos relacionados:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Sí, estoy seguro"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -195,6 +216,49 @@ 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 dirección 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 "Dirección 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 "Recuperación 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 dirección que ha suministrado. Debería "
+"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 "
@@ -219,25 +283,6 @@ 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 "Recuperación 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 dirección que ha suministrado. Debería "
-"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"
@@ -269,51 +314,6 @@ 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 dirección 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 "Dirección 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"
-msgstr "Fecha/hora"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr ""
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr ""
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr ""
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr ""
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr ""
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr ""
-
#: utils/dates.py:6
msgid "Monday"
msgstr ""
@@ -434,127 +434,127 @@ msgstr ""
msgid "sites"
msgstr ""
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr ""
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
#, fuzzy
msgid "name"
msgstr "Usuario:"
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr ""
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr ""
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr ""
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr ""
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr ""
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr ""
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
msgstr ""
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr ""
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
msgstr ""
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr ""
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr ""
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr ""
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr ""
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr ""
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr ""
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr ""
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
msgstr ""
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr ""
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr ""
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr ""
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr ""
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr ""
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr ""
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr ""
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr ""
@@ -657,53 +657,61 @@ msgid "Czech"
msgstr ""
#: conf/global_settings.py:37
-msgid "German"
+msgid "Welsh"
msgstr ""
#: conf/global_settings.py:38
-msgid "English"
+msgid "German"
msgstr ""
#: conf/global_settings.py:39
-msgid "Spanish"
+msgid "English"
msgstr ""
#: conf/global_settings.py:40
-msgid "French"
+msgid "Spanish"
msgstr ""
#: conf/global_settings.py:41
-msgid "Galician"
+msgid "French"
msgstr ""
#: conf/global_settings.py:42
-msgid "Italian"
+msgid "Galician"
msgstr ""
#: conf/global_settings.py:43
-msgid "Norwegian"
+msgid "Italian"
msgstr ""
#: conf/global_settings.py:44
-msgid "Brazilian"
+msgid "Norwegian"
msgstr ""
#: conf/global_settings.py:45
-msgid "Russian"
+msgid "Brazilian"
msgstr ""
#: conf/global_settings.py:46
-msgid "Serbian"
+msgid "Romanian"
msgstr ""
#: conf/global_settings.py:47
-msgid "Simplified Chinese"
+msgid "Russian"
msgstr ""
#: conf/global_settings.py:48
msgid "Slovak"
msgstr ""
+#: conf/global_settings.py:49
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:50
+msgid "Simplified Chinese"
+msgstr ""
+
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr "Este valor debe contener sólo letras, números y guión bajo."
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index 1e049f1a8b..d69f5df802 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.mo
+++ b/django/conf/locale/fr/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index 5d87731c15..6972c26d51 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-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:27-0600\n"
"PO-Revision-Date: 2005-10-18 12:27+0200\n"
"Last-Translator: Laurent Rahuel <laurent.rahuel@gmail.com>\n"
"Language-Team: français <fr@li.org>\n"
@@ -15,60 +15,45 @@ msgstr ""
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bienvenue,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "heure de l'action"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Modifier votre mot de passe"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id de l'objet"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Déconnection"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "repr de l'objet"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "drapeau de l'action"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "message de modification"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "entrée de log"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "entrées de log"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_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é trouvée"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Nous sommes désolés, mais la page demandée 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 corrigée dans les meilleurs délais. Merci "
-"pour votre patience."
-
#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "Historique"
@@ -105,29 +90,36 @@ msgstr "Site d'administration de Django"
msgid "Django administration"
msgstr "Administration de Django"
-#: 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 liés mais votre compte ne possède pas la permission de "
-"supprimer les types d'objets suivants:"
+#: contrib/admin/templates/admin/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "Erreur du serveur (500)"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: 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 ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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 ""
-"Êtes vous certain de vouloir supprimer %(object_name)s \"%(object)s\"? Tous "
-"les éléments liés suivants seront supprimés:"
+"Une erreur est survenue. Elle a été transmise par courriel aux "
+"administrateurs du site et sera corrigée dans les meilleurs délais. Merci "
+"pour votre patience."
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Oui, je suis certain"
+#: 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é trouvée"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Nous sommes désolés, mais la page demandée est introuvable."
#: contrib/admin/templates/admin/index.html:27
msgid "Add"
@@ -169,13 +161,41 @@ msgstr "Avez vous <a href=\"/password_reset/\">perdu votre mot de passe</a>?"
msgid "Log in"
msgstr "Connectez vous"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Merci pour le temps que vous avez accordé au site aujourd'hui."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bienvenue,"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Connectez vous à nouveau"
+#: 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 "Déconnection"
+
+#: 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 liés mais votre compte ne possède 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 éléments liés suivants seront supprimés:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Oui, je suis certain"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -193,6 +213,50 @@ msgstr "Mot de passe modifié avec succés"
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 "Réinitialisation 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 "Réinitialiser 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 réinitialisé avec succés"
+
+#: 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 "
@@ -218,25 +282,6 @@ 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 "Réinitialisation 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 réinitialisé avec succés"
-
-#: 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 ""
@@ -269,51 +314,6 @@ 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 "Réinitialiser mon mot de passe"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "heure de l'action"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id de l'objet"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "repr de l'objet"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "drapeau de l'action"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "message de modification"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "entrée de log"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "entrées de log"
-
#: utils/dates.py:6
msgid "Monday"
msgstr "Lundi"
@@ -434,39 +434,39 @@ msgstr "site"
msgid "sites"
msgstr "sites"
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr "intitulé"
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr "nom"
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr "paquetage"
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr "paquetages"
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr "nom du module python"
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr "type de contenu"
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr "types de contenu"
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr "redirigé depuis"
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
@@ -474,11 +474,11 @@ msgstr ""
"Ceci doit être un chemin absolu, sans nom de domaine. Par exemple: '/events/"
"search/'."
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr "redirigé vers"
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
@@ -486,42 +486,42 @@ msgstr ""
"Ceci peut être soit un chemin absolu (voir ci-dessus) soit une URL complète "
"débutant par 'http://'."
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr "redirection"
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr "redirections"
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr "URL"
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
"Par exemple : '/about/contact/'. Vérifiez la présence du caractère '/' en "
"début et en fin de chaine."
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr "titre"
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr "contenu"
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr "autoriser les commentaires"
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr "nom du template"
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
@@ -529,41 +529,41 @@ msgstr ""
"Par exemple: 'flatfiles/contact_page'. Sans définition, le système utilisera "
"'flatfiles/default'."
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr "enregistrement requis"
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
"Si coché, seuls les utilisateurs connectés auront la possibilité de voir "
"cette page."
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr "page à plat"
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr "pages à plat"
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr "clé de session"
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr "donnée de session"
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr "date d'expiration"
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr "session"
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr "sessions"
@@ -665,55 +665,63 @@ msgid "Czech"
msgstr "Tchèque"
#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:38
msgid "German"
msgstr "Allemand"
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
msgid "English"
msgstr "Anglais"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
msgid "Spanish"
msgstr "Espagnol"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "French"
msgstr "Français"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "Galician"
msgstr "Galicien"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
#, fuzzy
msgid "Italian"
msgstr "Italien"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Brazilian"
msgstr "Brésilien"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
msgid "Russian"
msgstr "Russe"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
#, fuzzy
msgid "Serbian"
msgstr "Serbe"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:50
msgid "Simplified Chinese"
msgstr ""
-#: conf/global_settings.py:48
-msgid "Slovak"
-msgstr ""
-
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr ""
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index 6ea91bdb71..cb2df58b31 100644
--- a/django/conf/locale/gl/LC_MESSAGES/django.mo
+++ b/django/conf/locale/gl/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index 0f39a0f20f..bafcd9b918 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-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:26-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,59 +17,46 @@ msgstr ""
"X-Poedit-Language: Galician\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Benvido,"
+#: contrib/admin/models/admin.py:6
+#, fuzzy
+msgid "action time"
+msgstr "Data/hora"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Cambiar contrasinal"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr ""
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Saír"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr ""
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr ""
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr ""
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr ""
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr ""
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_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"
@@ -106,29 +93,35 @@ msgstr "Administración de sitio Django"
msgid "Django administration"
msgstr "Administración de Django"
-#: 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/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "Erro do servidor (500)"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: 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 ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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 ""
-"Seguro que quere borrar o %(object_name)s \"%(object)s\"? Eliminaranse os "
-"seguintes obxectos relacionados:"
+"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/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Si, estou seguro"
+#: 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/index.html:27
msgid "Add"
@@ -170,13 +163,41 @@ msgstr "<a href=\"/password_reset/\">Esqueceu o contrasinal</a>?"
msgid "Log in"
msgstr "Entrar"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Grazas polo tempo que dedicou ao sitio web."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Benvido,"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Entrar de novo"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Cambiar contrasinal"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Saír"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Borrar o %(object_name)s '%(object)s' resultaría na eliminación de obxectos "
+"relacionados, pero a súa conta non ten permiso para borrar os seguintes "
+"tipos de obxectos:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Seguro que quere borrar o %(object_name)s \"%(object)s\"? Eliminaranse os "
+"seguintes obxectos relacionados:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Si, estou seguro"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -194,6 +215,49 @@ 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 "
@@ -218,25 +282,6 @@ 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"
@@ -268,51 +313,6 @@ 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"
-msgstr "Data/hora"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr ""
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr ""
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr ""
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr ""
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr ""
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr ""
-
#: utils/dates.py:6
msgid "Monday"
msgstr ""
@@ -433,127 +433,127 @@ msgstr ""
msgid "sites"
msgstr ""
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr ""
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
#, fuzzy
msgid "name"
msgstr "Usuario:"
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr ""
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr ""
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr ""
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr ""
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr ""
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr ""
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
msgstr ""
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr ""
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
msgstr ""
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr ""
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr ""
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr ""
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr ""
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr ""
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr ""
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr ""
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
msgstr ""
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr ""
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr ""
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr ""
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr ""
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr ""
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr ""
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr ""
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr ""
@@ -656,53 +656,61 @@ msgid "Czech"
msgstr ""
#: conf/global_settings.py:37
-msgid "German"
+msgid "Welsh"
msgstr ""
#: conf/global_settings.py:38
-msgid "English"
+msgid "German"
msgstr ""
#: conf/global_settings.py:39
-msgid "Spanish"
+msgid "English"
msgstr ""
#: conf/global_settings.py:40
-msgid "French"
+msgid "Spanish"
msgstr ""
#: conf/global_settings.py:41
-msgid "Galician"
+msgid "French"
msgstr ""
#: conf/global_settings.py:42
-msgid "Italian"
+msgid "Galician"
msgstr ""
#: conf/global_settings.py:43
-msgid "Norwegian"
+msgid "Italian"
msgstr ""
#: conf/global_settings.py:44
-msgid "Brazilian"
+msgid "Norwegian"
msgstr ""
#: conf/global_settings.py:45
-msgid "Russian"
+msgid "Brazilian"
msgstr ""
#: conf/global_settings.py:46
-msgid "Serbian"
+msgid "Romanian"
msgstr ""
#: conf/global_settings.py:47
-msgid "Simplified Chinese"
+msgid "Russian"
msgstr ""
#: conf/global_settings.py:48
msgid "Slovak"
msgstr ""
+#: conf/global_settings.py:49
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:50
+msgid "Simplified Chinese"
+msgstr ""
+
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr "Este valor soamente pode conter letras, números e guións baixos (_)."
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 79f54a452b..d9e2f72bef 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.mo
+++ b/django/conf/locale/it/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index 8f1fb83ca8..0c7de386de 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-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:27-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,59 +16,45 @@ msgstr ""
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Benvenuto,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "data azione"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Cambia la password"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id dell'oggetto"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Esci"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "rappresentazione dell'oggetto"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "flag azione"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "messaggio"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "voce di log"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "voci di log"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_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"
@@ -105,29 +91,35 @@ msgstr "Amministrazione sito Django"
msgid "Django administration"
msgstr "Amministrazione Django"
-#: 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/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "Errore del server (500)"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: 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 ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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 ""
-"Sei sicuro di voler rimuovere %(object_name)s \"%(object)s\"? I seguenti "
-"oggetti relazionati saranno rimossi:"
+"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/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Sì, sono sicuro"
+#: 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/index.html:27
msgid "Add"
@@ -169,13 +161,41 @@ msgstr "Hai <a href=\"/password_reset/\">dimenticato la tua password</a>?"
msgid "Log in"
msgstr "Accedi"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Grazie per aver speso il tuo tempo prezioso con questo sito."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Benvenuto,"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Accedi di nuovo"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Cambia la password"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Esci"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"La rimozione di %(object_name)s '%(object)s' causerebbe la cancellazione "
+"degli oggetti relazionati, ma il tuo account non ha i permessi per rimuovere "
+"i seguenti tipi di oggetti:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Sei sicuro di voler rimuovere %(object_name)s \"%(object)s\"? I seguenti "
+"oggetti relazionati saranno rimossi:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Sì, sono sicuro"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -193,6 +213,49 @@ 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 "
@@ -217,25 +280,6 @@ 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 ""
@@ -268,50 +312,6 @@ 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"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id dell'oggetto"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "rappresentazione dell'oggetto"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "flag azione"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "messaggio"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "voce di log"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "voci di log"
-
#: utils/dates.py:6
msgid "Monday"
msgstr "Lunedì"
@@ -432,39 +432,39 @@ msgstr "sito"
msgid "sites"
msgstr "siti"
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr "etichetta"
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr "nome"
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr "pacchetto"
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr "pacchetti"
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr "nome del modulo python"
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr "tipo di contenuto"
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr "tipo di contenuti"
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr "redirigi da"
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
@@ -472,52 +472,52 @@ msgstr ""
"Un percorso assoluto, senza nome a dominio. Esempio: '/events/search/'.Un "
"percorso assoluto, senza nome a dominio. Esempio: '/events/search/'."
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr "redirigi verso"
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
msgstr ""
"Un percorso assoluto (come sopra) o un URL completa che inizi con 'http://'."
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr "redirigi"
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr "redirezioni"
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr "URL"
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
"Esempio: '/about/contact/'. Attenzione alla barra ('/') iniziale e finale."
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr "titolo"
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr "contenuto"
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr "abilita commenti"
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr "nome modello"
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
@@ -525,39 +525,39 @@ msgstr ""
"Esempio: 'flatfiles/contact_page'. Se non specificato, il sistema userà "
"'flatfiles/default'."
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr "registrazione obbligatoria"
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr "Se selezionata, solo gli utenti registrati potranno vedere la pagina."
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr "pagina statica"
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr "pagine statiche"
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr "chiave di sessione"
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr "dati di sessione"
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr "data di scadenza"
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr "sessione"
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr "sessioni"
@@ -658,54 +658,62 @@ msgid "Czech"
msgstr ""
#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:38
msgid "German"
msgstr "Tedesco"
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
msgid "English"
msgstr "Inglese"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
msgid "Spanish"
msgstr "Spagnolo"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "French"
msgstr "Francese"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "Galician"
msgstr "Galiziano"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Brazilian"
msgstr "Brasiliano"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
msgid "Russian"
msgstr "Russo"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
#, fuzzy
msgid "Serbian"
msgstr "Serbo"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:50
msgid "Simplified Chinese"
msgstr ""
-#: conf/global_settings.py:48
-msgid "Slovak"
-msgstr ""
-
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr "Sono ammesse solo lettere, numeri e sottolineature ('_')."
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index 30796351f5..e55855be83 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.mo
+++ b/django/conf/locale/no/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index 39420eb7a8..2c88c934bf 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.po
+++ b/django/conf/locale/no/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:27-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Espen Grndhaug <espen@grindhaug.org>\n"
"Language-Team: Norwegian\n"
@@ -16,58 +16,45 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Velkommen"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "handlings tid"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Endre passord"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "objekt id"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Log ut"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "objekt repr"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "handlings flagg"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "endre melding"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "logg notis"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "logg innlegg"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
msgid "Home"
msgstr "Hjem"
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Fant ikke siden"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Beklager, men siden du spør etter finnest ikke."
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Tjener feil"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Tjener feil (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Tjener feil <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 ""
-"Det har vært en feil. Feilen er blitt rapportert til administrator via e-"
-"mail, og vill bli fikset snart. Takk for din tålmodighet."
-
#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "Historie"
@@ -104,28 +91,34 @@ msgstr "Django administrasjonsside"
msgid "Django administration"
msgstr "Django administrasjon"
-#: contrib/admin/templates/admin/delete_confirmation.html:7
-#, python-format
-msgid ""
-"Deleting the %(object_name)s '%(object)s' would result in deleting related "
-"objects, but your account doesn't have permission to delete the following "
-"types of objects:"
-msgstr ""
-"Vist du sletter %(object_name)s '%(object)s' vill du også slette relaterte "
-"objekter, men du har ikke tillatelse til å slette de følgende objektene:"
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Tjener feil"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Tjener feil (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Tjener feil <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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 ""
-"Er du sikker på at du vill slette %(object_name) \"%(object)s\"? Alle de "
-"følgende relaterte objektene vill bli slettet:"
+"Det har vært en feil. Feilen er blitt rapportert til administrator via e-"
+"mail, og vill bli fikset snart. Takk for din tålmodighet."
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Ja, jeg er sikker"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Fant ikke siden"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Beklager, men siden du spør etter finnest ikke."
#: contrib/admin/templates/admin/index.html:27
msgid "Add"
@@ -167,13 +160,40 @@ msgstr "Har du <a href=\"/password_reset/\">glemt passordet ditt</a>?"
msgid "Log in"
msgstr "Log inn"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Takk for å bruke tid på internett siden i dag."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Velkommen"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Log inn igjen"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Endre passord"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Log ut"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Vist du sletter %(object_name)s '%(object)s' vill du også slette relaterte "
+"objekter, men du har ikke tillatelse til å slette de følgende objektene:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Er du sikker på at du vill slette %(object_name) \"%(object)s\"? Alle de "
+"følgende relaterte objektene vill bli slettet:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Ja, jeg er sikker"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -191,6 +211,49 @@ msgstr "Passordet er endret"
msgid "Your password was changed."
msgstr "Ditt passord er endret."
+#: 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 "Tilbakestill passord"
+
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll reset "
+"your password and e-mail the new one to you."
+msgstr ""
+"Har du glemt passordet ditt? Skriv inn epost adressen din under, så sender "
+"vi deg et nytt passord via epost."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Epost adresse:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Tilbakestill mitt passord"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Takk for å bruke tid på internett siden i dag."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Log inn igjen"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Passordet ble tilbakestilt"
+
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid ""
+"We've e-mailed a new password to the e-mail address you submitted. You "
+"should be receiving it shortly."
+msgstr ""
+"Vi sender deg et nytt passord til epost adressen du oppgav. Du villmotta det "
+"snart."
+
#: contrib/admin/templates/registration/password_change_form.html:12
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
@@ -215,25 +278,6 @@ msgstr "Gjenta nytt passord:"
msgid "Change my password"
msgstr "Endre passord"
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "Tilbakestill passord"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Passordet ble tilbakestilt"
-
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"Vi sender deg et nytt passord til epost adressen du oppgav. Du villmotta det "
-"snart."
-
#: contrib/admin/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
msgstr ""
@@ -266,50 +310,6 @@ msgstr "Takk for at du bruker vår side!"
msgid "The %(site_name)s team"
msgstr "Hilsen %(site_name)s"
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"Har du glemt passordet ditt? Skriv inn epost adressen din under, så sender "
-"vi deg et nytt passord via epost."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "Epost adresse:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Tilbakestill mitt passord"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "handlings tid"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "objekt id"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "objekt repr"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "handlings flagg"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "endre melding"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "logg notis"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "logg innlegg"
-
#: utils/dates.py:6
msgid "Monday"
msgstr "Mondag"
@@ -430,39 +430,39 @@ msgstr "side"
msgid "sites"
msgstr "sider"
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr "merkelapp"
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr "navn"
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr "pakke"
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr "pakker"
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr "python modul navn"
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr "innholds type"
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr "innholds typer"
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr "omadresser fra"
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
@@ -470,11 +470,11 @@ msgstr ""
"Denne burde vær en fullstendig sti, uten domene navnet. Foreksempel: '/"
"nyheter/les/"
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr "omadresser til"
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
@@ -482,41 +482,41 @@ msgstr ""
"Denne kan enten være en fullstendig sti (som over), eller en hel "
"internettadresse som starter med 'http://'"
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr "omadressering"
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr "omadresserelser"
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr "Internettadresse"
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
"Eksempel: '/om/kontakt/'. Vær sikker på at du har en skråstrek forran og bak."
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr "tittel"
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr "innhold"
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr "tillat kommentarer"
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr "mal navn"
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
@@ -524,41 +524,41 @@ msgstr ""
"Eksempel: 'flatfiler/kontakt_side'. Vist denne ikke denne er gitt, vill "
"'flatfiles/default' bli brukt."
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr "registrering kreves"
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
"Vist denne er krysset av er det bare brukere som er logget inn som kan se "
"siden."
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr "flatside"
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr "flatsider"
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr "sesjon nøkkel"
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr "sesjon data"
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr "utløpsdato"
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr "sesjon"
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr "sesjoner"
@@ -659,53 +659,61 @@ msgid "Czech"
msgstr "Tsjekkisk"
#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:38
msgid "German"
msgstr "Tysk"
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
msgid "English"
msgstr "Engelsk"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
msgid "Spanish"
msgstr "Spansk"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "French"
msgstr "Fransk"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "Galician"
msgstr "Galisisk"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Italian"
msgstr "Italiensk"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "Norwegian"
msgstr "Norsk"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Brazilian"
msgstr "Brasiliansk"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:50
msgid "Simplified Chinese"
msgstr "Simpel Kinesisk"
-#: conf/global_settings.py:48
-msgid "Slovak"
-msgstr ""
-
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr "Dette feltet må bare inneholde bokstaver, nummer og understreker."
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index 6ff9b32b0a..b0ba0c3498 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index 524ac68d19..b23ca603a4 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-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:26-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,59 +16,45 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bem vindo,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "hora da ação"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Alterar senha"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id do objeto"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Encerrar sessão"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "repr do objeto"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "flag de ação"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "alterar mensagem"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "entrada de log"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "entradas de log"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_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"
@@ -105,29 +91,35 @@ msgstr "Site de administração do Django"
msgid "Django administration"
msgstr "Administração do Django"
-#: 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/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "Erro no servidor (500)"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: 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 ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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 ""
-"Você tem certeza que quer remover o \"%(object)s\" %(object_name)s? Todos os "
-"seguintes itens relacionados serão removidos:"
+"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/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Sim, tenho certeza"
+#: 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/index.html:27
msgid "Add"
@@ -169,13 +161,41 @@ msgstr "Você <a href=\"/password_reset/\"esqueceu a senha</a>?"
msgid "Log in"
msgstr "Acessar"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Obrigado por visitar nosso Web site hoje."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bem vindo,"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Acessar novamente"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Alterar senha"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Encerrar sessão"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"A remoção de '%(object)s' %(object_name)s pode resultar na remoção de "
+"objetos relacionados, mas sua conta não tem a permissão para remoção dos "
+"seguintes tipos de objetos:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Você tem certeza que quer remover o \"%(object)s\" %(object_name)s? Todos os "
+"seguintes itens relacionados serão removidos:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Sim, tenho certeza"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -193,6 +213,49 @@ 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 "
@@ -217,25 +280,6 @@ 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"
@@ -267,50 +311,6 @@ 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"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id do objeto"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "repr do objeto"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "flag de ação"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "alterar mensagem"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "entrada de log"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "entradas de log"
-
#: utils/dates.py:6
msgid "Monday"
msgstr "Segunda Feira"
@@ -431,40 +431,40 @@ msgstr "site"
msgid "sites"
msgstr "sites"
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr "etiqueta"
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
#, fuzzy
msgid "name"
msgstr "nome:"
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr "pacote"
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr "pacotes"
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr "nome do módulo python"
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr "tipo de conteúdo"
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr "tipos de conteúdo"
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr "redirecionar de"
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
@@ -472,11 +472,11 @@ msgstr ""
"Deve conter um caminho absoluto, excluindo o nome de domínio. Exemplo: '/"
"eventos/busca/'."
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr "redirecionar para"
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
@@ -484,40 +484,40 @@ msgstr ""
"Deve conter um caminho absoluto (como acima) ou uma URL completa, começando "
"com 'http://'."
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr "redirecionar"
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr "redirecionamentos"
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr "URL"
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr "Exemplo: '/sobre/contato/'. Lembre-se das barras no começo e no final."
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr "título"
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr "conteúdo"
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr "habilitar comentários"
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr "nome do modelo"
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
@@ -525,39 +525,39 @@ msgstr ""
"Exemplo: 'flatfiles/contact_page'. Se não for informado, será utilizado "
"'flatfiles/default'."
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr "é obrigatório registrar"
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr "Se estiver marcado, apenas usuários conectados poderão ver a página."
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr "página plana"
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr "páginas planas"
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr "chave da sessão"
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr "dados da sessão"
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr "data de expiração"
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr "sessão"
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr "sessões"
@@ -662,54 +662,62 @@ msgid "Czech"
msgstr "Tcheco"
#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:38
msgid "German"
msgstr "Alemão"
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
msgid "English"
msgstr "Inglês"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
msgid "Spanish"
msgstr "Espanhol"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "French"
msgstr "Francês"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "Galician"
msgstr "Galiciano"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Brazilian"
msgstr "Brazileiro"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
msgid "Russian"
msgstr "Russo"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
#, fuzzy
msgid "Serbian"
msgstr "Sérvio"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:50
msgid "Simplified Chinese"
msgstr ""
-#: conf/global_settings.py:48
-msgid "Slovak"
-msgstr ""
-
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr "Deve conter apenas letras, números e sublinhados (_)."
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index 109ce432d7..5097074d71 100644
--- a/django/conf/locale/ro/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ro/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po
index d15fd2c53b..fbe47da0a5 100644
--- a/django/conf/locale/ro/LC_MESSAGES/django.po
+++ b/django/conf/locale/ro/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-04 09:29-0600\n"
+"POT-Creation-Date: 2005-11-09 11:26+0100\n"
"PO-Revision-Date: 2005-11-08 19:06+GMT+2\n"
"Last-Translator: Tiberiu Micu <tibimicu@gmx.net>\n"
"Language-Team: Romanian <ro@li.org>\n"
@@ -16,57 +16,45 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Bine ai venit,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "timp acţiune"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Schimbă parola"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id obiect"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Deautentificare"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "repr obiect"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "steguleţ acţiune"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "schimbă mesaj"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "intrare log"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "intrări log"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
msgid "Home"
msgstr "Acasă"
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Pagină inexistentă"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Ne pare rău, dar pagina cerută nu există."
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Eroare de server"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Eroare de server (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Eroare 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 "A apărut o eroare. Este raportată către administrator via email"
-"şi va fi fixată în scurt timp. Mulţumim pentru înţelegere."
-
#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "Istoric"
@@ -92,8 +80,8 @@ msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
"admin site."
msgstr ""
-"Acest obiect nu are un istoric al schimbărilor. Probabil nu a fost adăugat prin"
-"intermediul acestui sit de administrare."
+"Acest obiect nu are un istoric al schimbărilor. Probabil nu a fost adăugat "
+"prinintermediul acestui sit de administrare."
#: contrib/admin/templates/admin/base_site.html:4
msgid "Django site admin"
@@ -103,28 +91,34 @@ msgstr "Administrare sit Django"
msgid "Django administration"
msgstr "Administrare Django"
-#: 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 ""
-"Ştergînd %(object_name)s '%(object)s' va avea ca rezultat ştergerea şi a obiectelor ce au "
-"legătură, dar contul tău nu are permisiunea de a şterge următoarele tipuri de obiecte:"
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Eroare de server"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Eroare de server (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Eroare server <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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şti sigur că vrei să ştergi %(object_name)s \"%(object)s\"?"
-"Următoarele componente vor fi şterse:"
+"A apărut o eroare. Este raportată către administrator via emailşi va fi "
+"fixată în scurt timp. Mulţumim pentru înţelegere."
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Da, sînt sigur"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Pagină inexistentă"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Ne pare rău, dar pagina cerută nu există."
#: contrib/admin/templates/admin/index.html:27
msgid "Add"
@@ -166,13 +160,41 @@ msgstr "Ai <a href=\"/password_reset/\">uitat parola</a>?"
msgid "Log in"
msgstr "Login"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Mulţumesc pentru petrecerea folositoare a timpului cu saitul astăzi."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Bine ai venit,"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Relogare"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Schimbă parola"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Deautentificare"
+
+#: 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 ""
+"Ştergînd %(object_name)s '%(object)s' va avea ca rezultat ştergerea şi a "
+"obiectelor ce au legătură, dar contul tău nu are permisiunea de a şterge "
+"următoarele tipuri de obiecte:"
+
+#: 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 ""
+"Eşti sigur că vrei să ştergi %(object_name)s \"%(object)s\"?Următoarele "
+"componente vor fi ÅŸterse:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Da, sînt sigur"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -190,13 +212,56 @@ msgstr "Schimbare reuşită a parolei"
msgid "Your password was changed."
msgstr "Parola a fost schimbată."
+#: 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 "Resetează parola"
+
+#: 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 ""
+"Ai uitat parola? Introdu adresa de email mai jos, iar noi vom reseta parola "
+"şi-ţi vom trimite una nouă prin email."
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Adresa email:"
+
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Resetează-mi parola"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Mulţumesc pentru petrecerea folositoare a timpului cu saitul astăzi."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Relogare"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Parola resetată cu succes"
+
+#: 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 ""
+"Am trimis o nouă parolă prin email la adresa furnizată. Ar trebuisă o "
+"primeşti în scurt timp."
+
#: 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 ""
-"Introdu te rog vechea parolă, pentru motive de siguranţă, şi apoi tastează noua "
-"parolă de două ori aşa încît putem verifica dacă ai tastat corect."
+"Introdu te rog vechea parolă, pentru motive de siguranţă, şi apoi tastează "
+"noua parolă de două ori aşa încît putem verifica dacă ai tastat corect."
#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
@@ -214,25 +279,6 @@ msgstr "Confirmă parola:"
msgid "Change my password"
msgstr "Schimbă-mi parola"
-#: 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 "Resetează parola"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Parola resetată cu succes"
-
-#: 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 ""
-"Am trimis o nouă parolă prin email la adresa furnizată. Ar trebui"
-"să o primeşti în scurt timp."
-
#: contrib/admin/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
msgstr "Ai primit acest email pentru că ai cerut o resetare a parolei"
@@ -264,50 +310,6 @@ msgstr "Mulţumesc pentru folosirea saitului nostru!"
msgid "The %(site_name)s team"
msgstr "Echipa %(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 ""
-"Ai uitat parola? Introdu adresa de email mai jos, iar noi vom reseta "
-"parola şi-ţi vom trimite una nouă prin email."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "Adresa email:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Resetează-mi parola"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "timp acţiune"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id obiect"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "repr obiect"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "steguleţ acţiune"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "schimbă mesaj"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "intrare log"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "intrări log"
-
#: utils/dates.py:6
msgid "Monday"
msgstr "Luni"
@@ -412,67 +414,67 @@ msgstr "Noi."
msgid "Dec."
msgstr "Dec."
-#: models/core.py:5
+#: models/core.py:7
msgid "domain name"
msgstr "nume domeniu"
-#: models/core.py:6
+#: models/core.py:8
msgid "display name"
msgstr "nume afiÅŸat"
-#: models/core.py:8
+#: models/core.py:10
msgid "site"
msgstr "sit"
-#: models/core.py:9
+#: models/core.py:11
msgid "sites"
msgstr "sit"
-#: models/core.py:22
+#: models/core.py:28
msgid "label"
msgstr "etichetă"
-#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr "nume"
-#: models/core.py:25
+#: models/core.py:31
msgid "package"
msgstr "pachet"
-#: models/core.py:26
+#: models/core.py:32
msgid "packages"
msgstr "pachete"
-#: models/core.py:36
+#: models/core.py:42
msgid "python module name"
msgstr "nume modul python"
-#: models/core.py:38
+#: models/core.py:44
msgid "content type"
msgstr "tip conţinut"
-#: models/core.py:39
+#: models/core.py:45
msgid "content types"
msgstr "tipuri conţinute"
-#: models/core.py:62
+#: models/core.py:68
msgid "redirect from"
msgstr "redirectat de la "
-#: models/core.py:63
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
msgstr ""
-"Aceasta ar trebui să fie o cale absolută, excluzînd numele de domeniu. Exemplu: '/"
-"evenimente/cautare/'."
+"Aceasta ar trebui să fie o cale absolută, excluzînd numele de domeniu. "
+"Exemplu: '/evenimente/cautare/'."
-#: models/core.py:64
+#: models/core.py:70
msgid "redirect to"
msgstr "redirectat la"
-#: models/core.py:65
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
@@ -480,41 +482,42 @@ msgstr ""
"Aceasta poate fi o cale absolută (ca mai sus) sau un URL începînd cu "
"'http://'."
-#: models/core.py:67
+#: models/core.py:73
msgid "redirect"
msgstr "redirectare"
-#: models/core.py:68
+#: models/core.py:74
msgid "redirects"
msgstr "redictări"
-#: models/core.py:81
+#: models/core.py:87
msgid "URL"
msgstr "URL"
-#: models/core.py:82
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
-"Exemplu: '/about/contact'. Asiguraţi-vă că aveţi slash-uri la început şi la sfîrşit."
+"Exemplu: '/about/contact'. Asiguraţi-vă că aveţi slash-uri la început şi la "
+"sfîrşit."
-#: models/core.py:83
+#: models/core.py:89
msgid "title"
msgstr "titlu"
-#: models/core.py:84
+#: models/core.py:90
msgid "content"
msgstr "conţinut"
-#: models/core.py:85
+#: models/core.py:91
msgid "enable comments"
msgstr "permite comentarii"
-#: models/core.py:86
+#: models/core.py:92
msgid "template name"
msgstr "nume ÅŸablon"
-#: models/core.py:87
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
@@ -522,39 +525,40 @@ msgstr ""
"Exemplu: 'flatfiles/pagina_contact'. Dacă aceasta nu există, sistemul va "
"folosi 'flatfiles/default'."
-#: models/core.py:88
+#: models/core.py:94
msgid "registration required"
msgstr "necesită înregistrare"
-#: models/core.py:88
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "Dacă aceasta este bifată, numai utilizatorii logaţi vor putea vedea pagina."
+msgstr ""
+"Dacă aceasta este bifată, numai utilizatorii logaţi vor putea vedea pagina."
-#: models/core.py:92
+#: models/core.py:98
msgid "flat page"
msgstr "pagina plată"
-#: models/core.py:93
+#: models/core.py:99
msgid "flat pages"
msgstr "pagini plate"
-#: models/core.py:114
+#: models/core.py:117
msgid "session key"
msgstr "cheie sesiune"
-#: models/core.py:115
+#: models/core.py:118
msgid "session data"
msgstr "date sesiune"
-#: models/core.py:116
+#: models/core.py:119
msgid "expire date"
msgstr "data expirare"
-#: models/core.py:118
+#: models/core.py:121
msgid "session"
msgstr "seiune"
-#: models/core.py:119
+#: models/core.py:122
msgid "sessions"
msgstr "sesiuni"
@@ -655,141 +659,158 @@ msgid "Czech"
msgstr "Cehă"
#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:38
msgid "German"
msgstr "Germană"
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
msgid "English"
msgstr "Engleză"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
msgid "Spanish"
msgstr "Spaniolă"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "French"
msgstr "Franceză"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "Galician"
msgstr "Galiciană"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Italian"
msgstr "Italiană"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "Norwegian"
msgstr "Norvegiană"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Brazilian"
msgstr "Braziliană"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
msgid "Russian"
msgstr "Rusă"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Serbian"
msgstr "Sîrbă"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:50
msgid "Simplified Chinese"
msgstr "Chineză simplificată"
-#: core/validators.py:58
+#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
-msgstr "Această valoare trebuie să conţină numai litere, numere şi liniuţe de subliniere."
+msgstr ""
+"Această valoare trebuie să conţină numai litere, numere şi liniuţe de "
+"subliniere."
-#: core/validators.py:62
+#: core/validators.py:63
msgid "This value must contain only letters, numbers, underscores and slashes."
-msgstr "Această valoare trebuie să conţină numai litere, numere, liniuţe de subliniere şi slash-uri."
+msgstr ""
+"Această valoare trebuie să conţină numai litere, numere, liniuţe de "
+"subliniere ÅŸi slash-uri."
-#: core/validators.py:70
+#: core/validators.py:71
msgid "Uppercase letters are not allowed here."
msgstr "Literele mari nu sînt permise aici."
-#: core/validators.py:74
+#: core/validators.py:75
msgid "Lowercase letters are not allowed here."
msgstr "Literele mici nu sînt permise aici."
-#: core/validators.py:81
+#: core/validators.py:82
msgid "Enter only digits separated by commas."
msgstr "Introduceţi numai numere separate de virgule."
-#: core/validators.py:93
+#: core/validators.py:94
msgid "Enter valid e-mail addresses separated by commas."
msgstr "Introduceţi adrese de email valide separate de virgule."
-#: core/validators.py:100
+#: core/validators.py:98
msgid "Please enter a valid IP address."
msgstr "Introduceţi vă rog o adresă IP validă."
-#: core/validators.py:104
+#: core/validators.py:102
msgid "Empty values are not allowed here."
msgstr "Valorile vide nu sînt permise aici."
-#: core/validators.py:108
+#: core/validators.py:106
msgid "Non-numeric characters aren't allowed here."
msgstr "Caracterele ne-numerice nu sînt permise aici."
-#: core/validators.py:112
+#: core/validators.py:110
msgid "This value can't be comprised solely of digits."
msgstr "Această valoare nu poate conţîne numai cifre."
-#: core/validators.py:117
+#: core/validators.py:115
msgid "Enter a whole number."
msgstr "Introduceţi un număr întreg."
-#: core/validators.py:121
+#: core/validators.py:119
msgid "Only alphabetical characters are allowed here."
msgstr "Numai caractere alfabetice sînt permise aici."
-#: core/validators.py:125
+#: core/validators.py:123
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Introduceţi o dată validă in format: AAAA-LL-ZZ."
-#: core/validators.py:129
+#: core/validators.py:127
msgid "Enter a valid time in HH:MM format."
msgstr "Introduceţi o oră în format OO:MM."
-#: core/validators.py:133
+#: core/validators.py:131
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "Introduceţi o dată/oră validă în format AAAA-LL-ZZ OO:MM."
-#: core/validators.py:137
+#: core/validators.py:135
msgid "Enter a valid e-mail address."
msgstr "Introduceţi o adresă de email validă."
-#: core/validators.py:149
+#: core/validators.py:147
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-"Încărcaţi o imagine validă. Fişierul încărcat nu era o imagine sau era "
-"o imagine coruptă."
+"Încărcaţi o imagine validă. Fişierul încărcat nu era o imagine sau era o "
+"imagine coruptă."
-#: core/validators.py:156
+#: core/validators.py:154
#, python-format
msgid "The URL %s does not point to a valid image."
msgstr "URL-ul %s nu pointează către o imagine validă."
-#: core/validators.py:160
+#: core/validators.py:158
#, python-format
msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "Numerele de telefon trebuie să fie in format XXX-XXX-XXXX. \"%s\" e invalid."
+msgstr ""
+"Numerele de telefon trebuie să fie in format XXX-XXX-XXXX. \"%s\" e invalid."
-#: core/validators.py:168
+#: core/validators.py:166
#, python-format
msgid "The URL %s does not point to a valid QuickTime video."
msgstr "URL-ul %s nu pointează către o imagine video QuickTime validă."
-#: core/validators.py:172
+#: core/validators.py:170
msgid "A valid URL is required."
msgstr "E necesar un URL valid."
-#: core/validators.py:186
+#: core/validators.py:184
#, python-format
msgid ""
"Valid HTML is required. Specific errors are:\n"
@@ -798,61 +819,70 @@ msgstr ""
"E necesar cod HTML valid. Erorile specifice sînt:\n"
"%s"
-#: core/validators.py:193
+#: core/validators.py:191
#, python-format
msgid "Badly formed XML: %s"
msgstr "Format XML invalid: %s"
-#: core/validators.py:203
+#: core/validators.py:201
#, python-format
msgid "Invalid URL: %s"
msgstr "URL invalid: %s"
-#: core/validators.py:205
+#: core/validators.py:203
#, python-format
msgid "The URL %s is a broken link."
msgstr "URL-ul %s e invalid."
-#: core/validators.py:211
+#: core/validators.py:209
msgid "Enter a valid U.S. state abbreviation."
msgstr "Introduceţi o abreviere validă în U.S."
-#: core/validators.py:226
+#: core/validators.py:224
#, python-format
msgid "Watch your mouth! The word %s is not allowed here."
msgid_plural "Watch your mouth! The words %s are not allowed here."
msgstr[0] "Îngrijiţi-vă limbajul! Cuvîntul %s nu este permis aici."
msgstr[1] "Îngrijiţi-vă limbajul! Cuvintele %s nu sînt permise aici."
-#: core/validators.py:233
+#: core/validators.py:231
#, python-format
+msgid "This field must match the '%s' field."
+msgstr ""
+
+#: core/validators.py:250
+#, fuzzy
+msgid "Please enter something for at least one field."
+msgstr "Vă rog comletaţi ambele cîmpuri sau lăsaţi-le goale pe ambele."
+
+#: core/validators.py:259 core/validators.py:270
msgid "Please enter both fields or leave them both empty."
msgstr "Vă rog comletaţi ambele cîmpuri sau lăsaţi-le goale pe ambele."
-#: core/validators.py:279
+#: core/validators.py:277
#, python-format
msgid "This field must be given if %(field)s is %(value)s"
msgstr "Acest cîmp e necesar dacă %(field)s este %(value)s"
-#: core/validators.py:291
+#: core/validators.py:289
#, python-format
msgid "This field must be given if %(field)s is not %(value)s"
msgstr "Acest cîmp e necesar dacă %(field)s nu este %(value)s"
-#: core/validators.py:310
+#: core/validators.py:308
msgid "Duplicate values are not allowed."
msgstr "Valorile duplicate nu sînt permise."
-#: core/validators.py:333
+#: core/validators.py:331
#, python-format
msgid "This value must be a power of %s."
msgstr "Această valoare trebuie să fie o putere a lui %s."
-#: core/validators.py:344
+#: core/validators.py:342
msgid "Please enter a valid decimal number."
msgstr "Vă rog introduceţi un număr zecimal valid."
-#: core/validators.py:346
+#: core/validators.py:344
#, python-format
msgid "Please enter a valid decimal number with at most %s total digit."
msgid_plural ""
@@ -860,7 +890,7 @@ msgid_plural ""
msgstr[0] "Vă rog introduceţi un număr zecimal valid cu cel mult %s cifră."
msgstr[1] "Vă rog introduceţi un număr zecimal valid cu cel mult %s cifre."
-#: core/validators.py:349
+#: core/validators.py:347
#, python-format
msgid "Please enter a valid decimal number with at most %s decimal place."
msgid_plural ""
@@ -868,46 +898,46 @@ msgid_plural ""
msgstr[0] "Vă rog introduceţi un număr zecimal valid cu cel mult %s zecimală."
msgstr[1] "Vă rog introduceţi un număr zecimal valid cu cel mult %s zecimale."
-#: core/validators.py:359
+#: core/validators.py:357
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
msgstr "Asigură-te că fişierul încărcact are cel puţin %s octeţi."
-#: core/validators.py:360
+#: core/validators.py:358
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
msgstr "Asigură-te că fişierul încărcact are cel mult %s octeţi."
-#: core/validators.py:373
+#: core/validators.py:371
msgid "The format for this field is wrong."
msgstr "Formatul acestui cîmp este invalid."
-#: core/validators.py:388
+#: core/validators.py:386
msgid "This field is invalid."
msgstr "Cîmpul este invalid."
-#: core/validators.py:423
+#: core/validators.py:421
#, python-format
msgid "Could not retrieve anything from %s."
msgstr "Nu pot prelua nimic de la %s."
-#: core/validators.py:426
+#: core/validators.py:424
#, python-format
msgid ""
"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
msgstr ""
"URL-ul %(url)s a returnat un header Content-Type invalid '%(contenttype)s'."
-#: core/validators.py:459
+#: core/validators.py:457
#, python-format
msgid ""
"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
"\"%(start)s\".)"
msgstr ""
-"Te rog închide tagurile %(tag)s din linia %(line)s. ( Linia începe cu "
-"\"%(start)s\".)"
+"Te rog închide tagurile %(tag)s din linia %(line)s. ( Linia începe cu \"%"
+"(start)s\".)"
-#: core/validators.py:463
+#: core/validators.py:461
#, python-format
msgid ""
"Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -916,7 +946,7 @@ msgstr ""
"Textul începînd cu linia %(line)s nu e permis în acest context. (Linia "
"începînd cu \"%(start)s\".)"
-#: core/validators.py:468
+#: core/validators.py:466
#, python-format
msgid ""
"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -925,7 +955,7 @@ msgstr ""
"\"%(attr)s\" în linia %(line)s e un atribut invalid. (Linia începînd cu \"%"
"(start)s\".)"
-#: core/validators.py:473
+#: core/validators.py:471
#, python-format
msgid ""
"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -934,7 +964,7 @@ msgstr ""
"\"<%(tag)s>\" în linia %(line)s este un tag invalid. (Linia începe cu \"%"
"(start)s\"."
-#: core/validators.py:477
+#: core/validators.py:475
#, python-format
msgid ""
"A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -943,7 +973,7 @@ msgstr ""
"Unui tag din linia %(line)s îi lipseşte unul sau mai multe atribute. (Linia "
"începe cu \"%(start)s\".)"
-#: core/validators.py:482
+#: core/validators.py:480
#, python-format
msgid ""
"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -960,4 +990,5 @@ msgstr "Separă ID-urile multiple cu virgulă."
msgid ""
" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-" Ţine apăsat \"Control\", sau \"Command\" pe un Mac, pentru a selecta mai multe."
+" Ţine apăsat \"Control\", sau \"Command\" pe un Mac, pentru a selecta mai "
+"multe."
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index d8628e9e32..1eb7d45e23 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ru/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index 978d8b26b6..651a29568d 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-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:26-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,59 +15,46 @@ msgstr ""
"Content-Type: text/plain; charset=koi8-r\n"
"Content-Transfer-Encoding: 8bit\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ,"
+#: contrib/admin/models/admin.py:6
+#, fuzzy
+msgid "action time"
+msgstr "äÁÔÁ/×ÒÅÍÑ"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "éÚÍÅÎÅÎÉÅ ÐÁÒÏÌÑ"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr ""
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "÷ÙÈÏÄ"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr ""
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr ""
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr ""
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr ""
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr ""
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_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 "éÓÔÏÒÉÑ"
@@ -104,29 +91,35 @@ msgstr "áÄÍÉÎÉÓÔÒÁÔÉ×ÎÙÊ ÓÁÊÔ Django"
msgid "Django administration"
msgstr "áÄÍÉÎÉÓÔÒÉÒÏ×ÁÎÉÅ Django"
-#: 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/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "ïÛÉÂËÁ ÓÅÒ×ÅÒÁ (500)"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: 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 ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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 ""
-"÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ %(object_name)s \"%(object)s\"? ÷ÓÅ "
-"ÓÌÅÄÕÀÝÉÅÏÂßÅËÔÙ ÔÁËÖÅ ÂÕÄÕÔ ÕÄÁÌÅÎÙ:"
+"ðÒÏÉÚÏÛÌÁ ÏÛÉÂËÁ. ïÔÞÅÔ Ï ÏÛÉÂËÅ ÏÔÐÒÁ×ÌÅÎ ÁÄÍÉÎÉÓÔÒÁÔÏÒÁÍ ÓÁÊÔÁ ÐÏ e-mailÉ "
+"ÏÎÁ ÄÏÌÖÎÁ ÂÙÔØ ×ÓËÏÒÅ ÉÓÐÒÁ×ÌÅÎÁ. âÌÁÇÏÄÁÒÉÍ ×ÁÓ ÎÁ ÔÅÒÐÅÎÉÅ É ÐÏÍÏÝØ."
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-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/index.html:27
msgid "Add"
@@ -168,13 +161,41 @@ msgstr "÷Ù <a href=\"/password_reset/\">ÚÁÂÙÌÉ ÐÁÒÏÌØ</a>?"
msgid "Log in"
msgstr "÷ÈÏÄ"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "âÌÁÇÏÄÁÒÉÍ ÚÁ ÐÒÏ×ÅÄÅÎÎÏÅ ×ÁÍÉ ÓÅÇÏÄÎÑ ×ÒÅÍÑ ÎÁ ÜÔÏÍ ÓÁÊÔÅ."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ,"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "ðÏ×ÔÏÒÎÙÊ ×ÈÏÄ"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "éÚÍÅÎÅÎÉÅ ÐÁÒÏÌÑ"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "÷ÙÈÏÄ"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"õÄÁÌÅÎÉÅ ÏÂØÅËÔÁ %(object_name)s '%(object)s' ÐÒÉ×ÅÄÅÔ Ë ÕÄÁÌÅÎÉÀ ÚÁ×ÉÓÉÍÙÈ "
+"ÎÏ, ÐÒÅÄÏÓÔÁ×ÌÅÎÎÙÈ ×ÁÍ ÐÒÁ× ÎÅÄÏÓÔÁÔÏÞÎÏ ÄÌÑ ÕÄÁÌÅÎÉÑ ÓÌÅÄÕÀÝÉÈÔÉÐÏ× "
+"ÏÂßÅËÔÏ×:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"÷Ù Õ×ÅÒÅÎÙ, ÞÔÏ ÈÏÔÉÔÅ ÕÄÁÌÉÔØ %(object_name)s \"%(object)s\"? ÷ÓÅ "
+"ÓÌÅÄÕÀÝÉÅÏÂßÅËÔÙ ÔÁËÖÅ ÂÕÄÕÔ ÕÄÁÌÅÎÙ:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "äÁ, Ñ Õ×ÅÒÅÎ"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -192,6 +213,49 @@ 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 "
@@ -216,25 +280,6 @@ 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 "÷Ù ÐÏÌÕÞÉÌÉ ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÐÏÔÏÍÕ ÞÔÏ ÂÙÌÁ ÚÁÐÒÏÛÅÎÁ ÏÞÉÓÔËÁ ÐÁÒÏÌÑ"
@@ -266,51 +311,6 @@ 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"
-msgstr "äÁÔÁ/×ÒÅÍÑ"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr ""
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr ""
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr ""
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr ""
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr ""
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr ""
-
#: utils/dates.py:6
msgid "Monday"
msgstr ""
@@ -431,127 +431,127 @@ msgstr ""
msgid "sites"
msgstr ""
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr ""
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
#, fuzzy
msgid "name"
msgstr "éÍÑ:"
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr ""
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr ""
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr ""
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr ""
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr ""
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr ""
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
msgstr ""
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr ""
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
msgstr ""
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr ""
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr ""
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr ""
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr ""
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr ""
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr ""
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr ""
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
msgstr ""
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr ""
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr ""
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr ""
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr ""
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr ""
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr ""
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr ""
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr ""
@@ -654,53 +654,61 @@ msgid "Czech"
msgstr ""
#: conf/global_settings.py:37
-msgid "German"
+msgid "Welsh"
msgstr ""
#: conf/global_settings.py:38
-msgid "English"
+msgid "German"
msgstr ""
#: conf/global_settings.py:39
-msgid "Spanish"
+msgid "English"
msgstr ""
#: conf/global_settings.py:40
-msgid "French"
+msgid "Spanish"
msgstr ""
#: conf/global_settings.py:41
-msgid "Galician"
+msgid "French"
msgstr ""
#: conf/global_settings.py:42
-msgid "Italian"
+msgid "Galician"
msgstr ""
#: conf/global_settings.py:43
-msgid "Norwegian"
+msgid "Italian"
msgstr ""
#: conf/global_settings.py:44
-msgid "Brazilian"
+msgid "Norwegian"
msgstr ""
#: conf/global_settings.py:45
-msgid "Russian"
+msgid "Brazilian"
msgstr ""
#: conf/global_settings.py:46
-msgid "Serbian"
+msgid "Romanian"
msgstr ""
#: conf/global_settings.py:47
-msgid "Simplified Chinese"
+msgid "Russian"
msgstr ""
#: conf/global_settings.py:48
msgid "Slovak"
msgstr ""
+#: conf/global_settings.py:49
+msgid "Serbian"
+msgstr ""
+
+#: conf/global_settings.py:50
+msgid "Simplified Chinese"
+msgstr ""
+
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr "úÎÁÞÅÎÉÅ ÍÏÖÅÔ ÓÏÄÅÒÖÁÔØ ÔÏÌØËÏ ÂÕË×Ù, ÃÉÆÒÙ É ÐÏÄÞÅÒËÉ×ÁÎÉÑ."
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index fef3c66474..06448f4c3d 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sk/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 886de195ee..1cc9f8b113 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:27-0600\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Vladimir Labath <vlado@labath.org>\n"
"Language-Team: Slovak <LL@li.org>\n"
@@ -16,58 +16,45 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Vítajte,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "�as udalosti"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Zmena hesla"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "objekt id"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odhlásenie"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "objekt repr"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "návestie udalosti"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "zmena zprávy"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "záznam priebehu"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "záznamy priebehu"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_form.html:4
msgid "Home"
msgstr "Za�iatok"
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Stránka sa nenašla"
-
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Ľutujeme, ale požadovaná stránka sa nenašla."
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Chyba servera"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Chyba servera (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Chyba servera <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 ""
-"Vznikla chyba. Prostredníctvom e-mailu bol o nej informovaný správca a "
-"chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť."
-
#: contrib/admin/templates/admin/object_history.html:5
msgid "History"
msgstr "História"
@@ -104,29 +91,34 @@ msgstr "Django web admin"
msgid "Django administration"
msgstr "Administrácia Django"
-#: 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 ""
-"Vymazaním objektu %(object_name)s '%(object)s' môžete spôsobiť vymazanie "
-"súvisiacich objektov, ale váš ú�et nemá povolenie na mazanie nasledujúcich "
-"typov objektov:"
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Chyba servera"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Chyba servera (500)"
+
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Chyba servera <em>(500)</em>"
+
+#: contrib/admin/templates/admin/500.html:10
msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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 ""
-"Ste si istý, že chcete vymazať %(object_name)s \"%(object)s\"? Všetky "
-"nasledujúce objekty budú tiež vymazané :"
+"Vznikla chyba. Prostredníctvom e-mailu bol o nej informovaný správca a "
+"chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť."
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Ano, som si istý"
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Stránka sa nenašla"
+
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Ľutujeme, ale požadovaná stránka sa nenašla."
#: contrib/admin/templates/admin/index.html:27
msgid "Add"
@@ -168,13 +160,41 @@ msgstr "Zabudli ste<a href=\"/password_reset/\"> vaše heslo</a>?"
msgid "Log in"
msgstr "Prihlásenie"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Ďakujeme vám, za stráveny �as na našej stránke."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Vítajte,"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Prihláste sa znovu"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Zmena hesla"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odhlásenie"
+
+#: 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 ""
+"Vymazaním objektu %(object_name)s '%(object)s' môžete spôsobiť vymazanie "
+"súvisiacich objektov, ale váš ú�et nemá povolenie na mazanie nasledujúcich "
+"typov objektov:"
+
+#: 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 ""
+"Ste si istý, že chcete vymazať %(object_name)s \"%(object)s\"? Všetky "
+"nasledujúce objekty budú tiež vymazané :"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Ano, som si istý"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -192,6 +212,49 @@ msgstr "Heslo bolo úspešne zmenené"
msgid "Your password was changed."
msgstr "Vaše heslo bolo zmenené."
+#: 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 "Obnova 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 ""
+"Zabudli ste vaše heslo? Vložte nižšie vašu e-mail adresu, a nové heslo vám "
+"bude na ňu zaslané ."
+
+#: 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 "Obnova môjho hesla"
+
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Ďakujeme vám, za stráveny �as na našej stránke."
+
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Prihláste sa znovu"
+
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Heslo bolo úspešne obnovené"
+
+#: 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 sme vám, nové heslo na vami uvedenú emailovú adresu.Mali by ste ho "
+"dostať �o najskôr."
+
#: contrib/admin/templates/registration/password_change_form.html:12
msgid ""
"Please enter your old password, for security's sake, and then enter your new "
@@ -216,25 +279,6 @@ msgstr "Potvrdenie hesla:"
msgid "Change my password"
msgstr "Zmena môjho hesla"
-#: 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 "Obnova hesla"
-
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Heslo bolo úspešne obnovené"
-
-#: 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 sme vám, nové heslo na vami uvedenú emailovú adresu.Mali by ste ho "
-"dostať �o najskôr."
-
#: contrib/admin/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
msgstr "Dostali ste túto správu preto, lebo ste požadovali obnoviť vaše heslo"
@@ -266,50 +310,6 @@ msgstr "Ďakujeme, že používate naše stránky!"
msgid "The %(site_name)s team"
msgstr "Skupina %(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 ""
-"Zabudli ste vaše heslo? Vložte nižšie vašu e-mail adresu, a nové heslo vám "
-"bude na ňu zaslané ."
-
-#: 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 "Obnova môjho hesla"
-
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "�as udalosti"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "objekt id"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "objekt repr"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "návestie udalosti"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "zmena zprávy"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "záznam priebehu"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "záznamy priebehu"
-
#: utils/dates.py:6
msgid "Monday"
msgstr "Pondelok"
@@ -430,50 +430,50 @@ msgstr "web"
msgid "sites"
msgstr "weby"
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr "popis"
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr "meno"
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr "balík"
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr "balíky"
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr "meno python modulu"
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr "typ obsahu"
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr "typy obsahu"
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr "presmerovaný z"
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
msgstr ""
"Tu by sa mala použiť absolútna cesta, bez domény. Napr.: '/events/search/'."
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr "presmerovaný na "
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
@@ -481,42 +481,42 @@ msgstr ""
"Tu môže byť bu� absolútna cesta (ako hore) alebo plné URL za�ínajúce s "
"'http://'."
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr "presmerovanie"
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr "presmerovania"
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr "URL"
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
"Príklad: '/about/contact/'. Uistite sa, že máte vložené ako úvodné tak aj "
"závere�né lomítka."
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr "názov"
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr "obsah"
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr "povolené komentáre"
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr "meno predlohy"
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
@@ -524,40 +524,40 @@ msgstr ""
"Príklad: 'flatfiles/contact_page'. Ak sa toto nevykonalo, systém použije "
"'flatfiles/default'."
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr "musíte byť zaregistrovaný"
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
"Ak je toto ozna�ené, potom len prihlásený užívateľ môže vidieť túto stránku."
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr "plochá stránka"
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr "ploché stránky"
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr "kľú� sedenia"
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr "údaje sedenia"
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr "dátum konca platnosti"
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr "sedenie"
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr "sedenia"
@@ -659,53 +659,61 @@ msgid "Czech"
msgstr "Český"
#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:38
msgid "German"
msgstr "Nemecký"
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
msgid "English"
msgstr "Anglický"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
msgid "Spanish"
msgstr "Å panielsky"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "French"
msgstr "Francúzsky"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "Galician"
msgstr "Galicijský"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Italian"
msgstr "Taliansky"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "Norwegian"
msgstr "Nórsky"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Brazilian"
msgstr "Brazílsky"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
msgid "Russian"
msgstr "Ruský"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Serbian"
msgstr "Srbský"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:50
msgid "Simplified Chinese"
msgstr "Zjednodušená �inština "
-#: conf/global_settings.py:48
-msgid "Slovak"
-msgstr ""
-
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr "Toto môže obsahovať len písmená, �íslice a pod�iarkovníky."
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index 3045db5004..15f8754598 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sr/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index 526b398a8f..65d07fc5a0 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-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:26-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,59 +17,45 @@ msgstr ""
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Basepath: ../../../../\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "Dobrodošli,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "Datum/vreme akcije"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "Izmeni lozinku"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id objekta"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "Odjavi se"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "opis objekta"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "akcija"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "opis promene"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "unos u dnevnik izmena"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "unosi u dnevnik izmena"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_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"
@@ -106,28 +92,35 @@ msgstr "Django administracija sajta"
msgid "Django administration"
msgstr "Django administracija"
-#: 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/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "Greška na serveru (500)"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: 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 ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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 ""
-"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće "
-"obrisani i sledeći pridruženi objekti:"
+"Dogodila se greška koja je prijavljena administratorima i biće popravljena "
+"uskoro. Hvala Vam na strpljenju."
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-msgstr "Da, siguran sam"
+#: 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/index.html:27
msgid "Add"
@@ -169,13 +162,40 @@ msgstr "Da li ste <a href=\"/password_reset/\">zaboravili Vašu lozinku?</a>?"
msgid "Log in"
msgstr "Prijavi se"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Hvala Vam na poseti."
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "Dobrodošli,"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Prijavi se ponovo"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "Izmeni lozinku"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "Odjavi se"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"Brisanjem %(object_name)s '%(object)s' došlo bi do brisanja dodatnih "
+"podataka, ali nemate prava da brišete sledeće tipove podataka:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"Da li ste sigurni da želite da obrišete %(object_name)s \"%(object)s\"? Biće "
+"obrisani i sledeći pridruženi objekti:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "Da, siguran sam"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -193,6 +213,49 @@ 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 "
@@ -217,25 +280,6 @@ 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"
@@ -267,50 +311,6 @@ 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"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id objekta"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "opis objekta"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "akcija"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "opis promene"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "unos u dnevnik izmena"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "unosi u dnevnik izmena"
-
#: utils/dates.py:6
msgid "Monday"
msgstr "Ponedeljak"
@@ -431,39 +431,39 @@ msgstr "sajt"
msgid "sites"
msgstr "sajtovi"
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr ""
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr "ime"
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr ""
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr ""
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr "ime python modula"
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr "tip sadržaja"
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr "tipovi sadržaja"
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr "redirekcija od"
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
@@ -471,11 +471,11 @@ msgstr ""
"Ovde treba upisati apsolutnu putanju bez imena domena. Primer: '/events/"
"search/'."
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr "redirekcija na"
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
@@ -483,44 +483,44 @@ msgstr ""
"Ovo može biti apsolutna putanja (kao gore) ili puni URL koji po�inje sa "
"'http://'."
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr "redirekcija"
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr "redirekcije"
# nesh: ovo se valjda ne prevodi
# petar: ne prevodi se
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr ""
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
"Primer: '/about/contact/'. Proverite da li ste uneli po�etnu i kranju kosu "
"crtu."
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr "naslov"
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr "sadržaj"
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr "omogućite komentare"
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr "ime templejta"
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
@@ -528,41 +528,41 @@ msgstr ""
"Primer: 'flatfiles/contact-page'. Ako nije dato sistem će koristiti "
"'flatfiles/default'."
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr "samo za registrovane korisnike"
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
"Ako izaberete ovu opciju samo prijavljeni korisnici će imati pristup datoj "
"strani."
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr "stati�na strana"
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr "stati�ne strane"
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr "klju� sesije"
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr "podaci sesije"
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr "datum prestanka važenja sesije"
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr "sesija"
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr "sesije"
@@ -662,53 +662,61 @@ msgid "Czech"
msgstr "Češki"
#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:38
msgid "German"
msgstr "Nema�ki"
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
msgid "English"
msgstr "Engleski"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
msgid "Spanish"
msgstr "Å panski"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "French"
msgstr "Francuski"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "Galician"
msgstr ""
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Italian"
msgstr "Italijanski"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Brazilian"
msgstr "Brazilski"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
msgid "Russian"
msgstr "Ruski"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
msgid "Serbian"
msgstr "Srpski"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:50
msgid "Simplified Chinese"
msgstr ""
-#: conf/global_settings.py:48
-msgid "Slovak"
-msgstr ""
-
# nesh: Ovo je opis za stari SlugField
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index e620b7dc68..ce1a73ed1a 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index f5de625453..47839d4187 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-06 21:41-0600\n"
+"POT-Creation-Date: 2005-11-09 04:26-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,59 +18,45 @@ msgstr ""
"X-Poedit-Country: CHINA\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Welcome,"
-msgstr "欢迎,"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "动作时间"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Change password"
-msgstr "修改�令"
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "对象id"
-#: contrib/admin/templates/admin/base.html:23
-msgid "Log out"
-msgstr "注销"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "对象表示"
+
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "动作标志"
+
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "修改消�"
+
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "日志记录"
+
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "日志记录"
-#: contrib/admin/templates/admin/base.html:29
-#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:29
#: 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
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_change_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 "历�"
@@ -105,27 +91,35 @@ msgstr "Django管�站点"
msgid "Django administration"
msgstr "Django管�员"
-#: 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/500.html:4
+#, fuzzy
+msgid "Server error"
+msgstr "�务器错误(500)"
-#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, python-format
+#: 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 ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
+"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 ""
-"你确信相�删除 %(object_name)s \"%(object)s\"?所有相关的项目都将被删除:"
+"存在一个错误。它已�通过电�邮件被报告给站点管�员了,并且应该很快被改正。谢"
+"谢你的关心。"
-#: contrib/admin/templates/admin/delete_confirmation.html:18
-msgid "Yes, I'm sure"
-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/index.html:27
msgid "Add"
@@ -167,13 +161,39 @@ msgstr "<a href=\"/password_reset/\">忘记你的密�</a>?"
msgid "Log in"
msgstr "登录"
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "感谢今天在本网站花费了您的一些�贵时间。"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Welcome,"
+msgstr "欢迎,"
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "�新登录"
+#: contrib/admin/templates/admin/base.html:23
+msgid "Change password"
+msgstr "修改�令"
+
+#: contrib/admin/templates/admin/base.html:23
+msgid "Log out"
+msgstr "注销"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:7
+#, fuzzy, python-format
+msgid ""
+"Deleting the %(object_name)s '%(object)s' would result in deleting related "
+"objects, but your account doesn't have permission to delete the following "
+"types of objects:"
+msgstr ""
+"删除 %(object_name)s '%(object)s' 会导致删除相关的对象,但你的��无�删除下"
+"列类型的对象:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:14
+#, python-format
+msgid ""
+"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
+"the following related items will be deleted:"
+msgstr ""
+"你确信相�删除 %(object_name)s \"%(object)s\"?所有相关的项目都将被删除:"
+
+#: contrib/admin/templates/admin/delete_confirmation.html:18
+msgid "Yes, I'm sure"
+msgstr "是的,我确定"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
@@ -191,6 +211,48 @@ 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 "
@@ -215,24 +277,6 @@ 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 "你所收到的这�邮件是由于你请求了�令�设"
@@ -264,50 +308,6 @@ 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 "动作时间"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "对象id"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "对象表示"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "动作标志"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "修改消�"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "日志记录"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "日志记录"
-
#: utils/dates.py:6
msgid "Monday"
msgstr "星期一"
@@ -428,127 +428,127 @@ msgstr "站点"
msgid "sites"
msgstr "站点"
-#: models/core.py:24
+#: models/core.py:28
msgid "label"
msgstr "标签"
-#: models/core.py:25 models/core.py:36 models/auth.py:6 models/auth.py:19
+#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
msgid "name"
msgstr "�称"
-#: models/core.py:27
+#: models/core.py:31
msgid "package"
msgstr "包"
-#: models/core.py:28
+#: models/core.py:32
msgid "packages"
msgstr "包"
-#: models/core.py:38
+#: models/core.py:42
msgid "python module name"
msgstr "python模��"
-#: models/core.py:40
+#: models/core.py:44
msgid "content type"
msgstr "内容类型"
-#: models/core.py:41
+#: models/core.py:45
msgid "content types"
msgstr "内容类型"
-#: models/core.py:64
+#: models/core.py:68
msgid "redirect from"
msgstr "�定�自"
-#: models/core.py:65
+#: models/core.py:69
msgid ""
"This should be an absolute path, excluding the domain name. Example: '/"
"events/search/'."
msgstr "应该是一个�对路径,�包括域�。例如:'/events/search/'。"
-#: models/core.py:66
+#: models/core.py:70
msgid "redirect to"
msgstr "�定�到"
-#: models/core.py:67
+#: models/core.py:71
msgid ""
"This can be either an absolute path (as above) or a full URL starting with "
"'http://'."
msgstr "�以是�对路径(�上)或以'http://'开始的全URL。"
-#: models/core.py:69
+#: models/core.py:73
msgid "redirect"
msgstr "�定�"
-#: models/core.py:70
+#: models/core.py:74
msgid "redirects"
msgstr "�定�"
-#: models/core.py:83
+#: models/core.py:87
msgid "URL"
msgstr ""
-#: models/core.py:84
+#: models/core.py:88
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr "例如:'/about/contact/'。请确��导和结尾的除�。"
-#: models/core.py:85
+#: models/core.py:89
msgid "title"
msgstr "标题"
-#: models/core.py:86
+#: models/core.py:90
msgid "content"
msgstr "内容"
-#: models/core.py:87
+#: models/core.py:91
msgid "enable comments"
msgstr "�许评论"
-#: models/core.py:88
+#: models/core.py:92
msgid "template name"
msgstr "模��称"
-#: models/core.py:89
+#: models/core.py:93
msgid ""
"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
"use 'flatfiles/default'."
msgstr ""
"例如:'flatfiles/contact_page'。如果未�供,系统将使用'flatfiles/default'。"
-#: models/core.py:90
+#: models/core.py:94
msgid "registration required"
msgstr "请先注册"
-#: models/core.py:90
+#: models/core.py:94
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr "如果被选中,仅登录用户��以查看此页。"
-#: models/core.py:94
+#: models/core.py:98
msgid "flat page"
msgstr "简�页�"
-#: models/core.py:95
+#: models/core.py:99
msgid "flat pages"
msgstr "简�页�"
-#: models/core.py:113
+#: models/core.py:117
msgid "session key"
msgstr "session键字"
-#: models/core.py:114
+#: models/core.py:118
msgid "session data"
msgstr "session数�"
-#: models/core.py:115
+#: models/core.py:119
msgid "expire date"
msgstr "过期日期"
-#: models/core.py:117
+#: models/core.py:121
msgid "session"
msgstr ""
-#: models/core.py:118
+#: models/core.py:122
msgid "sessions"
msgstr ""
@@ -648,54 +648,62 @@ msgid "Czech"
msgstr "�克语"
#: conf/global_settings.py:37
+msgid "Welsh"
+msgstr ""
+
+#: conf/global_settings.py:38
msgid "German"
msgstr "德语"
-#: conf/global_settings.py:38
+#: conf/global_settings.py:39
msgid "English"
msgstr "英语"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:40
msgid "Spanish"
msgstr "西斑牙语"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
msgid "French"
msgstr "法语"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
msgid "Galician"
msgstr "加利西亚语"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
msgid "Italian"
msgstr "�大利语"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
msgid "Norwegian"
msgstr ""
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
msgid "Brazilian"
msgstr "巴西语"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
+msgid "Romanian"
+msgstr ""
+
+#: conf/global_settings.py:47
msgid "Russian"
msgstr "俄语"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:48
+msgid "Slovak"
+msgstr ""
+
+#: conf/global_settings.py:49
#, fuzzy
msgid "Serbian"
msgstr "塞尔维亚语"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:50
msgid "Simplified Chinese"
msgstr ""
-#: conf/global_settings.py:48
-msgid "Slovak"
-msgstr ""
-
#: core/validators.py:59
msgid "This value must contain only letters, numbers and underscores."
msgstr "此值�能包�字��数字和下划线。"