diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index 31608a23d3..da3da2c6b5 100644 Binary files a/django/conf/locale/cs/LC_MESSAGES/django.mo and b/django/conf/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index 8ac89d7bd7..1c6566d73a 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -14,7 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Poedit-Language: Czech\n" "X-Poedit-Country: CZECH REPUBLIC\n" @@ -243,8 +244,6 @@ msgstr "Django správa" #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/admin/base.html:29 #: contrib/admin/templates/admin/change_form.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 #: 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 @@ -264,8 +263,12 @@ msgid "Server Error (500)" msgstr "Chyba serveru (500)" #: contrib/admin/templates/admin/500.html:10 -msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." -msgstr "Nastala chyba. Ta byla oznámena administrátorovi serveru pomocí e-mailu a měla by být brzy odstraněna. Děkujeme za trpělivost." +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/404.html:4 #: contrib/admin/templates/admin/404.html:8 @@ -356,29 +359,13 @@ 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/500.html:6 -msgid "Server error (500)" -msgstr "Chyba serveru (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Chyba serveru (500)" - -#: contrib/admin/templates/admin/500.html:10 msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." +"Deleting the %(object_name)s '%(object)s' would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" -"Nastala chyba. Ta byla oznámena administrátorovi serveru pomocí e-mailu a " -"měla by být brzy odstraněna. Děkujeme za trpělivost." - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Stránka nenalezena" +"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/change_form.html:20 msgid "View on site" @@ -419,24 +406,14 @@ msgstr "" msgid "Save" msgstr "aktivní" -#: 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:" +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" @@ -465,8 +442,12 @@ 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é." +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:" @@ -490,12 +471,20 @@ 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." +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 password twice so we can verify you typed it in correctly." -msgstr "Prosíme, pro zabezpečení vložte svoje staré heslo a poté vložte dvakrát nové heslo, takže můžeme ověřit, že jste ho napsal(a) správně." +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 "" +"Prosíme, pro zabezpečení vložte svoje staré heslo a poté vložte dvakrát nové " +"heslo, takže můžeme ověřit, že jste ho napsal(a) správně." #: contrib/admin/templates/registration/password_change_form.html:17 msgid "Old password:" @@ -612,28 +601,23 @@ msgstr "Leden" msgid "February" msgstr "Únor" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "March" msgstr "Březen" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "April" msgstr "Duben" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "May" msgstr "Květen" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "June" msgstr "Červen" -#: utils/dates.py:15 -#: utils/dates.py:27 +#: utils/dates.py:15 utils/dates.py:27 msgid "July" msgstr "Červenec" @@ -705,10 +689,7 @@ msgstr "weby" msgid "label" msgstr "nadpis" -#: models/core.py:29 -#: models/core.py:40 -#: models/auth.py:6 -#: models/auth.py:19 +#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19 msgid "name" msgstr "jméno" @@ -737,16 +718,23 @@ msgid "redirect from" msgstr "přesměrovat z" #: 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/'." +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:70 msgid "redirect to" msgstr "přesměrovat na" #: models/core.py:71 -msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'." -msgstr "Toto může být buď absolutní cesta (jako nahoře) nebo plné URL začínající na 'http://'." +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Toto může být buď absolutní cesta (jako nahoře) nebo plné URL začínající na " +"'http://'." #: models/core.py:73 msgid "redirect" @@ -757,8 +745,10 @@ msgid "redirects" msgstr "přesměrování" #: 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." +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:89 msgid "title" @@ -777,8 +767,12 @@ msgid "template name" msgstr "jméno šablony" #: models/core.py:93 -msgid "Example: 'flatfiles/contact_page'. If this isn't provided, the system will use 'flatfiles/default'." -msgstr "Například: 'flatfiles/kontaktni_stranka'. Pokud toto není zadáno, systém použije 'flatfiles/default'." +msgid "" +"Example: 'flatfiles/contact_page'. If this isn't provided, the system will " +"use 'flatfiles/default'." +msgstr "" +"Například: 'flatfiles/kontaktni_stranka'. Pokud toto není zadáno, systém " +"použije 'flatfiles/default'." #: models/core.py:94 msgid "registration required" @@ -786,7 +780,9 @@ msgstr "nutná registrace" #: 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." +msgstr "" +"Pokud je zaškrtnuto, pouze přihlášení uživatelé budou moci prohlížet tuto " +"stránku." #: models/core.py:98 msgid "flat page" @@ -824,8 +820,7 @@ msgstr "codename" msgid "Permission" msgstr "Oprávnění" -#: models/auth.py:11 -#: models/auth.py:58 +#: models/auth.py:11 models/auth.py:58 msgid "Permissions" msgstr "Oprávnění" @@ -833,8 +828,7 @@ msgstr "Oprávnění" msgid "Group" msgstr "Skupina" -#: models/auth.py:23 -#: models/auth.py:60 +#: models/auth.py:23 models/auth.py:60 msgid "Groups" msgstr "Skupiny" @@ -888,8 +882,12 @@ msgid "date joined" msgstr "datum zaregistrování" #: models/auth.py:44 -msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in." -msgstr "Kromě manuálně přidělených oprávnění uživatel dostane všechna oprávnění pro každou skupinu, ve které je." +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "" +"Kromě manuálně přidělených oprávnění uživatel dostane všechna oprávnění pro " +"každou skupinu, ve které je." #: models/auth.py:48 msgid "Users" @@ -973,7 +971,8 @@ msgstr "Tato hodnota musí obsahovat pouze znaky, čísla nebo podtržítka." #: core/validators.py:63 msgid "This value must contain only letters, numbers, underscores and slashes." -msgstr "Tato hodnota musí obsahovat pouze znaky, čísla, podtržítka nebo lomítka." +msgstr "" +"Tato hodnota musí obsahovat pouze znaky, čísla, podtržítka nebo lomítka." #: core/validators.py:71 msgid "Uppercase letters are not allowed here." @@ -1032,8 +1031,12 @@ msgid "Enter a valid e-mail address." msgstr "Vložte platnou e-mailovou adresu." #: core/validators.py:147 -msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image." -msgstr "Nahrajte na server platný obrázek. Soubor, který jste nahrál(a) nebyl obrázek, nebo byl porušen." +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"Nahrajte na server platný obrázek. Soubor, který jste nahrál(a) nebyl " +"obrázek, nebo byl porušen." #: core/validators.py:154 #, python-format @@ -1099,8 +1102,7 @@ msgstr "Toto pole se musí shodovat s polem '%s'." msgid "Please enter something for at least one field." msgstr "Prosíme, vložte něco alespoň pro jedno pole." -#: core/validators.py:259 -#: core/validators.py:270 +#: core/validators.py:259 core/validators.py:270 msgid "Please enter both fields or leave them both empty." msgstr "Prosíme, vložte obě pole, nebo je nechte obě prázdná." @@ -1130,7 +1132,8 @@ msgstr "Prosíme, vložte platné číslo." #: core/validators.py:344 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." -msgid_plural "Please enter a valid decimal number with at most %s total digits." +msgid_plural "" +"Please enter a valid decimal number with at most %s total digits." msgstr[0] "Prosíme, vložte platné číslo s nejvíce %s cifrou celkem." msgstr[1] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem." msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem." @@ -1138,10 +1141,16 @@ msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem." #: core/validators.py:347 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." -msgid_plural "Please enter a valid decimal number with at most %s decimal places." -msgstr[0] "Prosíme, vložte platné číslo s nejvíce %s cifrou za desetinnou čárkou celkem." -msgstr[1] "Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou celkem." -msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou celkem." +msgid_plural "" +"Please enter a valid decimal number with at most %s decimal places." +msgstr[0] "" +"Prosíme, vložte platné číslo s nejvíce %s cifrou za desetinnou čárkou celkem." +msgstr[1] "" +"Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou " +"celkem." +msgstr[2] "" +"Prosíme, vložte platné číslo s nejvíce %s ciframi za desetinnou čárkou " +"celkem." #: core/validators.py:357 #, python-format @@ -1168,44 +1177,71 @@ msgstr "Nemohl jsem získat nic z %s." #: core/validators.py:424 #, python-format -msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." +msgid "" +"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "URL %(url)s vrátilo neplatnou hlavičku Content-Type '%(contenttype)s'." #: core/validators.py:457 #, python-format -msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)" -msgstr "Prosíme, zavřete nezavřenou značku %(tag)s z řádky %(line)s. (Řádka začíná s \"%(start)s\".)" +msgid "" +"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " +"\"%(start)s\".)" +msgstr "" +"Prosíme, zavřete nezavřenou značku %(tag)s z řádky %(line)s. (Řádka začíná s " +"\"%(start)s\".)" #: 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 "Nějaký text začínající na řádce %(line)s není povolen v tomto kontextu. (Řádka začíná s \"%(start)s\".)" +msgid "" +"Some text starting on line %(line)s is not allowed in that context. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Nějaký text začínající na řádce %(line)s není povolen v tomto kontextu. " +"(Řádka začíná s \"%(start)s\".)" #: core/validators.py:466 #, python-format -msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)" -msgstr "\"%(attr)s\" na řádce %(line)s je neplatný atribut. (Řádka začíná s \"%(start)s\".)" +msgid "" +"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"\"%(attr)s\" na řádce %(line)s je neplatný atribut. (Řádka začíná s \"%" +"(start)s\".)" #: core/validators.py:471 #, python-format -msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)" -msgstr "\"<%(tag)s>\" na řádce %(line)s je neplatná značka. (Řádka začíná s \"%(start)s\".)" +msgid "" +"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"\"<%(tag)s>\" na řádce %(line)s je neplatná značka. (Řádka začíná s \"%" +"(start)s\".)" #: core/validators.py:475 #, python-format -msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)" -msgstr "Značce na řádce %(line)s schází jeden nebo více požadovaných atributů. (Řádka začíná s \"%(start)s\".)" +msgid "" +"A tag on line %(line)s is missing one or more required attributes. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Značce na řádce %(line)s schází jeden nebo více požadovaných atributů. " +"(Řádka začíná s \"%(start)s\".)" #: 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 "Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s \"%(start)s\".)" +msgid "" +"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s " +"\"%(start)s\".)" #: core/meta/fields.py:114 msgid " Separate multiple IDs with commas." msgstr "Oddělte více identifikátorů čárkami." #: core/meta/fields.py:117 -msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "Podržte \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné položky." - +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" +"Podržte \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné " +"položky." diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index e120f054a8..e79e5fc6f0 100644 Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 2112ca1ee3..972bc21ac6 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -243,8 +243,6 @@ msgstr "Django Verwaltung" #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/admin/base.html:29 #: contrib/admin/templates/admin/change_form.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 #: 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 @@ -264,6 +262,8 @@ msgid "Server Error (500)" msgstr "Serverfehler (500)" #: contrib/admin/templates/admin/500.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:7 +#, python-format msgid "" "There's been an error. It's been reported to the site administrators via e-" "mail and should be fixed shortly. Thanks for your patience." @@ -279,7 +279,8 @@ msgstr "Seite nicht gefunden" #: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." -msgstr "Leider konnte die angeforderte Seite nicht gefunden werden." +msgstr "" +"Es tut uns leid, aber die angeforderte Seite kann nicht gefunden werden." #: contrib/admin/templates/admin/index.html:27 #: contrib/admin/templates/admin/change_form.html:14 @@ -359,26 +360,6 @@ msgstr "Passwort msgid "Log out" msgstr "Abmelden" -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, python-format -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"Es hat einen Fehler gegeben. Dieser Fehler wurde an die Serververwalter per " -"eMail weitergegeben und sollte bald behoben sein. Vielen Dank fr Ihr " -"Verstndnis." - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Seite nicht gefunden" - -#: 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/change_form.html:20 msgid "View on site" msgstr "Im Web Anzeigen" @@ -417,10 +398,6 @@ msgstr "Sichern und weiter bearbeiten" msgid "Save" msgstr "Sichern" -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Abmelden" - #: contrib/admin/templates/admin/delete_confirmation.html:7 #, python-format msgid "" diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index 2ac25176a5..46bb915b1b 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -247,17 +247,6 @@ msgstr "" msgid "log entries" msgstr "" -#: 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/404.html:4 #: contrib/admin/templates/admin/404.html:8 msgid "Page not found" @@ -365,11 +354,6 @@ msgid "" "mail and should be fixed shortly. Thanks for your patience." msgstr "" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "" - #: contrib/admin/templates/admin/change_form.html:20 msgid "View on site" msgstr "" @@ -408,18 +392,6 @@ msgstr "" msgid "Save" 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 "" @@ -563,10 +535,6 @@ msgstr "" msgid "log entry" msgstr "" -#: contrib/admin/models/admin.py:16 -msgid "log entries" -msgstr "" - #: contrib/admin/templatetags/admin_list.py:260 msgid "All dates" msgstr "" diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index d32664601f..bc110cd2a7 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -240,8 +240,6 @@ msgstr "Administraci #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/admin/base.html:29 #: contrib/admin/templates/admin/change_form.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 #: 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 @@ -368,28 +366,6 @@ msgstr "" "objetos relacionados, pero su cuenta no tiene permiso para borrar los " "siguientes tipos de objetos:" -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Error del servidor (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Error de servidor (500)" - -#: contrib/admin/templates/admin/500.html:10 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"Ha ocurrido un error. Se ha informado a los administradores del sitio " -"mediante correo electrnico y debera arreglarse en breve. Gracias por su " -"paciencia" - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Pgina no encontrada" - #: contrib/admin/templates/admin/change_form.html:20 msgid "View on site" msgstr "" @@ -428,21 +404,6 @@ msgstr "" msgid "Save" msgstr "" -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Terminar" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, fuzzy, python-format -msgid "" -"Deleting the %(object_name)s '%(object)s' would result in deleting related " -"objects, but your account doesn't have permission to delete the following " -"types of objects:" -msgstr "" -"Eliminar el %(object_name)s '%(object)s' provocara la eliminacin de " -"objetos relacionados, pero su cuenta no tiene permiso para borrar los " -"siguientes tipos de objetos:" - #: contrib/admin/templates/admin/delete_confirmation.html:14 #, python-format msgid "" diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index f8e39e8bbf..e9d8a3a3be 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -240,8 +240,6 @@ msgstr "Administration de Django" #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/admin/base.html:29 #: contrib/admin/templates/admin/change_form.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 #: 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 @@ -368,28 +366,6 @@ msgstr "" "objets qui lui sont lis mais votre compte ne possde pas la permission de " "supprimer les types d'objets suivants:" -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Erreur du serveur (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Erreur du serveur (500)" - -#: contrib/admin/templates/admin/500.html:10 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"Une erreur est survenue. Elle a t transmise par courriel aux " -"administrateurs du site et sera corrige dans les meilleurs dlais. Merci " -"pour votre patience." - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Cette page n'a pas t trouve" - #: contrib/admin/templates/admin/change_form.html:20 msgid "View on site" msgstr "" @@ -429,21 +405,6 @@ msgstr "" msgid "Save" msgstr "actif" -#: contrib/admin/templates/admin/base.html:23 -msgid "Log out" -msgstr "Dconnection" - -#: contrib/admin/templates/admin/delete_confirmation.html:7 -#, fuzzy, python-format -msgid "" -"Deleting the %(object_name)s '%(object)s' would result in deleting related " -"objects, but your account doesn't have permission to delete the following " -"types of objects:" -msgstr "" -"Supprimer %(object_name)s '%(object)s' provoquerait la suppression des " -"objets qui lui sont lis mais votre compte ne possde pas la permission de " -"supprimer les types d'objets suivants:" - #: contrib/admin/templates/admin/delete_confirmation.html:14 #, python-format msgid "" diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po index 1a3ae99e1b..556c97a321 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.po +++ b/django/conf/locale/gl/LC_MESSAGES/django.po @@ -290,8 +290,6 @@ msgstr "Ningunha dispoñíbel" #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/admin/change_form.html:12 #: 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 @@ -406,27 +404,6 @@ msgstr "" "relacionados, pero a súa conta non ten permiso para borrar os seguintes " "tipos de obxectos:" -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Erro do servidor (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Erro do servidor (500)" - -#: contrib/admin/templates/admin/500.html:10 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"Houbo un erro. Xa se informou aos administradores do sitio por correo " -"electrónico e debería quedar arranxado pronto. Grazas pola súa paciencia." - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Páxina non atopada" - #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," msgstr "Benvido," @@ -459,21 +436,6 @@ msgstr "" msgid "Save" msgstr "" -#: 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 "" diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index a32fb8e259..ba950365ee 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -241,8 +241,6 @@ msgstr "Amministrazione Django" #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/admin/base.html:29 #: contrib/admin/templates/admin/change_form.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 #: 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 @@ -368,27 +366,6 @@ msgstr "" "degli oggetti relazionati, ma il tuo account non ha i permessi per rimuovere " "i seguenti tipi di oggetti:" -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "Errore del server (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Errore del Server (500)" - -#: contrib/admin/templates/admin/500.html:10 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"C' stato un errore. E' stato riportato agli amministratori del sito via e-" -"mail e verr risolto a breve. Grazie per la pazienza." - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Pagina non trovata" - #: contrib/admin/templates/admin/change_form.html:20 msgid "View on site" msgstr "" @@ -428,21 +405,6 @@ msgstr "" msgid "Save" msgstr "attivo" -#: 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 "" diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po index b94c4ab306..4cc54bda1a 100644 --- a/django/conf/locale/no/LC_MESSAGES/django.po +++ b/django/conf/locale/no/LC_MESSAGES/django.po @@ -241,8 +241,6 @@ msgstr "Django administrasjon" #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/admin/base.html:29 #: contrib/admin/templates/admin/change_form.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 #: 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 @@ -366,27 +364,6 @@ 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:6 -msgid "Server error (500)" -msgstr "Tjener feil (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Tjener feil (500)" - -#: contrib/admin/templates/admin/500.html:10 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"Det har vært en feil. Feilen er blitt rapportert til administrator via e-" -"mail, og vill bli fikset snart. Takk for din tålmodighet." - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Fant ikke siden" - #: contrib/admin/templates/admin/change_form.html:20 msgid "View on site" msgstr "" @@ -426,20 +403,6 @@ msgstr "" msgid "Save" msgstr "aktiv" -#: 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 "" diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index 19c8b69138..1f81da1452 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -241,8 +241,6 @@ msgstr "Administração do Django" #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/admin/base.html:29 #: contrib/admin/templates/admin/change_form.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 #: 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 @@ -368,27 +366,6 @@ msgstr "" "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:6 -msgid "Server error (500)" -msgstr "Erro no servidor (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Erro no Servidor (500)" - -#: contrib/admin/templates/admin/500.html:10 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"Houve um erro. Este foi reportado aos administradores do site através d e-" -"mail e deve ser consertado em breve. Obrigado pela compreensão." - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Página não encontrada" - #: contrib/admin/templates/admin/change_form.html:20 msgid "View on site" msgstr "" @@ -428,21 +405,6 @@ msgstr "" msgid "Save" msgstr "ativar" -#: 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 "" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index f7f9632b3e..01757b20db 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -238,8 +238,6 @@ msgstr " #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/admin/base.html:29 #: contrib/admin/templates/admin/change_form.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 #: 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 @@ -365,27 +363,6 @@ msgstr "" ", " ":" -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr " (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr " (500)" - -#: contrib/admin/templates/admin/500.html:10 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -" . e-mail " -" . ." - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr " " - #: contrib/admin/templates/admin/change_form.html:20 msgid "View on site" msgstr "" @@ -424,21 +401,6 @@ msgstr "" msgid "Save" 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 "" diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo index f5c9dbe283..9c792559de 100644 Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po index e2809b2ef8..53278fc3a6 100644 --- a/django/conf/locale/sk/LC_MESSAGES/django.po +++ b/django/conf/locale/sk/LC_MESSAGES/django.po @@ -241,8 +241,6 @@ msgstr "Administrácia Django" #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/admin/base.html:29 #: contrib/admin/templates/admin/change_form.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 #: 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 @@ -271,8 +269,13 @@ msgstr "" #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 +#, fuzzy msgid "Page not found" -msgstr "Stránka nebola nájdená" +msgstr "" +"#-#-#-#-# django.po (PACKAGE VERSION) #-#-#-#-#\n" +"Stránka nebola nájdená\n" +"#-#-#-#-# django.po (PACKAGE VERSION) #-#-#-#-#\n" +"Stránka sa nenašla" #: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." @@ -367,27 +370,6 @@ msgstr "" "súvisiacich objektov, ale váš účet nemá povolenie na mazanie nasledujúcich " "typov objektov:" -#: 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 (500)" -msgstr "Chyba servera (500)" - -#: contrib/admin/templates/admin/500.html:10 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"Vznikla chyba. Prostredníctvom e-mailu bol o nej informovaný správca a " -"chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť." - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Stránka sa nenašla" - #: contrib/admin/templates/admin/change_form.html:20 msgid "View on site" msgstr "" @@ -427,21 +409,6 @@ msgstr "" msgid "Save" msgstr "aktívny" -#: 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 "" @@ -1276,10 +1243,10 @@ msgid "" msgstr "" " Podržte \"Control\", alebo \"Command\" na Mac_u, na výber viac ako jednej " "položky." -#:commit + +#: commit msgid "Post a comment" msgstr "Pošli komentár" - msgid "Comments" msgstr "Komentáre" @@ -1308,9 +1275,14 @@ msgstr "Alebo ho vytvorte znova" msgid "Please correct the following errors." msgstr "Odstráňte nasledujúce chyby, prosím." -msgid "Looks like you followed a bad link. If you think it is our fault, please let us know" -msgstr "Pozrite si linku , kde vzikla chyba. Ak si myslíte, že je to naša chyba, dajte nám to vedieť, prosím" - -msgid "Here is a link to the homepage. You know, just in case" -msgstr "Tu je adresa úvodnej stránky. Ak by ste ju potrebovali" +msgid "" +"Looks like you followed a bad link. If you think it is our fault, please let us know" +msgstr "" +"Pozrite si linku , kde vzikla chyba. Ak si myslíte, že je to naša chyba, dajte nám to vedieť, prosím" +msgid "" +"Here is a link to the homepage. You know, just in case" +msgstr "" +"Tu je adresa úvodnej stránky. Ak by ste ju potrebovali" diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index 2e52d5b7c7..3527153fbe 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -244,8 +244,6 @@ msgstr "Django administracija" #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/admin/base.html:29 #: contrib/admin/templates/admin/change_form.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 #: 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 @@ -370,27 +368,6 @@ 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:6 -msgid "Server error (500)" -msgstr "Greška na serveru (500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "Greška na serveru (500)" - -#: contrib/admin/templates/admin/500.html:10 -msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"Dogodila se greška koja je prijavljena administratorima i biće popravljena " -"uskoro. Hvala Vam na strpljenju." - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Strana nije pronađena" - #: contrib/admin/templates/admin/change_form.html:20 msgid "View on site" msgstr "" @@ -431,20 +408,6 @@ msgstr "" msgid "Save" msgstr "aktivan" -#: 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 "" diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo index 31dce87a44..c413c1b940 100644 Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po index 710b2c7a98..c40d2be696 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -244,8 +244,6 @@ msgstr "Django管理员" #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/admin/base.html:29 #: contrib/admin/templates/admin/change_form.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 #: 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 @@ -265,8 +263,12 @@ msgid "Server Error (500)" msgstr "服务器错误 (500)" #: contrib/admin/templates/admin/500.html:10 -msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience." -msgstr "存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢谢你的关心。" +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/404.html:4 #: contrib/admin/templates/admin/404.html:8 @@ -355,29 +357,13 @@ 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 "删除 %(object_name)s '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下列类型的对象：" - -#: contrib/admin/templates/admin/500.html:6 -msgid "Server error (500)" -msgstr "服务器错误(500)" - -#: contrib/admin/templates/admin/500.html:9 -msgid "Server Error (500)" -msgstr "服务器错误 (500)" - -#: contrib/admin/templates/admin/500.html:10 msgid "" -"There's been an error. It's been reported to the site administrators via e-" -"mail and should be fixed shortly. Thanks for your patience." +"Deleting the %(object_name)s '%(object)s' would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" msgstr "" -"存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢" -"谢你的关心。" - -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "页面没有找到" +"删除 %(object_name)s '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下" +"列类型的对象：" #: contrib/admin/templates/admin/change_form.html:20 msgid "View on site" @@ -418,24 +404,13 @@ msgstr "" msgid "Save" 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\"？所有相关的项目都将被删除：" +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" @@ -464,8 +439,12 @@ 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 "忘记你的口令？在下面输入你的邮箱地址，我们将重设你的口令并且将新的口令通过邮件发送给你。" +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:" @@ -489,12 +468,19 @@ 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 "我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。" +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 password twice so we can verify you typed it in correctly." -msgstr "请输入你的旧口令，为了安全起见，接着要输入你的新口令两遍，这样我们可以校验你输入的是否正确。" +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:" @@ -611,28 +597,23 @@ msgstr "一月" msgid "February" msgstr "二月" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "March" msgstr "三月" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "April" msgstr "四月" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "May" msgstr "五月" -#: utils/dates.py:14 -#: utils/dates.py:27 +#: utils/dates.py:14 utils/dates.py:27 msgid "June" msgstr "六月" -#: utils/dates.py:15 -#: utils/dates.py:27 +#: utils/dates.py:15 utils/dates.py:27 msgid "July" msgstr "七月" @@ -704,10 +685,7 @@ msgstr "站点" msgid "label" msgstr "标签" -#: models/core.py:29 -#: models/core.py:40 -#: models/auth.py:6 -#: models/auth.py:19 +#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19 msgid "name" msgstr "名称" @@ -736,7 +714,9 @@ msgid "redirect from" msgstr "重定向自" #: models/core.py:69 -msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'." +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." msgstr "应该是一个绝对路径，不包括域名。例如：'/events/search/'。" #: models/core.py:70 @@ -744,7 +724,9 @@ msgid "redirect to" msgstr "重定向到" #: models/core.py:71 -msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'." +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." msgstr "可以是绝对路径(同上)或以'http://'开始的全URL。" #: models/core.py:73 @@ -756,7 +738,8 @@ msgid "redirects" msgstr "重定向" #: models/core.py:88 -msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." msgstr "例如：'/about/contact/'。请确保前导和结尾的除号。" #: models/core.py:89 @@ -776,8 +759,11 @@ msgid "template name" msgstr "模板名称" #: 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'。" +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:94 msgid "registration required" @@ -823,8 +809,7 @@ msgstr "代码名称" msgid "Permission" msgstr "许可" -#: models/auth.py:11 -#: models/auth.py:58 +#: models/auth.py:11 models/auth.py:58 msgid "Permissions" msgstr "许可" @@ -832,8 +817,7 @@ msgstr "许可" msgid "Group" msgstr "组" -#: models/auth.py:23 -#: models/auth.py:60 +#: models/auth.py:23 models/auth.py:60 msgid "Groups" msgstr "组" @@ -886,8 +870,11 @@ msgid "date joined" msgstr "加入日期" #: models/auth.py:44 -msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in." -msgstr "除了手动设置权限以外，用户也会从他(她)所在的小组获得所赋组小组的所有权限。" +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "" +"除了手动设置权限以外，用户也会从他(她)所在的小组获得所赋组小组的所有权限。" #: models/auth.py:48 msgid "Users" @@ -1030,7 +1017,9 @@ msgid "Enter a valid e-mail address." msgstr "输入一个有效的邮件地址。" #: core/validators.py:147 -msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image." +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." msgstr "上传一个有效的图片。您所上传的文件或者不是图片或是一个破坏的图片。" #: core/validators.py:154 @@ -1095,8 +1084,7 @@ msgstr "这个字段必须与 '%s' 字段相匹配。" msgid "Please enter something for at least one field." msgstr "请至少在一个字段上输入些什么。" -#: core/validators.py:259 -#: core/validators.py:270 +#: core/validators.py:259 core/validators.py:270 msgid "Please enter both fields or leave them both empty." msgstr "请要么两个字段都输入或者两个字段都空着。" @@ -1126,13 +1114,15 @@ msgstr "请输入一个有效的小数。" #: core/validators.py:344 #, python-format msgid "Please enter a valid decimal number with at most %s total digit." -msgid_plural "Please enter a valid decimal number with at most %s total digits." +msgid_plural "" +"Please enter a valid decimal number with at most %s total digits." msgstr[0] "请输入一个有效的小数，最多 %s 个数字。 " #: core/validators.py:347 #, python-format msgid "Please enter a valid decimal number with at most %s decimal place." -msgid_plural "Please enter a valid decimal number with at most %s decimal places." +msgid_plural "" +"Please enter a valid decimal number with at most %s decimal places." msgstr[0] "请输入一个有效的小数，最多 %s 个小数位。 " #: core/validators.py:357 @@ -1160,44 +1150,63 @@ msgstr "不能从 %s 得到任何东西。" #: core/validators.py:424 #, python-format -msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." +msgid "" +"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "URL %(url)s 返回了无效的 Content-Type 头 '%(contenttype)s'。" #: core/validators.py:457 #, python-format -msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)" -msgstr "请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)" +msgid "" +"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " +"\"%(start)s\".)" +msgstr "" +"请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)" #: 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 "在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)" +msgid "" +"Some text starting on line %(line)s is not allowed in that context. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)" #: core/validators.py:466 #, python-format -msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)" -msgstr "在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)" +msgid "" +"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)" #: core/validators.py:471 #, python-format -msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)" -msgstr "在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)" +msgid "" +"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)" #: core/validators.py:475 #, python-format -msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)" -msgstr "在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)" +msgid "" +"A tag on line %(line)s is missing one or more required attributes. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)" #: 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 "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)" +msgid "" +"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)" #: core/meta/fields.py:114 msgid " Separate multiple IDs with commas." msgstr " 用逗号分隔多个ID。" #: core/meta/fields.py:117 -msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr " 按下 \"Control\"，或者在Mac上按 \"Command\" 来选择一个或多个值。" -