diff --git a/AUTHORS b/AUTHORS
index 28456d3814..b1b4e6b977 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -65,6 +65,7 @@ answer newbie questions, and generally made Django that much better:
Robert Rock Howard %s:
\n"
"\n"
-#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
+#: contrib/admin/filterspecs.py:70
+#: contrib/admin/filterspecs.py:88
#: contrib/admin/filterspecs.py:143
msgid "All"
msgstr "Vše"
@@ -442,14 +424,11 @@ msgstr "log záznamy"
msgid "All dates"
msgstr "Všechna data"
-#: contrib/admin/views/decorators.py:9 contrib/auth/forms.py:36
+#: contrib/admin/views/decorators.py:9
+#: contrib/auth/forms.py:36
#: contrib/auth/forms.py:41
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Prosíme, vložte správné uživatelské jméno a heslo. Poznámka - u obou položek "
-"se rozlišuje velikost písmen."
+msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
+msgstr "Prosíme, vložte správné uživatelské jméno a heslo. Poznámka - u obou položek se rozlišuje velikost písmen."
#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:25
@@ -457,20 +436,12 @@ msgid "Log in"
msgstr "Přihlášení"
#: contrib/admin/views/decorators.py:61
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-"Prosíme, znovu se přihlašte, Vaše sezení vypršelo. Nemusíte se obávat, Vaše "
-"podání je uloženo."
+msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
+msgstr "Prosíme, znovu se přihlašte, Vaše sezení vypršelo. Nemusíte se obávat, Vaše podání je uloženo."
#: contrib/admin/views/decorators.py:68
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
-"Vypadá to, že Váš prohlížeč není nastaven, aby akceptoval cookies. Prosíme, "
-"zapněte cookies, obnovte tuto stránku a zkuste znovu."
+msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
+msgstr "Vypadá to, že Váš prohlížeč není nastaven, aby akceptoval cookies. Prosíme, zapněte cookies, obnovte tuto stránku a zkuste znovu."
#: contrib/admin/views/decorators.py:82
msgid "Usernames cannot contain the '@' character."
@@ -479,8 +450,7 @@ msgstr "Uživatelská jména nemohou obsahovat znak '@'."
#: contrib/admin/views/decorators.py:84
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Vaše e-mailová adresa není Vaše uživatelské jméno. Zkuste místo toho '%s'."
+msgstr "Vaše e-mailová adresa není Vaše uživatelské jméno. Zkuste místo toho '%s'."
#: contrib/admin/views/main.py:226
msgid "Site administration"
@@ -491,11 +461,13 @@ msgstr "Django správa"
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "Záznam %(name)s \"%(obj)s\" byl úspěšně přidán."
-#: contrib/admin/views/main.py:264 contrib/admin/views/main.py:348
+#: contrib/admin/views/main.py:264
+#: contrib/admin/views/main.py:348
msgid "You may edit it again below."
msgstr "Můžete to opět upravit níže."
-#: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357
+#: contrib/admin/views/main.py:272
+#: contrib/admin/views/main.py:357
#, python-format
msgid "You may add another %s below."
msgstr "Můžete přidat další %s níže."
@@ -510,7 +482,8 @@ msgstr "%s: přidat"
msgid "Added %s."
msgstr "Záznam %s byl přidán."
-#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338
+#: contrib/admin/views/main.py:336
+#: contrib/admin/views/main.py:338
#: contrib/admin/views/main.py:340
msgid "and"
msgstr "a"
@@ -536,10 +509,8 @@ msgstr "%(name)s \"%(obj)s\" byl úspěšně změněn."
#: contrib/admin/views/main.py:354
#, python-format
-msgid ""
-"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr ""
-"The %(name)s \"%(obj)s\" byl úspěšně přidán. Můžete to opět upravit níže."
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "The %(name)s \"%(obj)s\" byl úspěšně přidán. Můžete to opět upravit níže."
#: contrib/admin/views/main.py:392
#, python-format
@@ -580,9 +551,12 @@ msgstr "Vybrat %s"
msgid "Select %s to change"
msgstr "Vyberte %s pro změnu"
-#: contrib/admin/views/doc.py:277 contrib/admin/views/doc.py:286
-#: contrib/admin/views/doc.py:288 contrib/admin/views/doc.py:294
-#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:297
+#: contrib/admin/views/doc.py:277
+#: contrib/admin/views/doc.py:286
+#: contrib/admin/views/doc.py:288
+#: contrib/admin/views/doc.py:294
+#: contrib/admin/views/doc.py:295
+#: contrib/admin/views/doc.py:297
msgid "Integer"
msgstr "Celé číslo"
@@ -590,7 +564,8 @@ msgstr "Celé číslo"
msgid "Boolean (Either True or False)"
msgstr "Boolean (buď Ano (True), nebo Ne (False))"
-#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:296
+#: contrib/admin/views/doc.py:279
+#: contrib/admin/views/doc.py:296
#, python-format
msgid "String (up to %(maxlength)s)"
msgstr "Text (maximálně %(maxlength)s znaků)"
@@ -611,7 +586,8 @@ msgstr "Datum (s časem)"
msgid "E-mail address"
msgstr "E-mailová adresa"
-#: contrib/admin/views/doc.py:284 contrib/admin/views/doc.py:287
+#: contrib/admin/views/doc.py:284
+#: contrib/admin/views/doc.py:287
msgid "File path"
msgstr "Cesta k souboru"
@@ -639,7 +615,8 @@ msgstr "Text"
msgid "Time"
msgstr "Čas"
-#: contrib/admin/views/doc.py:300 contrib/flatpages/models.py:7
+#: contrib/admin/views/doc.py:300
+#: contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
@@ -719,12 +696,8 @@ msgid "DATE_WITH_TIME_FULL"
msgstr "j. N Y, H:i"
#: contrib/admin/templates/admin/object_history.html:36
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
-msgstr ""
-"Tento objekt nemá historii změn. Pravděpodobně nebyl přidán přes "
-"administrátorské rozhraní."
+msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
+msgstr "Tento objekt nemá historii změn. Pravděpodobně nebyl přidán přes administrátorské rozhraní."
#: contrib/admin/templates/admin/base_site.html:4
msgid "Django site admin"
@@ -747,12 +720,8 @@ 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
@@ -766,7 +735,7 @@ msgstr "Je nám líto, ale vyžádaná stránka nebyla nalezena."
#: contrib/admin/templates/admin/index.html:17
#, python-format
msgid "Models available in the %(name)s application."
-msgstr ""
+msgstr "Dostupné modely v aplikaci %(name)s."
#: contrib/admin/templates/admin/index.html:28
#: contrib/admin/templates/admin/change_form.html:15
@@ -813,22 +782,13 @@ msgstr "Smazat"
#: contrib/admin/templates/admin/delete_confirmation.html:14
#, 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ů:"
+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:21
#, 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:26
msgid "Yes, I'm sure"
@@ -902,12 +862,8 @@ 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:"
@@ -931,20 +887,12 @@ 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 ""
-"Vložte svoje staré heslo a poté vložte dvakrát nové heslo. Tak 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 "Vložte svoje staré heslo a poté vložte dvakrát nové heslo. Tak můžeme ověřit, že jste ho napsal(a) správně."
#: contrib/admin/templates/registration/password_change_form.html:17
msgid "Old password:"
@@ -1012,13 +960,10 @@ msgid ""
"your computer is \"internal\").
Pro nainstalování bookmarkletů, přetáhněte odkaz na Vaše " -"záložky (oblíbené),\n" -"nebo klikněte pravým tlačítkem na odkaz a přidejte ho k Vašim záložkám " -"(oblíbeným). Nyní můžete\n" +"
Pro nainstalování bookmarkletů, přetáhněte odkaz na Vaše záložky (oblíbené),\n" +"nebo klikněte pravým tlačítkem na odkaz a přidejte ho k Vašim záložkám (oblíbeným). Nyní můžete\n" "zvolit bookmarklet z libovolné stránky. Poznámka: Některé tyto\n" -"bookmarklety vyžadují, abyste prohlížel(a) stránky z počítače, který je " -"nastaven jako\n" +"bookmarklety vyžadují, abyste prohlížel(a) stránky z počítače, který je nastaven jako\n" "\"interní\" (promluvte si s Vaším administrátorem, jestli si nejste jisti,\n" "zda je Váš počítač \"interní\").
\n" @@ -1027,24 +972,16 @@ msgid "Documentation for this page" msgstr "Dokumentace pro tuto stránku" #: contrib/admin/templates/admin_doc/bookmarklets.html:20 -msgid "" -"Jumps you from any page to the documentation for the view that generates " -"that page." -msgstr "" -"Z libovolné stránky otevře dokumentaci pro pohled, který vygeneroval tuto " -"stránku." +msgid "Jumps you from any page to the documentation for the view that generates that page." +msgstr "Z libovolné stránky otevře dokumentaci pro pohled, který vygeneroval tuto stránku." #: contrib/admin/templates/admin_doc/bookmarklets.html:22 msgid "Show object ID" msgstr "Ukázat id objektu" #: contrib/admin/templates/admin_doc/bookmarklets.html:23 -msgid "" -"Shows the content-type and unique ID for pages that represent a single " -"object." -msgstr "" -"Ukáže content-type a unikátní ID pro stránky, které reprezentují jeden " -"objekt." +msgid "Shows the content-type and unique ID for pages that represent a single object." +msgstr "Ukáže content-type a unikátní ID pro stránky, které reprezentují jeden objekt." #: contrib/admin/templates/admin_doc/bookmarklets.html:25 msgid "Edit this object (current window)" @@ -1083,23 +1020,16 @@ msgid "redirect from" msgstr "přesměrovat z" #: contrib/redirects/models.py:8 -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/'." #: contrib/redirects/models.py:9 msgid "redirect to" msgstr "přesměrovat na" #: contrib/redirects/models.py:10 -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://'." #: contrib/redirects/models.py:12 msgid "redirect" @@ -1110,10 +1040,8 @@ msgid "redirects" msgstr "přesměrování" #: contrib/flatpages/models.py:8 -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." #: contrib/flatpages/models.py:9 msgid "title" @@ -1132,12 +1060,8 @@ msgid "template name" msgstr "jméno šablony" #: contrib/flatpages/models.py:13 -msgid "" -"Example: 'flatpages/contact_page'. If this isn't provided, the system will " -"use 'flatpages/default'." -msgstr "" -"Například: 'flatfiles/kontaktni_stranka'. Pokud toto není zadáno, systém " -"použije 'flatfiles/default'." +msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'." +msgstr "Například: 'flatfiles/kontaktni_stranka'. Pokud toto není zadáno, systém použije 'flatfiles/default'." #: contrib/flatpages/models.py:14 msgid "registration required" @@ -1145,9 +1069,7 @@ msgstr "nutná registrace" #: contrib/flatpages/models.py:14 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." #: contrib/flatpages/models.py:18 msgid "flat page" @@ -1157,7 +1079,8 @@ msgstr "statická stránka" msgid "flat pages" msgstr "statické stránky" -#: contrib/auth/models.py:13 contrib/auth/models.py:26 +#: contrib/auth/models.py:13 +#: contrib/auth/models.py:26 msgid "name" msgstr "jméno" @@ -1166,24 +1089,22 @@ msgid "codename" msgstr "codename" #: contrib/auth/models.py:17 -#, fuzzy msgid "permission" -msgstr "Oprávnění" +msgstr "oprávnění" -#: contrib/auth/models.py:18 contrib/auth/models.py:27 -#, fuzzy +#: contrib/auth/models.py:18 +#: contrib/auth/models.py:27 msgid "permissions" -msgstr "Oprávnění" +msgstr "oprávnění" #: contrib/auth/models.py:29 -#, fuzzy msgid "group" -msgstr "Skupina" +msgstr "skupina" -#: contrib/auth/models.py:30 contrib/auth/models.py:65 -#, fuzzy +#: contrib/auth/models.py:30 +#: contrib/auth/models.py:65 msgid "groups" -msgstr "Skupiny" +msgstr "skupiny" #: contrib/auth/models.py:55 msgid "username" @@ -1234,27 +1155,20 @@ msgid "date joined" msgstr "datum zaregistrování" #: contrib/auth/models.py:66 -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." #: contrib/auth/models.py:67 -#, fuzzy msgid "user permissions" -msgstr "Oprávnění" +msgstr "uživatelskí oprávnění" #: contrib/auth/models.py:70 -#, fuzzy msgid "user" -msgstr "Uživatel" +msgstr "uživatel" #: contrib/auth/models.py:71 -#, fuzzy msgid "users" -msgstr "Uživatelé" +msgstr "uživatelé" #: contrib/auth/models.py:76 msgid "Personal info" @@ -1273,22 +1187,16 @@ msgid "Groups" msgstr "Skupiny" #: contrib/auth/models.py:219 -#, fuzzy msgid "message" -msgstr "Zpráva" +msgstr "zpráva" #: contrib/auth/forms.py:30 -msgid "" -"Your Web browser doesn't appear to have cookies enabled. Cookies are " -"required for logging in." -msgstr "" -"Váš prohlížeč pravděpodobně nemá zapnuté cookies. Cookies jsou potřeba pro " -"zalogování." +msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in." +msgstr "Váš prohlížeč pravděpodobně nemá zapnuté cookies. Cookies jsou potřeba pro zalogování." #: contrib/contenttypes/models.py:25 -#, fuzzy msgid "python model class name" -msgstr "jméno modulu Pythonu" +msgstr "jméno modelu Pythonu" #: contrib/contenttypes/models.py:28 msgid "content type" @@ -1382,23 +1290,28 @@ 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" @@ -1423,54 +1336,52 @@ msgid "December" msgstr "Prosinec" #: utils/dates.py:19 -#, fuzzy msgid "jan" -msgstr "a" +msgstr "led" #: utils/dates.py:19 msgid "feb" -msgstr "" +msgstr "úno" #: utils/dates.py:19 msgid "mar" -msgstr "" +msgstr "bře" #: utils/dates.py:19 msgid "apr" -msgstr "" +msgstr "dub" #: utils/dates.py:19 -#, fuzzy msgid "may" -msgstr "den" +msgstr "kvě" #: utils/dates.py:19 msgid "jun" -msgstr "" +msgstr "čen" #: utils/dates.py:20 msgid "jul" -msgstr "" +msgstr "čec" #: utils/dates.py:20 msgid "aug" -msgstr "" +msgstr "srp" #: utils/dates.py:20 msgid "sep" -msgstr "" +msgstr "zář" #: utils/dates.py:20 msgid "oct" -msgstr "" +msgstr "říj" #: utils/dates.py:20 msgid "nov" -msgstr "" +msgstr "lis" #: utils/dates.py:20 msgid "dec" -msgstr "" +msgstr "pro" #: utils/dates.py:27 msgid "Jan." @@ -1517,9 +1428,9 @@ msgstr[2] "měsíců" #: utils/timesince.py:14 msgid "week" msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "týden" +msgstr[1] "týdny" +msgstr[2] "týdnů" #: utils/timesince.py:15 msgid "day" @@ -1564,7 +1475,7 @@ msgstr "Německy" #: conf/global_settings.py:42 msgid "Greek" -msgstr "" +msgstr "Řecky" #: conf/global_settings.py:43 msgid "English" @@ -1584,11 +1495,11 @@ msgstr "Galicijsky" #: conf/global_settings.py:47 msgid "Hungarian" -msgstr "" +msgstr "Maďarsky" #: conf/global_settings.py:48 msgid "Hebrew" -msgstr "" +msgstr "Hebrejsky" #: conf/global_settings.py:49 msgid "Icelandic" @@ -1627,9 +1538,8 @@ msgid "Slovak" msgstr "Slovensky" #: conf/global_settings.py:58 -#, fuzzy msgid "Slovenian" -msgstr "Slovensky" +msgstr "Slovinsky" #: conf/global_settings.py:59 msgid "Serbian" @@ -1640,9 +1550,8 @@ msgid "Swedish" msgstr "Švédsky" #: conf/global_settings.py:61 -#, fuzzy msgid "Ukrainian" -msgstr "Brazilsky" +msgstr "Ukrajinsky" #: conf/global_settings.py:62 msgid "Simplified Chinese" @@ -1657,12 +1566,8 @@ msgid "This value must contain only letters, numbers and underscores." msgstr "Tato hodnota musí obsahovat pouze znaky, čísla nebo podtržítka." #: core/validators.py:64 -#, fuzzy -msgid "" -"This value must contain only letters, numbers, underscores, dashes or " -"slashes." -msgstr "" -"Tato hodnota musí obsahovat pouze znaky, čísla, podtržítka nebo lomítka." +msgid "This value must contain only letters, numbers, underscores, dashes or slashes." +msgstr "Tato hodnota musí obsahovat pouze znaky, čísla, podtržítka, pomlčky nebo lomítka." #: core/validators.py:72 msgid "Uppercase letters are not allowed here." @@ -1712,7 +1617,8 @@ msgstr "Vložte platné datum ve formátu RRRR-MM-DD." msgid "Enter a valid time in HH:MM format." msgstr "Vložte platný čas ve formátu HH:MM." -#: core/validators.py:132 db/models/fields/__init__.py:468 +#: core/validators.py:132 +#: db/models/fields/__init__.py:468 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Vložte platné datum a čas ve formátu RRRR-MM-DD HH:MM." @@ -1721,12 +1627,8 @@ msgid "Enter a valid e-mail address." msgstr "Vložte platnou e-mailovou adresu." #: core/validators.py:148 -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:155 #, python-format @@ -1766,7 +1668,8 @@ msgstr "Špatně formované XML: %s" msgid "Invalid URL: %s" msgstr "Neplatné URL: %s" -#: core/validators.py:206 core/validators.py:208 +#: core/validators.py:206 +#: core/validators.py:208 #, python-format msgid "The URL %s is a broken link." msgstr "Odkaz na URL %s je rozbitý." @@ -1792,7 +1695,8 @@ 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:264 core/validators.py:275 +#: core/validators.py:264 +#: core/validators.py:275 msgid "Please enter both fields or leave them both empty." msgstr "Prosíme, vložte obě pole, nebo je nechte obě prázdná." @@ -1822,8 +1726,7 @@ msgstr "Prosíme, vložte platné číslo." #: core/validators.py:349 #, 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." @@ -1831,16 +1734,10 @@ msgstr[2] "Prosíme, vložte platné číslo s nejvíce %s ciframi celkem." #: core/validators.py:352 #, 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:362 #, python-format @@ -1867,63 +1764,38 @@ msgstr "Nemohl jsem získat nic z %s." #: core/validators.py:429 #, 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:462 #, 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:466 #, 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:471 #, 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:476 #, 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:480 #, 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:485 #, 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\".)" #: db/models/manipulators.py:302 #, python-format @@ -1935,26 +1807,25 @@ msgstr "%(object)s s tímto %(type)s již existují pro daná %(field)s." msgid "%(optname)s with this %(fieldname)s already exists." msgstr "%(optname)s s tímto %(fieldname)s již existuje." -#: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265 -#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:553 +#: db/models/fields/__init__.py:114 +#: db/models/fields/__init__.py:265 +#: db/models/fields/__init__.py:542 +#: db/models/fields/__init__.py:553 #: forms/__init__.py:346 msgid "This field is required." msgstr "Toto pole je povinné." #: db/models/fields/__init__.py:337 -#, fuzzy msgid "This value must be an integer." -msgstr "Tato hodnota musí být mocninou %s." +msgstr "Tato hodnota musí být celé číslo." #: db/models/fields/__init__.py:369 -#, fuzzy msgid "This value must be either True or False." -msgstr "Tato hodnota musí být mocninou %s." +msgstr "Tato hodnota musí být buď Ano (True), nebo Ne (False)." #: db/models/fields/__init__.py:385 -#, fuzzy msgid "This field cannot be null." -msgstr "Toto pole není platné." +msgstr "Toto pole nemůže být prázdné (null)." #: db/models/fields/__init__.py:562 msgid "Enter a valid filename." @@ -1966,28 +1837,20 @@ msgid "Please enter a valid %s." msgstr "Prosíme, zadejte %s správně." #: db/models/fields/related.py:579 -#, fuzzy msgid "Separate multiple IDs with commas." msgstr "Oddělte více identifikátorů čárkami." #: db/models/fields/related.py:581 -#, fuzzy -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." #: db/models/fields/related.py:625 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." -msgid_plural "" -"Please enter valid %(self)s IDs. The values %(value)r are invalid." +msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid." msgstr[0] "Prosíme, vložte platná %(self)s ID. Hodnota %(value)r není platná." -msgstr[1] "" -"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné." -msgstr[2] "" -"Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné." +msgstr[1] "Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné." +msgstr[2] "Prosíme, vložte platná %(self)s ID. Hodnoty %(value)r nejsou platné." #: forms/__init__.py:380 #, python-format @@ -2001,7 +1864,9 @@ msgstr[2] "Ujistěte se, že Váš text má méně než %s znaků." msgid "Line breaks are not allowed here." msgstr "Zalomení řádky zde nenjsou povolená." -#: forms/__init__.py:480 forms/__init__.py:551 forms/__init__.py:589 +#: forms/__init__.py:480 +#: forms/__init__.py:551 +#: forms/__init__.py:589 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." msgstr "Vyberte platnou volbu. '%(data)s' není mezi %(choices)s." @@ -2028,25 +1893,18 @@ msgstr "ano, ne, možná" #~ msgid "Comment" #~ msgstr "Komentář" - #~ msgid "Comments" #~ msgstr "Komentáře" - #~ msgid "String (up to 50)" #~ msgstr "Text (max. 50 znaků)" - #~ msgid "label" #~ msgstr "nadpis" - #~ msgid "package" #~ msgstr "balík" - #~ msgid "packages" #~ msgstr "balíky" - #~ msgid "Error in Template" #~ msgstr "Chyba v šabloně" - #~ msgid "" #~ "\n" #~ "In template %(name)s, error at line %(line)s:\n" @@ -2057,3 +1915,4 @@ msgstr "ano, ne, možná" #, fuzzy #~ msgid "count" #~ msgstr "počet" + diff --git a/django/conf/locale/el/LC_MESSAGES/django.mo b/django/conf/locale/el/LC_MESSAGES/django.mo index 3da7476e3b..915c768de7 100644 Binary files a/django/conf/locale/el/LC_MESSAGES/django.mo and b/django/conf/locale/el/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/el/LC_MESSAGES/django.po b/django/conf/locale/el/LC_MESSAGES/django.po index a1e77c238f..fb65fa561d 100644 --- a/django/conf/locale/el/LC_MESSAGES/django.po +++ b/django/conf/locale/el/LC_MESSAGES/django.po @@ -18,81 +18,81 @@ msgstr "" #: contrib/comments/models.py:67 contrib/comments/models.py:166 msgid "object ID" -msgstr "ID " +msgstr "ID αντικειμένου" #: contrib/comments/models.py:68 msgid "headline" -msgstr "" +msgstr "Επικεφαλίδα" #: contrib/comments/models.py:69 contrib/comments/models.py:90 #: contrib/comments/models.py:167 msgid "comment" -msgstr "" +msgstr "σχόλιο" #: contrib/comments/models.py:70 msgid "rating #1" -msgstr " #1" +msgstr "κατάταξη #1" #: contrib/comments/models.py:71 msgid "rating #2" -msgstr " #2" +msgstr "βαθμολογία #2" #: contrib/comments/models.py:72 msgid "rating #3" -msgstr " #3" +msgstr "βαθμολογία #3" #: contrib/comments/models.py:73 msgid "rating #4" -msgstr " #4" +msgstr "βαθμολογία #4" #: contrib/comments/models.py:74 msgid "rating #5" -msgstr " #5" +msgstr "βαθμολογία #5" #: contrib/comments/models.py:75 msgid "rating #6" -msgstr " #6" +msgstr "βαθμολογία #6" #: contrib/comments/models.py:76 msgid "rating #7" -msgstr " #7" +msgstr "βαθμολογία #7" #: contrib/comments/models.py:77 msgid "rating #8" -msgstr " #8" +msgstr "βαθμολογία #8" #: contrib/comments/models.py:82 msgid "is valid rating" -msgstr " " +msgstr "είναι έγκυρη βαθμολογία" #: contrib/comments/models.py:83 contrib/comments/models.py:169 msgid "date/time submitted" -msgstr "/ " +msgstr "ημερομηνία/ώρα υποβολής" #: contrib/comments/models.py:84 contrib/comments/models.py:170 msgid "is public" -msgstr " " +msgstr "είναι δημόσιο" #: contrib/comments/models.py:85 contrib/admin/views/doc.py:289 msgid "IP address" -msgstr "IP " +msgstr "IP διεύθυνση" #: contrib/comments/models.py:86 msgid "is removed" -msgstr " " +msgstr "είναι διεγραμμένο" #: contrib/comments/models.py:86 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." msgstr "" -" . " -"\" ." +"Σημειώστε αυτό το κουτί εάν το σχόλιο είναι ανάρμοστο. Ένα Αυτό το σχόλιο " +"εσβήσθει\" μήνυμα θα εμφανιστεί αντί αυτού." #: contrib/comments/models.py:91 #, fuzzy msgid "comments" -msgstr "" +msgstr "σχόλιο" #: contrib/comments/models.py:131 contrib/comments/models.py:207 msgid "Content object" @@ -110,38 +110,38 @@ msgstr "" #: contrib/comments/models.py:168 msgid "person's name" -msgstr " " +msgstr "όνομα ατόμου" #: contrib/comments/models.py:171 msgid "ip address" -msgstr "ip " +msgstr "ip διεύθυνση" #: contrib/comments/models.py:173 msgid "approved by staff" -msgstr " " +msgstr "εγκεκριμένο από το προσωπικό" #: contrib/comments/models.py:176 #, fuzzy msgid "free comment" -msgstr " " +msgstr "Ελεύθερο σχόλιο" #: contrib/comments/models.py:177 #, fuzzy msgid "free comments" -msgstr " " +msgstr "Ελεύθερα σχόλια" #: contrib/comments/models.py:233 msgid "score" -msgstr "" +msgstr "βαθμολογία" #: contrib/comments/models.py:234 msgid "score date" -msgstr " " +msgstr "ημερομηνία βαθμολογίας" #: contrib/comments/models.py:237 #, fuzzy msgid "karma score" -msgstr "" +msgstr "βαθμολογία" #: contrib/comments/models.py:238 msgid "karma scores" @@ -159,9 +159,9 @@ msgid "" "\n" "%(text)s" msgstr "" -" %()\n" +"Αυτο το σχόλιο σημειώθει απο %(χρήστη)ες\n" "\n" -"%()" +"%(κείμενο)α" #: contrib/comments/models.py:265 msgid "flag date" @@ -182,7 +182,7 @@ msgstr "" #: contrib/comments/models.py:278 msgid "deletion date" -msgstr " " +msgstr "ημερομηνία διαγραφής" #: contrib/comments/models.py:280 msgid "moderator deletion" @@ -199,7 +199,7 @@ msgstr "" #: contrib/comments/views/karma.py:19 msgid "Anonymous users cannot vote" -msgstr " " +msgstr "Ανώνυμοι χρήστες δέν μπορούν να ψηφήσουν" #: contrib/comments/views/karma.py:23 msgid "Invalid comment ID" @@ -212,7 +212,7 @@ msgstr "" #: contrib/comments/views/comments.py:28 msgid "" "This rating is required because you've entered at least one other rating." -msgstr " " +msgstr "Αυτή η βαθμολογία απαιτείται επειδή τουλάχιστον ακόμα μια βαθμολογία" #: contrib/comments/views/comments.py:112 #, python-format @@ -245,7 +245,7 @@ msgstr "" #: contrib/comments/views/comments.py:193 #: contrib/comments/views/comments.py:284 msgid "One or more of the required fields wasn't submitted" -msgstr " " +msgstr "Ένα ή περισσότερα από τα απαιτούμενα πεδία δεν υποβλίθει" #: contrib/comments/views/comments.py:197 #: contrib/comments/views/comments.py:286 @@ -273,11 +273,11 @@ msgstr "" #: contrib/comments/templates/comments/form.html:6 #: contrib/admin/templates/admin/login.html:20 msgid "Password:" -msgstr "" +msgstr "Κωδικός" #: contrib/comments/templates/comments/form.html:6 msgid "Forgotten your password?" -msgstr " ;" +msgstr "Ξεχάσατε τον κωδικό σας;" #: contrib/comments/templates/comments/form.html:8 #: contrib/admin/templates/admin/object_history.html:3 @@ -321,7 +321,7 @@ msgstr "" #: contrib/comments/templates/comments/form.html:27 #: contrib/comments/templates/comments/freeform.html:5 msgid "Comment:" -msgstr ":" +msgstr "Σχόλιο:" #: contrib/comments/templates/comments/form.html:32 #: contrib/comments/templates/comments/freeform.html:9 @@ -350,7 +350,7 @@ msgstr "" #: contrib/admin/filterspecs.py:110 msgid "Today" -msgstr "" +msgstr "Σήμερα" #: contrib/admin/filterspecs.py:113 msgid "Past 7 days" @@ -358,23 +358,23 @@ msgstr "" #: contrib/admin/filterspecs.py:115 msgid "This month" -msgstr " " +msgstr "Αυτό το μήνα" #: contrib/admin/filterspecs.py:117 msgid "This year" -msgstr " " +msgstr "Αυτό το χρόνο" #: contrib/admin/filterspecs.py:143 msgid "Yes" -msgstr "" +msgstr "Ναί" #: contrib/admin/filterspecs.py:143 msgid "No" -msgstr "" +msgstr "Όχι" #: contrib/admin/filterspecs.py:150 msgid "Unknown" -msgstr "" +msgstr "’γνωστο" #: contrib/admin/models.py:16 msgid "action time" @@ -394,7 +394,7 @@ msgstr "" #: contrib/admin/models.py:22 msgid "change message" -msgstr " " +msgstr "αλλάξτε το μήνυμα" #: contrib/admin/models.py:25 msgid "log entry" @@ -406,7 +406,7 @@ msgstr "" #: contrib/admin/templatetags/admin_list.py:228 msgid "All dates" -msgstr " " +msgstr "Όλες οι ημερομηνίες" #: contrib/admin/views/decorators.py:9 contrib/auth/forms.py:36 #: contrib/auth/forms.py:41 @@ -414,45 +414,45 @@ msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -" . " -" case-sensitive." +"Παρακαλώ εισάγετε ένα σωστό όνομα χρήστη και κωδικό. Να σημειωθεί ότι και τα " +"δύο πεδία είναι case-sensitive." #: contrib/admin/views/decorators.py:23 #: contrib/admin/templates/admin/login.html:25 msgid "Log in" -msgstr "" +msgstr "Συνδεθείτε" #: contrib/admin/views/decorators.py:61 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." msgstr "" -" , session . : " -"submission ." +"Παρακαλώ ξανασυνδεθείτε, γιατί η session σας έληξε. Μην ανησυχείτε: Η " +"submission σας έχει αποθηκευτεί." #: contrib/admin/views/decorators.py:68 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." msgstr "" -"' , cookies. " -" cookies, , " -" ." +"Απ'οτι φαίνεται, ο φυλλομετρητής σας δεν έχει ρυθμιστεί να δέχεται cookies. " +"Παρακαλώ ενεργοποιείστε τα cookies, ξαναφορτώστε αυτή την σελίδα, και " +"δοκιμάστε ξανά." #: contrib/admin/views/decorators.py:82 msgid "Usernames cannot contain the '@' character." -msgstr " '@'." +msgstr "Τα ονόματα των Χρηστών δεν μπορόυν να περιέχουν τον χαρακτήρα '@'." #: contrib/admin/views/decorators.py:84 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "" -" . '%s' " -" ." +"Η ηλεκτρονική σας διεύθυνση δεν είναι το ονόμα χρήστη σας. Δοκιμάστε '%s' " +"έναντι αυτού." #: contrib/admin/views/main.py:226 msgid "Site administration" -msgstr " " +msgstr "Διαχείριση του Διαδυκτιακού χώρου" #: contrib/admin/views/main.py:260 #, python-format @@ -466,7 +466,7 @@ msgstr "" #: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357 #, python-format msgid "You may add another %s below." -msgstr " %s ." +msgstr "Μπορείτε να προσθέσετε ακόμα ένα %s απο κάτω." #: contrib/admin/views/main.py:290 #, python-format @@ -481,7 +481,7 @@ msgstr "" #: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338 #: contrib/admin/views/main.py:340 msgid "and" -msgstr "" +msgstr "και" #: contrib/admin/views/main.py:338 #, python-format @@ -530,7 +530,7 @@ msgstr "" #: contrib/admin/views/main.py:511 msgid "Are you sure?" -msgstr " ;" +msgstr "Είστε σίγουρος;" #: contrib/admin/views/main.py:533 #, python-format @@ -551,11 +551,11 @@ msgstr "" #: contrib/admin/views/doc.py:288 contrib/admin/views/doc.py:294 #: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:297 msgid "Integer" -msgstr "" +msgstr "Ακέραιος" #: contrib/admin/views/doc.py:278 msgid "Boolean (Either True or False)" -msgstr "Boolean ( )" +msgstr "Boolean (Είτε Αλήθεια ή Ψέμα)" #: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:296 #, python-format @@ -568,15 +568,15 @@ msgstr "" #: contrib/admin/views/doc.py:281 msgid "Date (without time)" -msgstr " ( )" +msgstr "Ημερομηνία (χωρίς την ώρα)" #: contrib/admin/views/doc.py:282 msgid "Date (with time)" -msgstr " ( )" +msgstr "Ημερομηνία (με την ώρα)" #: contrib/admin/views/doc.py:283 msgid "E-mail address" -msgstr " " +msgstr "Ηλεκτρονική διεύθυνση" #: contrib/admin/views/doc.py:284 contrib/admin/views/doc.py:287 msgid "File path" @@ -584,7 +584,7 @@ msgstr "" #: contrib/admin/views/doc.py:285 msgid "Decimal number" -msgstr " " +msgstr "Δεκαδικός αριθμός" #: contrib/admin/views/doc.py:291 msgid "Boolean (Either True, False or None)" @@ -596,15 +596,15 @@ msgstr "" #: contrib/admin/views/doc.py:293 msgid "Phone number" -msgstr " " +msgstr "Αριθμός τηλεφώνου" #: contrib/admin/views/doc.py:298 msgid "Text" -msgstr "" +msgstr "Κείμενο" #: contrib/admin/views/doc.py:299 msgid "Time" -msgstr "" +msgstr "Ώρα" #: contrib/admin/views/doc.py:300 contrib/flatpages/models.py:7 msgid "URL" @@ -647,7 +647,7 @@ msgstr "" #: contrib/admin/templates/admin_doc/index.html:4 #: contrib/admin/templates/admin_doc/model_index.html:5 msgid "Change password" -msgstr " " +msgstr "Αλλαγή κωδικού" #: contrib/admin/templates/admin/object_history.html:5 #: contrib/admin/templates/admin/500.html:4 @@ -675,7 +675,7 @@ msgstr "" #: contrib/admin/templates/admin/object_history.html:19 msgid "User" -msgstr "" +msgstr "Χρήστης" #: contrib/admin/templates/admin/object_history.html:20 msgid "Action" @@ -693,7 +693,7 @@ msgstr "" #: contrib/admin/templates/admin/base_site.html:4 msgid "Django site admin" -msgstr " Django" +msgstr "Διαχειριστής ιστοσελίδας Django" #: contrib/admin/templates/admin/base_site.html:7 msgid "Django administration" @@ -750,7 +750,7 @@ msgstr "" #: contrib/admin/templates/admin/index.html:53 msgid "My Actions" -msgstr " " +msgstr "Οι πράξεις μου" #: contrib/admin/templates/admin/index.html:57 msgid "None available" @@ -767,7 +767,7 @@ msgstr "" #: contrib/admin/templates/admin/base.html:23 msgid "Welcome," -msgstr "," +msgstr "Καλωσήρθατε," #: contrib/admin/templates/admin/delete_confirmation.html:9 #: contrib/admin/templates/admin/submit_line.html:3 @@ -791,7 +791,7 @@ msgstr "" #: contrib/admin/templates/admin/delete_confirmation.html:26 msgid "Yes, I'm sure" -msgstr ", " +msgstr "Ναι, είμαι σίγουρος" #: contrib/admin/templates/admin/filter.html:2 #, python-format @@ -834,7 +834,7 @@ msgstr "" #: contrib/admin/templates/admin/submit_line.html:7 msgid "Save" -msgstr "" +msgstr "Αποθήκευση" #: contrib/admin/templates/registration/password_change_done.html:4 #: contrib/admin/templates/registration/password_change_form.html:4 @@ -850,7 +850,7 @@ msgstr "" #: contrib/admin/templates/registration/password_change_done.html:12 msgid "Your password was changed." -msgstr " ." +msgstr "Ο κωδίκός σας άλλαξε." #: contrib/admin/templates/registration/password_reset_form.html:4 #: contrib/admin/templates/registration/password_reset_form.html:6 @@ -876,7 +876,7 @@ 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" @@ -901,11 +901,11 @@ msgstr "" #: contrib/admin/templates/registration/password_change_form.html:17 msgid "Old password:" -msgstr " :" +msgstr "Παλιός κωδικός:" #: contrib/admin/templates/registration/password_change_form.html:19 msgid "New password:" -msgstr " :" +msgstr "Νέος κωδικός:" #: contrib/admin/templates/registration/password_change_form.html:21 msgid "Confirm password:" @@ -1173,12 +1173,12 @@ msgstr "" #: contrib/auth/models.py:70 #, fuzzy msgid "user" -msgstr "" +msgstr "Χρήστης" #: contrib/auth/models.py:71 #, fuzzy msgid "users" -msgstr "" +msgstr "Χρήστης" #: contrib/auth/models.py:76 msgid "Personal info" @@ -1199,15 +1199,15 @@ msgstr "" #: contrib/auth/models.py:219 #, fuzzy msgid "message" -msgstr " " +msgstr "αλλάξτε το μήνυμα" #: contrib/auth/forms.py:30 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" -" cookies. " -"cookies " +"Ο φυλλομετρητής σας δεν φαίνεται να έχει ενεργοποιημένα τα cookies. Τα " +"cookies απαιτούνται για να συνδεθείτε" #: contrib/contenttypes/models.py:25 msgid "python model class name" @@ -1348,7 +1348,7 @@ msgstr "" #: utils/dates.py:19 #, fuzzy msgid "jan" -msgstr "" +msgstr "και" #: utils/dates.py:19 msgid "feb" @@ -1677,7 +1677,7 @@ msgstr "" #: core/validators.py:206 core/validators.py:208 #, python-format msgid "The URL %s is a broken link." -msgstr " (URL) %s ." +msgstr "Η διεύθυνση (URL) %s είναι χαλασμένη σύνδεση." #: core/validators.py:214 msgid "Enter a valid U.S. state abbreviation." @@ -1701,7 +1701,7 @@ msgstr "" #: core/validators.py:264 core/validators.py:275 msgid "Please enter both fields or leave them both empty." -msgstr " ." +msgstr "Παρακαλώ συμπληρώστε και τα δύο πεδία ή αφήστε τα και τα δύο άδεια." #: core/validators.py:282 #, python-format @@ -1724,7 +1724,7 @@ msgstr "" #: core/validators.py:347 msgid "Please enter a valid decimal number." -msgstr " ." +msgstr "Παρακαλώ είσάγετε έναν έγκυρο δεκαδίκο αριθμό." #: core/validators.py:349 #, python-format @@ -1745,7 +1745,7 @@ msgstr[1] "" #: core/validators.py:362 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." -msgstr " %s bytes ." +msgstr "Σιγουρευτείτε ότι το αρχείου που ανεβάζετε είναι %s bytes τουλάχιστον." #: core/validators.py:363 #, python-format @@ -1754,11 +1754,11 @@ msgstr "" #: core/validators.py:376 msgid "The format for this field is wrong." -msgstr " " +msgstr "Η διάταξη αυτού του πεδίου έιναι λάθος" #: core/validators.py:391 msgid "This field is invalid." -msgstr " " +msgstr "Αυτό το πεδίο είναι άκυρο" #: core/validators.py:426 #, python-format @@ -1836,16 +1836,16 @@ msgstr "" #: db/models/fields/__init__.py:369 #, fuzzy msgid "This value must be either True or False." -msgstr "Boolean ( )" +msgstr "Boolean (Είτε Αλήθεια ή Ψέμα)" #: db/models/fields/__init__.py:385 #, fuzzy msgid "This field cannot be null." -msgstr " " +msgstr "Αυτό το πεδίο είναι άκυρο" #: db/models/fields/__init__.py:562 msgid "Enter a valid filename." -msgstr " " +msgstr "Εισάγετε ένα έγκυρο όνομα αρχείου" #: db/models/fields/related.py:43 #, python-format @@ -1855,7 +1855,7 @@ msgstr "" #: db/models/fields/related.py:579 #, fuzzy msgid "Separate multiple IDs with commas." -msgstr " Ds " +msgstr "Ξεχωρίστε πολλαπλές ΙDs με κόμματα" #: db/models/fields/related.py:581 msgid "" @@ -1904,10 +1904,10 @@ msgstr "" #: template/defaultfilters.py:379 msgid "yes,no,maybe" -msgstr ",," +msgstr "ναί,όχι,ίσως" #~ msgid "Comment" -#~ msgstr "" +#~ msgstr "Σχόλιο" #~ msgid "Comments" -#~ msgstr "" +#~ msgstr "Σχόλια" diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo new file mode 100644 index 0000000000..463078025c Binary files /dev/null and b/django/conf/locale/es_AR/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.po b/django/conf/locale/es_AR/LC_MESSAGES/django.po new file mode 100644 index 0000000000..8fbe5cb952 --- /dev/null +++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po @@ -0,0 +1,2029 @@ +# Translation of django.po to Argentinean spanish, based on Spanish +# translation work by Ricardo Javier Crdenes Medina. +# This file is distributed under the same license as the PACKAGE package. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER. +# Ramiro MoralesTo install bookmarklets, drag the link to your bookmarks\n" +"toolbar, or right-click the link and add it to your bookmarks. Now you can\n" +"select the bookmarklet from any page in the site. Note that some of these\n" +"bookmarklets require you to be viewing the site from a computer designated\n" +"as \"internal\" (talk to your system administrator if you aren't sure if\n" +"your computer is \"internal\").
\n" +msgstr "" +"\n" +"Para instalar bookmarklets, arrastre el enlace a su barra\n"
+"de favoritos, o pulse con el botn derecho el enlace y adalo a sus "
+"favoritos.\n"
+"Ahora puede sleccionar el bookmarklet desde cualquier pgina en el sitio.\n"
+"Observer que algunos de estos bookmarklets precisan que est viendo\n"
+"el sitio desde un equipo sealado como \"interno\" (hable\n"
+"con su administrador de sistemas si no est seguro de si el suyo lo es)."
+"p>\n"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Documentation for this page"
+msgstr "Documentacin de esta pgina"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:20
+msgid ""
+"Jumps you from any page to the documentation for the view that generates "
+"that page."
+msgstr ""
+"Le lleva desde cualquier pgina a la documentacin de la vista que la genera."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Show object ID"
+msgstr "Mostrar ID de objeto"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:23
+msgid ""
+"Shows the content-type and unique ID for pages that represent a single "
+"object."
+msgstr ""
+"Muestra el tipo de contenido e ID unvoco de las pginas que representan un "
+"nico objeto."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Edit this object (current window)"
+msgstr "Editar este objeto (ventana actual)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:26
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr ""
+"Le lleva a la pgina de administracin de pginas que representan un nico "
+"objeto."
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "Edit this object (new window)"
+msgstr "Editar este objeto (nueva ventana)"
+
+#: contrib/admin/templates/admin_doc/bookmarklets.html:29
+msgid "As above, but opens the admin page in a new window."
+msgstr ""
+"Como antes, pero abre la pgina de administracin en una nueva ventana."
+
+#: utils/translation.py:360
+msgid "DATE_FORMAT"
+msgstr ""
+
+#: utils/translation.py:361
+msgid "DATETIME_FORMAT"
+msgstr ""
+
+#: utils/translation.py:362
+msgid "TIME_FORMAT"
+msgstr ""
+
+#: utils/dates.py:6
+msgid "Monday"
+msgstr "Lunes"
+
+#: utils/dates.py:6
+msgid "Tuesday"
+msgstr "Martes"
+
+#: utils/dates.py:6
+msgid "Wednesday"
+msgstr "Mircoles"
+
+#: utils/dates.py:6
+msgid "Thursday"
+msgstr "Jueves"
+
+#: utils/dates.py:6
+msgid "Friday"
+msgstr "Viernes"
+
+#: utils/dates.py:7
+msgid "Saturday"
+msgstr "Sbado"
+
+#: utils/dates.py:7
+msgid "Sunday"
+msgstr "Domingo"
+
+#: utils/dates.py:14
+msgid "January"
+msgstr "Enero"
+
+#: utils/dates.py:14
+msgid "February"
+msgstr "Febrero"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "March"
+msgstr "Marzo"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "April"
+msgstr "Abril"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "May"
+msgstr "Mayo"
+
+#: utils/dates.py:14 utils/dates.py:27
+msgid "June"
+msgstr "Junio"
+
+#: utils/dates.py:15 utils/dates.py:27
+msgid "July"
+msgstr "Julio"
+
+#: utils/dates.py:15
+msgid "August"
+msgstr "Agosto"
+
+#: utils/dates.py:15
+msgid "September"
+msgstr "Septiembre"
+
+#: utils/dates.py:15
+msgid "October"
+msgstr "Octubre"
+
+#: utils/dates.py:15
+msgid "November"
+msgstr "Noviembre"
+
+#: utils/dates.py:16
+msgid "December"
+msgstr "Diciembre"
+
+#: utils/dates.py:19
+msgid "jan"
+msgstr "ene"
+
+#: utils/dates.py:19
+msgid "feb"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "mar"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "apr"
+msgstr "abr"
+
+#: utils/dates.py:19
+msgid "may"
+msgstr ""
+
+#: utils/dates.py:19
+msgid "jun"
+msgstr ""
+
+#: utils/dates.py:20
+msgid "jul"
+msgstr ""
+
+#: utils/dates.py:20
+msgid "aug"
+msgstr ""
+
+#: utils/dates.py:20
+msgid "sep"
+msgstr ""
+
+#: utils/dates.py:20
+msgid "oct"
+msgstr ""
+
+#: utils/dates.py:20
+msgid "nov"
+msgstr ""
+
+#: utils/dates.py:20
+msgid "dec"
+msgstr "dic"
+
+#: utils/dates.py:27
+msgid "Jan."
+msgstr "Ene."
+
+#: utils/dates.py:27
+msgid "Feb."
+msgstr "Feb."
+
+#: utils/dates.py:28
+msgid "Aug."
+msgstr "Ago."
+
+#: utils/dates.py:28
+msgid "Sept."
+msgstr "Sept."
+
+#: utils/dates.py:28
+msgid "Oct."
+msgstr "Oct."
+
+#: utils/dates.py:28
+msgid "Nov."
+msgstr "Nov."
+
+#: utils/dates.py:28
+msgid "Dec."
+msgstr "Dic."
+
+#: utils/timesince.py:12
+msgid "year"
+msgid_plural "years"
+msgstr[0] "ao"
+msgstr[1] "aos"
+
+#: utils/timesince.py:13
+msgid "month"
+msgid_plural "months"
+msgstr[0] "mes"
+msgstr[1] "meses"
+
+#: utils/timesince.py:14
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] "semmana"
+msgstr[1] "semanas"
+
+#: utils/timesince.py:15
+msgid "day"
+msgid_plural "days"
+msgstr[0] "da"
+msgstr[1] "das"
+
+#: utils/timesince.py:16
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] "hora"
+msgstr[1] "horas"
+
+#: utils/timesince.py:17
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minuto"
+msgstr[1] "minutos"
+
+#: conf/global_settings.py:37
+msgid "Bengali"
+msgstr "Bengal"
+
+#: conf/global_settings.py:38
+msgid "Czech"
+msgstr "Checo"
+
+#: conf/global_settings.py:39
+msgid "Welsh"
+msgstr "Gals"
+
+#: conf/global_settings.py:40
+msgid "Danish"
+msgstr "Dans"
+
+#: conf/global_settings.py:41
+msgid "German"
+msgstr "Alemn"
+
+#: conf/global_settings.py:42
+msgid "Greek"
+msgstr "Griego"
+
+#: conf/global_settings.py:43
+msgid "English"
+msgstr "Ingls"
+
+#: conf/global_settings.py:44
+msgid "Spanish"
+msgstr "Espaol"
+
+#: conf/global_settings.py:45
+msgid "Argentinean Spanish"
+msgstr ""
+
+#: conf/global_settings.py:46
+msgid "French"
+msgstr "Francs"
+
+#: conf/global_settings.py:47
+msgid "Galician"
+msgstr "Gallego"
+
+#: conf/global_settings.py:48
+msgid "Hungarian"
+msgstr ""
+
+#: conf/global_settings.py:49
+msgid "Hebrew"
+msgstr "Hebreo"
+
+#: conf/global_settings.py:50
+msgid "Icelandic"
+msgstr "Islands"
+
+#: conf/global_settings.py:51
+msgid "Italian"
+msgstr "Italiano"
+
+#: conf/global_settings.py:52
+msgid "Japanese"
+msgstr "Japons"
+
+#: conf/global_settings.py:53
+msgid "Dutch"
+msgstr "Holands"
+
+#: conf/global_settings.py:54
+msgid "Norwegian"
+msgstr "Noruego"
+
+#: conf/global_settings.py:55
+msgid "Brazilian"
+msgstr "Brasileo"
+
+#: conf/global_settings.py:56
+msgid "Romanian"
+msgstr "Rumano"
+
+#: conf/global_settings.py:57
+msgid "Russian"
+msgstr "Ruso"
+
+#: conf/global_settings.py:58
+msgid "Slovak"
+msgstr "Eslovaco"
+
+#: conf/global_settings.py:59
+msgid "Slovenian"
+msgstr "Esloveno"
+
+#: conf/global_settings.py:60
+msgid "Serbian"
+msgstr "Serbio"
+
+#: conf/global_settings.py:61
+msgid "Swedish"
+msgstr "Sueco"
+
+#: conf/global_settings.py:62
+msgid "Ukrainian"
+msgstr "Ucraniano"
+
+#: conf/global_settings.py:63
+msgid "Simplified Chinese"
+msgstr "Chino simplificado"
+
+#: conf/global_settings.py:64
+msgid "Traditional Chinese"
+msgstr "Chino tradicional"
+
+#: db/models/manipulators.py:302
+#, python-format
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
+msgstr ""
+"Ya existen %(object)s con este %(type)s para el %(field)s especificado."
+
+#: db/models/fields/__init__.py:40
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "Ya existe %(optname)s con este %(fieldname)s."
+
+#: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265
+#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:553
+#: forms/__init__.py:346
+msgid "This field is required."
+msgstr "Este campo es obligatorio."
+
+#: db/models/fields/__init__.py:337
+msgid "This value must be an integer."
+msgstr "Este valor debe ser un nmero entero."
+
+#: db/models/fields/__init__.py:369
+msgid "This value must be either True or False."
+msgstr "Este valor debe ser True o False."
+
+#: db/models/fields/__init__.py:385
+msgid "This field cannot be null."
+msgstr "Este campo no puede ser nulo."
+
+#: db/models/fields/__init__.py:468 core/validators.py:132
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr "Introduzca una fecha/hora vlida en formato YYYY-MM-DD HH:MM."
+
+#: db/models/fields/__init__.py:562
+msgid "Enter a valid filename."
+msgstr "Introduzca un nombre de achivo vlido"
+
+#: db/models/fields/related.py:43
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Por favor, introduzca un %s vlido."
+
+#: db/models/fields/related.py:579
+msgid "Separate multiple IDs with commas."
+msgstr " Separe mltiples IDs con comas."
+
+#: db/models/fields/related.py:581
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Pulse \"Control\", o \"Command\" en un Mac, para seleccionar ms de uno."
+
+#: db/models/fields/related.py:625
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgstr[0] ""
+"Por favor, introduzca IDs de %(self)s vlidos. El valor %(value)r no es "
+"vlido."
+msgstr[1] ""
+"Por favor, introduzca IDs de %(self)s vlidos. Los valores %(value)r no son "
+"vlidos."
+
+#: forms/__init__.py:380
+#, python-format
+msgid "Ensure your text is less than %s character."
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Asegrese de que su texto tiene menos de %s carcter."
+msgstr[1] "Asegrese de que su texto tiene menos de %s caracteres."
+
+#: forms/__init__.py:385
+msgid "Line breaks are not allowed here."
+msgstr "No se permiten saltos de lnea."
+
+#: forms/__init__.py:480 forms/__init__.py:551 forms/__init__.py:589
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Seleccione una opcin vlida; '%(data)s' no est en %(choices)s."
+
+#: forms/__init__.py:645
+msgid "The submitted file is empty."
+msgstr "El archivo enviado est vaco."
+
+#: forms/__init__.py:699
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Introduzca un nmero entero entre -32,768 y 32,767."
+
+#: forms/__init__.py:708
+msgid "Enter a positive number."
+msgstr "Introduzca un nmero positivo."
+
+#: forms/__init__.py:717
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Introduzca un nmero entero entre 0 y 32,767."
+
+#: core/validators.py:60
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Este valor debe contener slo letras, nmeros y guiones bajos."
+
+#: core/validators.py:64
+msgid ""
+"This value must contain only letters, numbers, underscores, dashes or "
+"slashes."
+msgstr ""
+"Este valor debe contener slo letras, nmeros, guiones bajos, barras (/) o "
+"slashes."
+
+#: core/validators.py:72
+msgid "Uppercase letters are not allowed here."
+msgstr "No se admiten letras maysculas."
+
+#: core/validators.py:76
+msgid "Lowercase letters are not allowed here."
+msgstr "No se admiten letras minsculas."
+
+#: core/validators.py:83
+msgid "Enter only digits separated by commas."
+msgstr "Introduzca slo dgitos separados por comas."
+
+#: core/validators.py:95
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "Introduzca direcciones de correo vlidas separadas por comas."
+
+#: core/validators.py:99
+msgid "Please enter a valid IP address."
+msgstr "Por favor introduzca una direccin IP vlida."
+
+#: core/validators.py:103
+msgid "Empty values are not allowed here."
+msgstr "No se admiten valores vacos."
+
+#: core/validators.py:107
+msgid "Non-numeric characters aren't allowed here."
+msgstr "No se admiten caracteres no numricos."
+
+#: core/validators.py:111
+msgid "This value can't be comprised solely of digits."
+msgstr "Este valor no puede estar formado slo por dgitos."
+
+#: core/validators.py:116
+msgid "Enter a whole number."
+msgstr "Introduzca un nmero entero."
+
+#: core/validators.py:120
+msgid "Only alphabetical characters are allowed here."
+msgstr "Slo se admiten caracteres alfabticos."
+
+#: core/validators.py:124
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Introduzca una fecha vlida en formato AAAA-MM-DD."
+
+#: core/validators.py:128
+msgid "Enter a valid time in HH:MM format."
+msgstr "Introduzca una hora vlida en formato HH:MM."
+
+#: core/validators.py:136
+msgid "Enter a valid e-mail address."
+msgstr "Introduzca una direccin de correo electrnico vlida"
+
+#: core/validators.py:148
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Enve una imagen vlida. El archivo que ha enviado no era una imagen o se "
+"trataba de una imagen corrupta."
+
+#: core/validators.py:155
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr "La URL %s no apunta a una imagen vlida."
+
+#: core/validators.py:159
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr ""
+"Los nmeros de telfono deben guardar el formato XXX-XXX-XXXX format. \"%s\" "
+"no es vlido."
+
+#: core/validators.py:167
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr "La URL %s no apunta a un vdeo QuickTime vlido."
+
+#: core/validators.py:171
+msgid "A valid URL is required."
+msgstr "Se precisa una URL vlida."
+
+#: core/validators.py:185
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+"Se precisa HTML vlido. Los errores especficos son:\n"
+"%s"
+
+#: core/validators.py:192
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr "XML mal formado: %s"
+
+#: core/validators.py:202
+#, python-format
+msgid "Invalid URL: %s"
+msgstr "URL no vlida: %s"
+
+#: core/validators.py:206 core/validators.py:208
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "La URL %s es un enlace roto."
+
+#: core/validators.py:214
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "Introduzca una abreviatura vlida de estado de los EEUU."
+
+#: core/validators.py:229
+#, 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] "Vigila tu boca! Aqu no admitimos la palabra %s."
+msgstr[1] "Vigila tu boca! Aqu no admitimos las palabras %s."
+
+#: core/validators.py:236
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr "Este campo debe concordar con el campo '%s'."
+
+#: core/validators.py:255
+msgid "Please enter something for at least one field."
+msgstr "Por favor, introduzca algo en al menos un campo."
+
+#: core/validators.py:264 core/validators.py:275
+msgid "Please enter both fields or leave them both empty."
+msgstr "Por favor, rellene ambos campos o deje ambos vacos."
+
+#: core/validators.py:282
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr "Se debe proporcionar este campo si %(field)s es %(value)s"
+
+#: core/validators.py:294
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr "Se debe proporcionar este campo si %(field)s no es %(value)s"
+
+#: core/validators.py:313
+msgid "Duplicate values are not allowed."
+msgstr "No se admiten valores duplicados."
+
+#: core/validators.py:336
+#, python-format
+msgid "This value must be a power of %s."
+msgstr "Este valor debe ser una potencia de %s."
+
+#: core/validators.py:347
+msgid "Please enter a valid decimal number."
+msgstr "Por favor, introduzca un nmero decimal vlido."
+
+#: core/validators.py:349
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural ""
+"Please enter a valid decimal number with at most %s total digits."
+msgstr[0] ""
+"Por favor, introduzca un nmero decimal vlido con con un mximo de %s "
+"dgito en total."
+msgstr[1] ""
+"Por favor, introduzca un nmero decimal vlido con un maximo de %s dgitos "
+"en total."
+
+#: core/validators.py:352
+#, 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] ""
+"Por favor, introduzca un nmero decimal vlido con un mximo de %s "
+"posicin decimal."
+msgstr[1] ""
+"Por favor, introduzca un nmero decimal vlido con un mximo de %s "
+"posiciones decimales."
+
+#: core/validators.py:362
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr "Asegrese de que el archivo que enva tiene al menos %s bytes."
+
+#: core/validators.py:363
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr "Asegrese de que el archivo que enva tiene como mximo %s bytes."
+
+#: core/validators.py:376
+msgid "The format for this field is wrong."
+msgstr "El formato de este campo es incorrecto."
+
+#: core/validators.py:391
+msgid "This field is invalid."
+msgstr "Este campo no es vlido."
+
+#: core/validators.py:426
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "No pude obtener nada de %s."
+
+#: core/validators.py:429
+#, python-format
+msgid ""
+"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr ""
+"La URL %(url)s devolvi la cabecera Content-Type '%(contenttype)s', que no "
+"es vlida."
+
+#: core/validators.py:462
+#, python-format
+msgid ""
+"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
+"\"%(start)s\".)"
+msgstr ""
+"Por favor, cierre la etiqueta %(tag)s de la lnea %(line)s. (La lnea "
+"empieza por \"%(start)s\".)"
+
+#: core/validators.py:466
+#, python-format
+msgid ""
+"Some text starting on line %(line)s is not allowed in that context. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"Parte del texto que comienza en la lnea %(line)s no est permitido en ese "
+"contexto. (La lnea empieza por \"%(start)s\".)"
+
+#: core/validators.py:471
+#, python-format
+msgid ""
+"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"El \"%(attr)s\" de la lnea %(line)s no es un atributo vlido. (La lnea "
+"empieza por \"%(start)s\".)"
+
+#: core/validators.py:476
+#, python-format
+msgid ""
+"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
+"(start)s\".)"
+msgstr ""
+"La \"<%(tag)s>\" de la lnea %(line)s no es una etiqueta vlida. (La lnea "
+"empieza por \"%(start)s\".)"
+
+#: core/validators.py:480
+#, python-format
+msgid ""
+"A tag on line %(line)s is missing one or more required attributes. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"A una etiqueta de la lnea %(line)s le faltan uno o ms atributos "
+"requeridos. (La lnea empieza por \"%(start)s\".)"
+
+#: core/validators.py:485
+#, python-format
+msgid ""
+"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
+"starts with \"%(start)s\".)"
+msgstr ""
+"El atributo \"%(attr)s\" de la lnea %(line)s tiene un valor que no es "
+"vlido. (La lnea empieza por \"%(start)s\".)"
+
+#: template/defaultfilters.py:379
+msgid "yes,no,maybe"
+msgstr "si,no,tal vez"
+
+#~ msgid "Comment"
+#~ msgstr "Comentario"
+
+#~ msgid "Comments"
+#~ msgstr "Comentarios"
+
+#~ msgid "String (up to 50)"
+#~ msgstr "Cadena (mximo 50)"
+
+#~ msgid "label"
+#~ msgstr "etiqueta"
+
+#~ msgid "package"
+#~ msgstr "paquete"
+
+#~ msgid "packages"
+#~ msgstr "paquetes"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter a valid decimal number with a whole part of at most %s digit."
+#~ msgid_plural ""
+#~ "Please enter a valid decimal number with a whole part of at most %s "
+#~ "digits."
+#~ msgstr[0] ""
+#~ "Por favor, introduzca un nmero decimal vlido con a lo ms %s dgito en "
+#~ "total."
+#~ msgstr[1] ""
+#~ "Por favor, introduzca un nmero decimal vlido con a lo ms %s dgitos en "
+#~ "total."
diff --git a/django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo b/django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo
new file mode 100644
index 0000000000..e48292825b
Binary files /dev/null and b/django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po b/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po
new file mode 100644
index 0000000000..e9578701d5
--- /dev/null
+++ b/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po
@@ -0,0 +1,110 @@
+# Argentinean spanish translation for the django-admin JS files, based on
+# Spanish translation work by Jorge Gajon.
+# Copyright (C)
+# This file is distributed under the same license as the PACKAGE package.
+# Ramiro Morales By %s:
\n"
"\n"
msgstr ""
+"
Da %s:
\n"
+"\n"
#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88
#: contrib/admin/filterspecs.py:143
msgid "All"
-msgstr ""
+msgstr "Tutti"
#: contrib/admin/filterspecs.py:109
msgid "Any date"
-msgstr ""
+msgstr "Qualsiasi data"
#: contrib/admin/filterspecs.py:110
-#, fuzzy
msgid "Today"
-msgstr "Luned"
+msgstr "Oggi"
#: contrib/admin/filterspecs.py:113
msgid "Past 7 days"
-msgstr ""
+msgstr "Ultimi 7 giorni"
#: contrib/admin/filterspecs.py:115
msgid "This month"
-msgstr ""
+msgstr "Questo mese"
#: contrib/admin/filterspecs.py:117
msgid "This year"
-msgstr ""
+msgstr "Quest'anno"
#: contrib/admin/filterspecs.py:143
msgid "Yes"
-msgstr ""
+msgstr "Sì"
#: contrib/admin/filterspecs.py:143
-#, fuzzy
msgid "No"
-msgstr "Nov."
+msgstr "No"
#: contrib/admin/filterspecs.py:150
msgid "Unknown"
-msgstr ""
+msgstr "Sconosciuto"
#: contrib/admin/models.py:16
msgid "action time"
@@ -394,7 +404,7 @@ msgstr "data azione"
#: contrib/admin/models.py:19
msgid "object id"
-msgstr "id dell'oggetto"
+msgstr "ID dell'oggetto"
#: contrib/admin/models.py:20
msgid "object repr"
@@ -406,7 +416,7 @@ msgstr "flag azione"
#: contrib/admin/models.py:22
msgid "change message"
-msgstr "messaggio"
+msgstr "modifica messaggio"
#: contrib/admin/models.py:25
msgid "log entry"
@@ -418,7 +428,7 @@ msgstr "voci di log"
#: contrib/admin/templatetags/admin_list.py:228
msgid "All dates"
-msgstr ""
+msgstr "Tutte le date"
#: contrib/admin/views/decorators.py:9 contrib/auth/forms.py:36
#: contrib/auth/forms.py:41
@@ -426,6 +436,7 @@ msgid ""
"Please enter a correct username and password. Note that both fields are case-"
"sensitive."
msgstr ""
+"Inserire nome utente e password corretti. Entrambi i campi sono case sensitive."
#: contrib/admin/views/decorators.py:23
#: contrib/admin/templates/admin/login.html:25
@@ -437,183 +448,184 @@ msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
msgstr ""
+"La sessione è scaduta, si prega di accedere nuovamente. I dati sono stati salvati."
#: contrib/admin/views/decorators.py:68
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
msgstr ""
+"Il browser non è configurato per accettare cookie. Abilitarli, ricaricare la pagina e provare di nuovo."
#: contrib/admin/views/decorators.py:82
msgid "Usernames cannot contain the '@' character."
-msgstr ""
+msgstr "Il nome utente non può contenere il carattere '@'."
#: contrib/admin/views/decorators.py:84
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
+msgstr "Il nome utente non è l'indirizzo e-mail. Provare con '%s'."
#: contrib/admin/views/main.py:226
-#, fuzzy
msgid "Site administration"
-msgstr "Amministrazione Django"
+msgstr "Amministrazione sito"
-#: contrib/admin/views/main.py:260
+#: contrib/admin/views/main.py:410
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr ""
+msgstr "L'oggetto %(name)s di tipo \"%(obj)s\" è stato aggiunto."
#: contrib/admin/views/main.py:264 contrib/admin/views/main.py:348
msgid "You may edit it again below."
-msgstr ""
+msgstr "Puoi modificarlo nuovamente qui sotto."
#: contrib/admin/views/main.py:272 contrib/admin/views/main.py:357
#, python-format
msgid "You may add another %s below."
-msgstr ""
+msgstr "Puoi aggiungere un altro %s qui sotto."
#: contrib/admin/views/main.py:290
-#, fuzzy, python-format
+#, python-format
msgid "Add %s"
-msgstr "Aggiungi"
+msgstr "Aggiungi %s"
#: contrib/admin/views/main.py:336
#, python-format
msgid "Added %s."
-msgstr ""
+msgstr "Aggiunto %s"
#: contrib/admin/views/main.py:336 contrib/admin/views/main.py:338
#: contrib/admin/views/main.py:340
msgid "and"
-msgstr ""
+msgstr "e"
#: contrib/admin/views/main.py:338
-#, fuzzy, python-format
+#, python-format
msgid "Changed %s."
-msgstr "Cambia"
+msgstr "Modificato %s."
#: contrib/admin/views/main.py:340
#, python-format
msgid "Deleted %s."
-msgstr ""
+msgstr "Rimosso %s"
#: contrib/admin/views/main.py:343
msgid "No fields changed."
-msgstr ""
+msgstr "Nessun campo modificato."
#: contrib/admin/views/main.py:346
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr ""
+msgstr "L'oggetto %(name)s di tipo \"%(obj)s\" è stato modificato."
#: contrib/admin/views/main.py:354
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
+"L'oggetto %(name)s di tipo \"%(obj)s\" è stato aggiunto. Puoi modificarlo nuovamente qui sotto."
#: contrib/admin/views/main.py:392
-#, fuzzy, python-format
+#, python-format
msgid "Change %s"
-msgstr "Cambia"
+msgstr "Modifica %s"
#: contrib/admin/views/main.py:470
#, python-format
msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr ""
+msgstr "Uno o più %(fieldname)s in %(name)s: %(obj)s"
#: contrib/admin/views/main.py:475
#, python-format
msgid "One or more %(fieldname)s in %(name)s:"
-msgstr ""
+msgstr "Uno o più %(fieldname)s in %(name)s:"
#: contrib/admin/views/main.py:508
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr ""
+msgstr "L'oggetto %(name)s di tipo \"%(obj)s\" è stato rimosso."
#: contrib/admin/views/main.py:511
msgid "Are you sure?"
-msgstr ""
+msgstr "Sei sicuro?"
#: contrib/admin/views/main.py:533
-#, fuzzy, python-format
+#, python-format
msgid "Change history: %s"
-msgstr "Cambia la password"
+msgstr "Storia delle modifiche: %s"
#: contrib/admin/views/main.py:565
#, python-format
msgid "Select %s"
-msgstr ""
+msgstr "Selezionare %s"
#: contrib/admin/views/main.py:565
-#, fuzzy, python-format
+#, python-format
msgid "Select %s to change"
-msgstr "Clicca per cambiare"
+msgstr "Selezionare %s per modificare"
#: contrib/admin/views/doc.py:277 contrib/admin/views/doc.py:286
#: contrib/admin/views/doc.py:288 contrib/admin/views/doc.py:294
#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:297
msgid "Integer"
-msgstr ""
+msgstr "Intero"
#: contrib/admin/views/doc.py:278
msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Booleano (True o False)"
#: contrib/admin/views/doc.py:279 contrib/admin/views/doc.py:296
#, python-format
msgid "String (up to %(maxlength)s)"
-msgstr ""
+msgstr "Stringa (massimo %(maxlength)s caratteri)"
#: contrib/admin/views/doc.py:280
msgid "Comma-separated integers"
-msgstr ""
+msgstr "Interi separati da virgola"
#: contrib/admin/views/doc.py:281
-#, fuzzy
msgid "Date (without time)"
-msgstr "data azione"
+msgstr "Data (senza orario)"
#: contrib/admin/views/doc.py:282
-#, fuzzy
msgid "Date (with time)"
-msgstr "Data/ora"
+msgstr "Data (con orario)"
#: contrib/admin/views/doc.py:283
-#, fuzzy
msgid "E-mail address"
-msgstr "Indirizzo e-mail:"
+msgstr "Indirizzo e-mail"
#: contrib/admin/views/doc.py:284 contrib/admin/views/doc.py:287
msgid "File path"
-msgstr ""
+msgstr "Percorso di file"
#: contrib/admin/views/doc.py:285
-#, fuzzy
msgid "Decimal number"
-msgstr "Dicembre"
+msgstr "Numero decimale"
#: contrib/admin/views/doc.py:291
msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Booleano (True, False o None)"
#: contrib/admin/views/doc.py:292
msgid "Relation to parent model"
-msgstr ""
+msgstr "Relazione a modello padre"
#: contrib/admin/views/doc.py:293
-#, fuzzy
msgid "Phone number"
-msgstr "Inserire un numero."
+msgstr "Numero di telefono"
+
+#: contrib/admin/views/doc.py:263
+msgid "String (up to 50)"
+msgstr "Stringa (massimo 50 caratteri)"
#: contrib/admin/views/doc.py:298
msgid "Text"
-msgstr ""
+msgstr "Testo"
#: contrib/admin/views/doc.py:299
msgid "Time"
-msgstr ""
+msgstr "Ora"
#: contrib/admin/views/doc.py:300 contrib/flatpages/models.py:7
msgid "URL"
@@ -621,11 +633,11 @@ msgstr "URL"
#: contrib/admin/views/doc.py:301
msgid "U.S. state (two uppercase letters)"
-msgstr ""
+msgstr "Stato americano (due lettere maiuscole)"
#: contrib/admin/views/doc.py:302
msgid "XML text"
-msgstr ""
+msgstr "Testo XML"
#: contrib/admin/templates/admin/object_history.html:3
#: contrib/admin/templates/admin/change_list.html:5
@@ -636,7 +648,7 @@ msgstr ""
#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
-msgstr ""
+msgstr "Documentazione"
#: contrib/admin/templates/admin/object_history.html:3
#: contrib/admin/templates/admin/change_list.html:5
@@ -656,7 +668,7 @@ msgstr ""
#: contrib/admin/templates/admin_doc/index.html:4
#: contrib/admin/templates/admin_doc/model_index.html:5
msgid "Change password"
-msgstr "Cambia la password"
+msgstr "Modifica la password"
#: contrib/admin/templates/admin/object_history.html:5
#: contrib/admin/templates/admin/500.html:4
@@ -692,14 +704,14 @@ msgstr "Azione"
#: contrib/admin/templates/admin/object_history.html:26
msgid "DATE_WITH_TIME_FULL"
-msgstr "Data/ora"
+msgstr "j F Y, H:i"
#: contrib/admin/templates/admin/object_history.html:36
msgid ""
"This object doesn't have a change history. It probably wasn't added via this "
"admin site."
msgstr ""
-"Questo oggetto non ha cambiamenti storicizzati. Probabilmente non stato "
+"Questo oggetto non ha cambiamenti storicizzati. Probabilmente non è stato "
"creato con questo sito di amministrazione."
#: contrib/admin/templates/admin/base_site.html:4
@@ -711,9 +723,8 @@ msgid "Django administration"
msgstr "Amministrazione Django"
#: contrib/admin/templates/admin/500.html:4
-#, fuzzy
msgid "Server error"
-msgstr "Errore del server (500)"
+msgstr "Errore del server"
#: contrib/admin/templates/admin/500.html:6
msgid "Server error (500)"
@@ -728,8 +739,8 @@ 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."
+"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
@@ -743,7 +754,7 @@ msgstr "Spiacente, ma la pagina richiesta non esiste."
#: contrib/admin/templates/admin/index.html:17
#, python-format
msgid "Models available in the %(name)s application."
-msgstr ""
+msgstr "Modelli disponibili nell'applicazione %(name)s."
#: contrib/admin/templates/admin/index.html:28
#: contrib/admin/templates/admin/change_form.html:15
@@ -752,7 +763,7 @@ msgstr "Aggiungi"
#: contrib/admin/templates/admin/index.html:34
msgid "Change"
-msgstr "Cambia"
+msgstr "Modifica"
#: contrib/admin/templates/admin/index.html:44
msgid "You don't have permission to edit anything."
@@ -771,9 +782,9 @@ msgid "None available"
msgstr "Nessuna disponibile"
#: contrib/admin/templates/admin/change_list.html:11
-#, fuzzy, python-format
+#, python-format
msgid "Add %(name)s"
-msgstr "Aggiungi"
+msgstr "Aggiungi %(name)s"
#: contrib/admin/templates/admin/login.html:22
msgid "Have you forgotten your password?"
@@ -786,10 +797,10 @@ msgstr "Benvenuto,"
#: contrib/admin/templates/admin/delete_confirmation.html:9
#: contrib/admin/templates/admin/submit_line.html:3
msgid "Delete"
-msgstr ""
+msgstr "Elimina"
#: contrib/admin/templates/admin/delete_confirmation.html:14
-#, fuzzy, python-format
+#, 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 "
@@ -810,67 +821,66 @@ msgstr ""
#: contrib/admin/templates/admin/delete_confirmation.html:26
msgid "Yes, I'm sure"
-msgstr "S, sono sicuro"
+msgstr "Sì, sono sicuro"
#: contrib/admin/templates/admin/filter.html:2
#, python-format
msgid " By %(title)s "
-msgstr ""
+msgstr " Per %(title)s "
#: contrib/admin/templates/admin/search_form.html:8
msgid "Go"
-msgstr ""
+msgstr "Vai"
#: contrib/admin/templates/admin/change_form.html:21
msgid "View on site"
-msgstr ""
+msgstr "Vedi sul sito"
#: contrib/admin/templates/admin/change_form.html:30
msgid "Please correct the error below."
msgid_plural "Please correct the errors below."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Correggere l'errore qui sotto."
+msgstr[1] "Correggere gli errori qui sotto."
#: contrib/admin/templates/admin/change_form.html:48
msgid "Ordering"
-msgstr ""
+msgstr "Ordinamento"
#: contrib/admin/templates/admin/change_form.html:51
msgid "Order:"
-msgstr ""
+msgstr "Ordinamento:"
#: contrib/admin/templates/admin/submit_line.html:4
msgid "Save as new"
-msgstr ""
+msgstr "Salva come nuovo"
#: contrib/admin/templates/admin/submit_line.html:5
msgid "Save and add another"
-msgstr ""
+msgstr "Salva e crea nuovo"
#: contrib/admin/templates/admin/submit_line.html:6
msgid "Save and continue editing"
-msgstr ""
+msgstr "Salva e continua"
#: contrib/admin/templates/admin/submit_line.html:7
-#, fuzzy
msgid "Save"
-msgstr "attivo"
+msgstr "Salva"
#: contrib/admin/templates/registration/password_change_done.html:4
#: contrib/admin/templates/registration/password_change_form.html:4
#: contrib/admin/templates/registration/password_change_form.html:6
#: contrib/admin/templates/registration/password_change_form.html:10
msgid "Password change"
-msgstr "Cambia la password"
+msgstr "Modifica la password"
#: contrib/admin/templates/registration/password_change_done.html:6
#: contrib/admin/templates/registration/password_change_done.html:10
msgid "Password change successful"
-msgstr "La password stata cambiata con successo"
+msgstr "La password è stata cambiata"
#: contrib/admin/templates/registration/password_change_done.html:12
msgid "Your password was changed."
-msgstr "La tua password stata cambiata."
+msgstr "La tua password è stata modificata."
#: contrib/admin/templates/registration/password_reset_form.html:4
#: contrib/admin/templates/registration/password_reset_form.html:6
@@ -885,7 +895,7 @@ msgid ""
"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."
+"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:"
@@ -906,7 +916,7 @@ 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"
+msgstr "Password resettata"
#: contrib/admin/templates/registration/password_reset_done.html:12
msgid ""
@@ -938,12 +948,11 @@ msgstr "Conferma password:"
#: contrib/admin/templates/registration/password_change_form.html:23
msgid "Change my password"
-msgstr "Cambia la mia password"
+msgstr "Modifica la mia password"
#: contrib/admin/templates/registration/password_reset_email.html:2
msgid "You're receiving this e-mail because you requested a password reset"
-msgstr ""
-"Hai ricevuto questa e-mail perch hai richesto di resettare la password"
+msgstr "Hai ricevuto questa e-mail perché hai chiesto di resettare la password"
#: contrib/admin/templates/registration/password_reset_email.html:3
#, python-format
@@ -953,11 +962,11 @@ msgstr "per il tuo account utente su %(site_name)s"
#: contrib/admin/templates/registration/password_reset_email.html:5
#, python-format
msgid "Your new password is: %(new_password)s"
-msgstr "La tua nuova password : %(new_password)s"
+msgstr "La tua nuova password è: %(new_password)s"
#: contrib/admin/templates/registration/password_reset_email.html:7
msgid "Feel free to change this password by going to this page:"
-msgstr "Puoi cambiare la tua password su questa pagina:"
+msgstr "Puoi modificare la tua password su questa pagina:"
#: contrib/admin/templates/registration/password_reset_email.html:11
msgid "Your username, in case you've forgotten:"
@@ -974,11 +983,11 @@ msgstr "Il team di %(site_name)s"
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
-msgstr ""
+msgstr "Bookmarklet"
#: contrib/admin/templates/admin_doc/bookmarklets.html:5
msgid "Documentation bookmarklets"
-msgstr ""
+msgstr "Bookmarklet alla documentazione"
#: contrib/admin/templates/admin_doc/bookmarklets.html:9
msgid ""
@@ -990,60 +999,67 @@ msgid ""
"as \"internal\" (talk to your system administrator if you aren't sure if\n"
"your computer is \"internal\").
Per installare i bookmarklet, trascinare il link nella barra \n" +"dei bookmark, o cliccare il link con il tasto destro e selezionare aggiungi ai \n" +"bookmark. È possibile selezionare il bookmarklet da qualsiasi pagina del sito. \n" +"Alcuni di questi bookmarklet richiedono l'utilizzo di un computer \"interno\" \n" +"(chiedi al tuo amministratore di sistema se non sei sicuro che il tuo computer \n" +"sia \"interno\").
\n" #: contrib/admin/templates/admin_doc/bookmarklets.html:19 msgid "Documentation for this page" -msgstr "" +msgstr "Documentazione per questa pagina" #: contrib/admin/templates/admin_doc/bookmarklets.html:20 msgid "" "Jumps you from any page to the documentation for the view that generates " "that page." msgstr "" +"Ti porta da qualsiasi pagina alla documentazione della view che genera quella pagina." #: contrib/admin/templates/admin_doc/bookmarklets.html:22 -#, fuzzy msgid "Show object ID" -msgstr "id dell'oggetto" +msgstr "Mostra l'ID dell'oggetto" #: contrib/admin/templates/admin_doc/bookmarklets.html:23 msgid "" "Shows the content-type and unique ID for pages that represent a single " "object." msgstr "" +"Mostra il tipo di contenuto e l'ID univoco per pagine che rappresentano un singolo oggetto." #: contrib/admin/templates/admin_doc/bookmarklets.html:25 msgid "Edit this object (current window)" -msgstr "" +msgstr "Modifica quest'oggetto (nella finestra corrente)" #: contrib/admin/templates/admin_doc/bookmarklets.html:26 msgid "Jumps to the admin page for pages that represent a single object." -msgstr "" +msgstr "Ti porta alla pagina amministrativa per pagine che rappresentano un oggetto singolo." #: contrib/admin/templates/admin_doc/bookmarklets.html:28 msgid "Edit this object (new window)" -msgstr "" +msgstr "Modifica quest'oggetto (in una nuova finestra)" #: contrib/admin/templates/admin_doc/bookmarklets.html:29 msgid "As above, but opens the admin page in a new window." -msgstr "" +msgstr "Come sopra, ma apre la pagina di amministrazione in una nuova finestra." #: contrib/admin/templates/widget/date_time.html:3 msgid "Date:" -msgstr "" +msgstr "Data:" #: contrib/admin/templates/widget/date_time.html:4 msgid "Time:" -msgstr "" +msgstr "Ora:" #: contrib/admin/templates/widget/file.html:2 msgid "Currently:" -msgstr "" +msgstr "Attualmente:" #: contrib/admin/templates/widget/file.html:3 -#, fuzzy msgid "Change:" -msgstr "Cambia" +msgstr "Modifica:" #: contrib/redirects/models.py:7 msgid "redirect from" @@ -1054,8 +1070,7 @@ msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -"Un percorso assoluto, senza nome a dominio. Esempio: '/events/search/'.Un " -"percorso assoluto, senza nome a dominio. Esempio: '/events/search/'." +"Un percorso assoluto, senza nome a dominio. Esempio: '/events/search/'." #: contrib/redirects/models.py:9 msgid "redirect to" @@ -1066,7 +1081,7 @@ 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://'." +"Un percorso assoluto (come sopra) o un URL completo iniziante con 'http://'." #: contrib/redirects/models.py:12 msgid "redirect" @@ -1099,13 +1114,12 @@ msgid "template name" msgstr "nome modello" #: contrib/flatpages/models.py:13 -#, fuzzy msgid "" "Example: 'flatpages/contact_page'. If this isn't provided, the system will " "use 'flatpages/default'." msgstr "" -"Esempio: 'flatfiles/contact_page'. Se non specificato, il sistema user " -"'flatfiles/default'." +"Esempio: 'flatpages/contact_page'. Se non specificato, il sistema userà " +"'flatpages/default'." #: contrib/flatpages/models.py:14 msgid "registration required" @@ -1132,24 +1146,20 @@ msgid "codename" msgstr "nome in codice" #: contrib/auth/models.py:17 -#, fuzzy msgid "permission" -msgstr "Permesso" +msgstr "permesso" #: contrib/auth/models.py:18 contrib/auth/models.py:27 -#, fuzzy msgid "permissions" -msgstr "Permessi" +msgstr "permessi" #: contrib/auth/models.py:29 -#, fuzzy msgid "group" -msgstr "Gruppo" +msgstr "gruppo" #: contrib/auth/models.py:30 contrib/auth/models.py:65 -#, fuzzy msgid "groups" -msgstr "Gruppi" +msgstr "gruppi" #: contrib/auth/models.py:55 msgid "username" @@ -1173,11 +1183,11 @@ msgstr "password" #: contrib/auth/models.py:59 msgid "Use '[algo]$[salt]$[hexdigest]'" -msgstr "" +msgstr "Usare '[algo]$[salt]$[hexdigest]'" #: contrib/auth/models.py:60 msgid "staff status" -msgstr "amministratore" +msgstr "staff" #: contrib/auth/models.py:60 msgid "Designates whether the user can log into this admin site." @@ -1189,7 +1199,7 @@ msgstr "attivo" #: contrib/auth/models.py:62 msgid "superuser status" -msgstr "stato superutente" +msgstr "superuser" #: contrib/auth/models.py:63 msgid "last login" @@ -1204,23 +1214,20 @@ msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." msgstr "" -"In aggiunta ai permessi assegnati manualmente, l'utente ricever anche tutti " +"In aggiunta ai permessi assegnati manualmente, l'utente riceverà anche tutti " "i permessi assegnati ad ogni gruppo cui appartiene." #: contrib/auth/models.py:67 -#, fuzzy msgid "user permissions" -msgstr "Permessi" +msgstr "permessi utente" #: contrib/auth/models.py:70 -#, fuzzy msgid "user" -msgstr "Utente" +msgstr "utente" #: contrib/auth/models.py:71 -#, fuzzy msgid "users" -msgstr "Utenti" +msgstr "utenti" #: contrib/auth/models.py:76 msgid "Personal info" @@ -1239,20 +1246,19 @@ msgid "Groups" msgstr "Gruppi" #: contrib/auth/models.py:219 -#, fuzzy msgid "message" -msgstr "Messaggio" +msgstr "messaggio" #: contrib/auth/forms.py:30 msgid "" "Your Web browser doesn't appear to have cookies enabled. Cookies are " "required for logging in." msgstr "" +"Il browser non ha i cookie abilitati. Per accedere, è necessario abilitarli." #: contrib/contenttypes/models.py:25 -#, fuzzy msgid "python model class name" -msgstr "nome del modulo python" +msgstr "nome della classe modello in python" #: contrib/contenttypes/models.py:28 msgid "content type" @@ -1300,35 +1306,35 @@ msgstr "siti" #: utils/translation.py:360 msgid "DATE_FORMAT" -msgstr "" +msgstr "j F Y" #: utils/translation.py:361 msgid "DATETIME_FORMAT" -msgstr "" +msgstr "j F Y, H:i" #: utils/translation.py:362 msgid "TIME_FORMAT" -msgstr "" +msgstr "H:i" #: utils/dates.py:6 msgid "Monday" -msgstr "Luned" +msgstr "Lunedì" #: utils/dates.py:6 msgid "Tuesday" -msgstr "Marted" +msgstr "Martedì" #: utils/dates.py:6 msgid "Wednesday" -msgstr "Mercoled" +msgstr "Mercoledì" #: utils/dates.py:6 msgid "Thursday" -msgstr "Gioved" +msgstr "Giovedì" #: utils/dates.py:6 msgid "Friday" -msgstr "Venerd" +msgstr "Venerdì" #: utils/dates.py:7 msgid "Saturday" @@ -1388,52 +1394,51 @@ msgstr "Dicembre" #: utils/dates.py:19 msgid "jan" -msgstr "" +msgstr "gen" #: utils/dates.py:19 msgid "feb" -msgstr "" +msgstr "feb" #: utils/dates.py:19 msgid "mar" -msgstr "" +msgstr "mar" #: utils/dates.py:19 msgid "apr" -msgstr "" +msgstr "apr" #: utils/dates.py:19 -#, fuzzy msgid "may" -msgstr "Maggio" +msgstr "mag" #: utils/dates.py:19 msgid "jun" -msgstr "" +msgstr "giu" #: utils/dates.py:20 msgid "jul" -msgstr "" +msgstr "lug" #: utils/dates.py:20 msgid "aug" -msgstr "" +msgstr "ago" #: utils/dates.py:20 msgid "sep" -msgstr "" +msgstr "set" #: utils/dates.py:20 msgid "oct" -msgstr "" +msgstr "ott" #: utils/dates.py:20 msgid "nov" -msgstr "" +msgstr "nov" #: utils/dates.py:20 msgid "dec" -msgstr "" +msgstr "dic" #: utils/dates.py:27 msgid "Jan." @@ -1466,57 +1471,54 @@ msgstr "Dic." #: utils/timesince.py:12 msgid "year" msgid_plural "years" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "anno" +msgstr[1] "anni" #: utils/timesince.py:13 msgid "month" msgid_plural "months" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "mese" +msgstr[1] "mesi" #: utils/timesince.py:14 msgid "week" msgid_plural "weeks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "settimana" +msgstr[1] "settimane" #: utils/timesince.py:15 -#, fuzzy msgid "day" msgid_plural "days" -msgstr[0] "Maggio" -msgstr[1] "Maggio" +msgstr[0] "giorno" +msgstr[1] "giorni" #: utils/timesince.py:16 msgid "hour" msgid_plural "hours" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "ora" +msgstr[1] "ore" #: utils/timesince.py:17 -#, fuzzy msgid "minute" msgid_plural "minutes" -msgstr[0] "sito" -msgstr[1] "sito" +msgstr[0] "minuto" +msgstr[1] "minuti" #: conf/global_settings.py:37 msgid "Bengali" -msgstr "" +msgstr "Bengali" #: conf/global_settings.py:38 msgid "Czech" -msgstr "" +msgstr "Ceco" #: conf/global_settings.py:39 msgid "Welsh" -msgstr "" +msgstr "Gallese" #: conf/global_settings.py:40 -#, fuzzy msgid "Danish" -msgstr "Spagnolo" +msgstr "Danese" #: conf/global_settings.py:41 msgid "German" @@ -1524,7 +1526,7 @@ msgstr "Tedesco" #: conf/global_settings.py:42 msgid "Greek" -msgstr "" +msgstr "Greco" #: conf/global_settings.py:43 msgid "English" @@ -1544,15 +1546,15 @@ msgstr "Galiziano" #: conf/global_settings.py:47 msgid "Hungarian" -msgstr "" +msgstr "Ungherese" #: conf/global_settings.py:48 msgid "Hebrew" -msgstr "" +msgstr "Ebreo" #: conf/global_settings.py:49 msgid "Icelandic" -msgstr "" +msgstr "Islandese" #: conf/global_settings.py:50 msgid "Italian" @@ -1560,15 +1562,15 @@ msgstr "Italiano" #: conf/global_settings.py:51 msgid "Japanese" -msgstr "" +msgstr "Giapponese" #: conf/global_settings.py:52 msgid "Dutch" -msgstr "" +msgstr "Olandese" #: conf/global_settings.py:53 msgid "Norwegian" -msgstr "" +msgstr "Norvegese" #: conf/global_settings.py:54 msgid "Brazilian" @@ -1576,7 +1578,7 @@ msgstr "Brasiliano" #: conf/global_settings.py:55 msgid "Romanian" -msgstr "" +msgstr "Rumeno" #: conf/global_settings.py:56 msgid "Russian" @@ -1584,45 +1586,42 @@ msgstr "Russo" #: conf/global_settings.py:57 msgid "Slovak" -msgstr "" +msgstr "Slovacco" #: conf/global_settings.py:58 -#, fuzzy msgid "Slovenian" -msgstr "Serbo" +msgstr "Sloveno" #: conf/global_settings.py:59 -#, fuzzy msgid "Serbian" msgstr "Serbo" #: conf/global_settings.py:60 msgid "Swedish" -msgstr "" +msgstr "Svedese" #: conf/global_settings.py:61 -#, fuzzy msgid "Ukrainian" -msgstr "Brasiliano" +msgstr "Ucraino" #: conf/global_settings.py:62 msgid "Simplified Chinese" -msgstr "" +msgstr "Cinese semplificato" #: conf/global_settings.py:63 msgid "Traditional Chinese" -msgstr "" +msgstr "Cinese tradizionale" #: core/validators.py:60 msgid "This value must contain only letters, numbers and underscores." msgstr "Sono ammesse solo lettere, numeri e sottolineature ('_')." #: core/validators.py:64 -#, fuzzy msgid "" "This value must contain only letters, numbers, underscores, dashes or " "slashes." -msgstr "Sono ammesse solo lettere, numeri, sottolineature ('_') e barre ('/')." +msgstr "Sono ammesse solo lettere, numeri, sottolineature ('_'), trattini" +"('-') e barre ('/')." #: core/validators.py:72 msgid "Uppercase letters are not allowed here." @@ -1650,11 +1649,11 @@ msgstr "E' necessario inserire un valore." #: core/validators.py:107 msgid "Non-numeric characters aren't allowed here." -msgstr "Sono ammessi soltanto caratteri alfabetici." +msgstr "Sono ammessi soltanto caratteri numerici." #: core/validators.py:111 msgid "This value can't be comprised solely of digits." -msgstr "Il valore non pu essere composto solo da cifre." +msgstr "Il valore non può essere composto solo da cifre." #: core/validators.py:116 msgid "Enter a whole number." @@ -1666,15 +1665,15 @@ msgstr "Sono ammessi solo caratteri alfabetici." #: core/validators.py:124 msgid "Enter a valid date in YYYY-MM-DD format." -msgstr "Inserire un data valida in formato YYYY-MM-DD." +msgstr "Inserire un data valida in formato AAAA-MM-GG." #: core/validators.py:128 msgid "Enter a valid time in HH:MM format." -msgstr "Inserire un orario valido in formato HH:MM." +msgstr "Inserire un orario valido in formato OO:MM." #: core/validators.py:132 db/models/fields/__init__.py:468 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." -msgstr "Inserire una data/ora in formato YYYY-MM-DD HH:MM." +msgstr "Inserire una data/ora in formato AAAA-MM-GG OO:MM." #: core/validators.py:136 msgid "Enter a valid e-mail address." @@ -1685,7 +1684,7 @@ msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -"Caricare un'immagine valida. Il file inserito non un'immagine o corrotto." +"Caricare un'immagine valida. Il file inserito non è un'immagine o è corrotto." #: core/validators.py:155 #, python-format @@ -1696,7 +1695,7 @@ msgstr "L'URL %s non punta ad un'immagine valida." #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" -"I numeri di telefono devono essere in formato XXX-XXX-XXXX. \"%s\" non " +"I numeri di telefono devono essere in formato XXX-XXX-XXXX. \"%s\" non è " "valido." #: core/validators.py:167 @@ -1730,7 +1729,7 @@ msgstr "URL non valida: %s" #: core/validators.py:206 core/validators.py:208 #, python-format msgid "The URL %s is a broken link." -msgstr "L'URL %s un link rotto." +msgstr "L'URL %s è un link rotto." #: core/validators.py:214 msgid "Enter a valid U.S. state abbreviation." @@ -1740,8 +1739,8 @@ msgstr "Inserire un nome di stato americano abbreviato valido." #, 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] "Attenzione! La parola %s non ammessa qui." -msgstr[1] "Attenzione! Le parole %s non sono ammesse qui." +msgstr[0] "Attenzione! La parola %s non è ammessa." +msgstr[1] "Attenzione! Le parole %s non sono ammesse." #: core/validators.py:236 #, python-format @@ -1750,7 +1749,7 @@ msgstr "Questo campo deve corrispondere al campo '%s'." #: core/validators.py:255 msgid "Please enter something for at least one field." -msgstr "Inserire almeno un campo." +msgstr "Inserire qualcosa in almeno un campo." #: core/validators.py:264 core/validators.py:275 msgid "Please enter both fields or leave them both empty." @@ -1759,12 +1758,12 @@ msgstr "Inserire entrambi i campi o lasciarli entrambi vuoti." #: core/validators.py:282 #, python-format msgid "This field must be given if %(field)s is %(value)s" -msgstr "Il campo obbligatorio se %(field)s %(value)s" +msgstr "Il campo è obbligatorio se %(field)s è %(value)s" #: core/validators.py:294 #, python-format msgid "This field must be given if %(field)s is not %(value)s" -msgstr "Il campo non pu essere valorizzato se %(field)s non %(value)s" +msgstr "Il campo è obbligatorio se %(field)s non è %(value)s" #: core/validators.py:313 msgid "Duplicate values are not allowed." @@ -1784,16 +1783,16 @@ msgstr "Inserire un numero decimale valido." msgid "Please enter a valid decimal number with at most %s total digit." msgid_plural "" "Please enter a valid decimal number with at most %s total digits." -msgstr[0] "Inserire un numero decimale con non pi di %s cifre totali." -msgstr[1] "" +msgstr[0] "Inserire un numero decimale con non più di %s cifra." +msgstr[1] "Inserire un numero decimale con non più di %s cifre totali." #: core/validators.py:352 #, 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] "Inserire un decimale con non pi di %s cifre decimali." -msgstr[1] "" +msgstr[0] "Inserire un decimale con non più di %s cifra decimale." +msgstr[1] "Inserire un decimale con non più di %s cifre decimali." #: core/validators.py:362 #, python-format @@ -1803,7 +1802,7 @@ msgstr "Verifica che il file inserito sia almeno di %s byte." #: core/validators.py:363 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." -msgstr "Verifica che il file inserito sia al massimo %d byte." +msgstr "Verifica che il file inserito sia al massimo %s byte." #: core/validators.py:376 msgid "The format for this field is wrong." @@ -1811,20 +1810,19 @@ msgstr "Formato del file non valido." #: core/validators.py:391 msgid "This field is invalid." -msgstr "Il campo non valido." +msgstr "Il campo non è valido." #: core/validators.py:426 #, python-format msgid "Could not retrieve anything from %s." -msgstr "Impossibile recuperare alcunch da %s." +msgstr "Impossibile recuperare alcunché da %s." #: core/validators.py:429 #, python-format msgid "" "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." msgstr "" -"L'URL %(url)s restituisce un Content-Type header non valido '%(contenttype)" -"s'." +"L'URL %(url)s restituisce un Content-Type header non valido '%(contenttype)s'." #: core/validators.py:462 #, python-format @@ -1832,8 +1830,7 @@ msgid "" "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " "\"%(start)s\".)" msgstr "" -"Il tag %(tag)s alla linea %(line)s non chiuso. (La linea comincia con \"%" -"(start)s\".)" +"Il tag %(tag)s alla linea %(line)s non è chiuso. (La linea comincia con \"%(start)s\".)" #: core/validators.py:466 #, python-format @@ -1850,7 +1847,7 @@ msgid "" "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" "(start)s\".)" msgstr "" -"\"%(attr)s\" alla linea %(line)s un attributo invalido. (La linea comincia " +"\"%(attr)s\" alla linea %(line)s è un attributo invalido. (La linea comincia " "con \"%(start)s\".)" #: core/validators.py:476 @@ -1859,7 +1856,7 @@ msgid "" "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" "(start)s\".)" msgstr "" -"\"<%(tag)s>\" alla linea %(line)s tag non valido. (La linea comincia con \"%" +"\"<%(tag)s>\" alla linea %(line)s: tag non valido. (La linea comincia con \"%" "(start)s\".)" #: core/validators.py:480 @@ -1868,7 +1865,7 @@ msgid "" "A tag on line %(line)s is missing one or more required attributes. (Line " "starts with \"%(start)s\".)" msgstr "" -"Un tag alla linea %(line)s manca di uno o pi attributi richiesti. (La linea " +"Un tag alla linea %(line)s manca di uno o più attributi richiesti. (La linea " "comincia con \"%(start)s\".)" #: core/validators.py:485 @@ -1883,123 +1880,91 @@ msgstr "" #: db/models/manipulators.py:302 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." -msgstr "" +msgstr "%(object)s·con questo·%(type)s·esistono già per questo·%(field)s." +#: core/meta/fields.py:60 #: db/models/fields/__init__.py:40 #, python-format msgid "%(optname)s with this %(fieldname)s already exists." -msgstr "" +msgstr "%(optname)s·con questo·%(fieldname)s·esiste già." #: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265 #: db/models/fields/__init__.py:542 db/models/fields/__init__.py:553 #: forms/__init__.py:346 -#, fuzzy msgid "This field is required." -msgstr "Il campo non valido." +msgstr "Il campo è obbligatorio." #: db/models/fields/__init__.py:337 -#, fuzzy msgid "This value must be an integer." -msgstr "Il valore deve essere una potenza di %s." +msgstr "Il valore deve essere un intero." #: db/models/fields/__init__.py:369 -#, fuzzy msgid "This value must be either True or False." -msgstr "Il valore deve essere una potenza di %s." +msgstr "Il valore deve essere True o False." #: db/models/fields/__init__.py:385 -#, fuzzy msgid "This field cannot be null." -msgstr "Il campo non valido." +msgstr "Il campo non può essere nullo." #: db/models/fields/__init__.py:562 -#, fuzzy msgid "Enter a valid filename." -msgstr "Inserire un indirizzo e-mail valido." +msgstr "Inserire un nome file valido." #: db/models/fields/related.py:43 -#, fuzzy, python-format +#, python-format msgid "Please enter a valid %s." -msgstr "Inserire un indirizzo IP valido." +msgstr "Inserire un %s valido." #: db/models/fields/related.py:579 -#, fuzzy msgid "Separate multiple IDs with commas." -msgstr " Separa ID multipli con virgole." +msgstr "Separa ID multipli con virgole." #: db/models/fields/related.py:581 -#, fuzzy msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr " Premi \"Control\", o \"Command\" su Mac, per selezionarne pi di uno." +msgstr " Premi \"Control\", o \"Command\" su Mac, per selezionarne più di uno." #: db/models/fields/related.py:625 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" "Please enter valid %(self)s IDs. The values %(value)r are invalid." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Inserire un ID valido per %(self)s. Il valore %(value)r non è valido." +msgstr[1] "Inserire un ID valido per %(self)s. I valori %(value)r non sono validi." #: forms/__init__.py:380 #, python-format msgid "Ensure your text is less than %s character." msgid_plural "Ensure your text is less than %s characters." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Assicurati che il testo sia più corto di %s carattere." +msgstr[1] "Assicurati che il testo sia più corto di %s caratteri." #: forms/__init__.py:385 -#, fuzzy msgid "Line breaks are not allowed here." -msgstr "Non sono ammesse lettere minuscole." +msgstr "Non è ammesso andare a capo." #: forms/__init__.py:480 forms/__init__.py:551 forms/__init__.py:589 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." -msgstr "" +msgstr "Selezionare un'opzione valida; '%(data)s' non presente in %(choices)s." #: forms/__init__.py:645 msgid "The submitted file is empty." -msgstr "" +msgstr "Il file sottomesso è vuoto." #: forms/__init__.py:699 -#, fuzzy msgid "Enter a whole number between -32,768 and 32,767." -msgstr "Inserire un numero." +msgstr "Inserire un numero tra -32768 e 32767." #: forms/__init__.py:708 -#, fuzzy msgid "Enter a positive number." -msgstr "Inserire un numero." +msgstr "Inserire un numero positivo." #: forms/__init__.py:717 -#, fuzzy msgid "Enter a whole number between 0 and 32,767." -msgstr "Inserire un numero." +msgstr "Inserire un numero compreso tra 0 e 32767." #: template/defaultfilters.py:379 msgid "yes,no,maybe" -msgstr "" +msgstr "sì,no,forse" -#, fuzzy -#~ msgid "Comments" -#~ msgstr "abilita commenti" - -#~ msgid "label" -#~ msgstr "etichetta" - -#~ msgid "package" -#~ msgstr "pacchetto" - -#~ msgid "packages" -#~ msgstr "pacchetti" - -#, fuzzy -#~ msgid "count" -#~ msgstr "contenuto" - -#~ msgid "Itialian" -#~ msgstr "Italiano" - -#~ msgid "Server error (500)" -#~ msgstr "Errore del server (500)" diff --git a/django/conf/locale/it/LC_MESSAGES/djangojs.mo b/django/conf/locale/it/LC_MESSAGES/djangojs.mo index e8f2d97f32..2df21b6558 100644 Binary files a/django/conf/locale/it/LC_MESSAGES/djangojs.mo and b/django/conf/locale/it/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/it/LC_MESSAGES/djangojs.po b/django/conf/locale/it/LC_MESSAGES/djangojs.po index f7a6eaef0a..4b68decff2 100644 --- a/django/conf/locale/it/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/it/LC_MESSAGES/djangojs.po @@ -1,7 +1,7 @@ # Italian translation for the django-admin JS files -# Copyright (C) 2005 -# This file is distributed under the same license as the PACKAGE package. -# Antonio CavedoniTo install bookmarklets, drag the link to your bookmarks\n" +"toolbar, or right-click the link and add it to your bookmarks. Now you can\n" +"select the bookmarklet from any page in the site. Note that some of these\n" +"bookmarklets require you to be viewing the site from a computer designated\n" +"as \"internal\" (talk to your system administrator if you aren't sure if\n" +"your computer is \"internal\").
\n" +msgstr "" +"\n" +"Om bookmarklets te installeren, sleep de link naar uw " +"bladwijzers\n" +"werkbalk, of rechtermuis klik op de link en voeg het toe aan de bladwijzer. " +"Nu kan\n" +"de bookmarklet vanuit elke pagina op de site worden gekozen. Let erop dat " +"het soms\n" +"noodzakelijk is dat de computer van waaruit de pagina wordt bekeken intern " +"is\n" +"(Raadpleeg uw systeembeheerder of uw computer zich op het interne netwerk " +"bevind).
\n" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:19 +msgid "Documentation for this page" +msgstr "Documentatie voor deze pagina" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:20 +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." +msgstr "" +"Spring vanuit elke pagina naar de documentatie voor de view die gegenereerd " +"wordt door die pagina" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:22 +msgid "Show object ID" +msgstr "Toon object ID" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:23 +msgid "" +"Shows the content-type and unique ID for pages that represent a single " +"object." +msgstr "" +"Toont de content-type en unieke ID voor pagina's die een enkel object " +"voorsteld." + +#: contrib/admin/templates/admin_doc/bookmarklets.html:25 +msgid "Edit this object (current window)" +msgstr "Bewerk dit object (huidig venster)" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:26 +msgid "Jumps to the admin page for pages that represent a single object." +msgstr "Ga naar de beheerpagina voor pagina's die een enkel object weergeven." + +#: contrib/admin/templates/admin_doc/bookmarklets.html:28 +msgid "Edit this object (new window)" +msgstr "Bewerk dit object (nieuwe pagina)" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:29 +msgid "As above, but opens the admin page in a new window." +msgstr "Als boven, maar opent de beheerpagina in een nieuw venster." + +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "Tijd:" + +#: contrib/admin/templates/widget/file.html:2 +msgid "Currently:" +msgstr "Huidige:" + +#: contrib/admin/templates/widget/file.html:3 +msgid "Change:" +msgstr "Wijziging:" + +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:10 +#: contrib/admin/templates/registration/password_reset_done.html:4 +msgid "Password reset" +msgstr "Wachtwoord hersteld" + +#: 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 "" +"Wachtwoord vergeten? Geef u e-mail adres op en we herstellen uw wachtwoord " +"en zullen u het nieuwe wachtwoord per e-mail toesturen." + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "E-mailadres:" + +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Herstel mijn wachtwoord" + +#: contrib/admin/templates/registration/password_reset_email.html:2 +msgid "You're receiving this e-mail because you requested a password reset" +msgstr "U krijgt een e-mail omdat u om een nieuw wachtwoord heeft gevraagd" + +#: contrib/admin/templates/registration/password_reset_email.html:3 +#, python-format +msgid "for your user account at %(site_name)s" +msgstr "voor uw gebruikersaccount op %(site_name)s" + +#: contrib/admin/templates/registration/password_reset_email.html:5 +#, python-format +msgid "Your new password is: %(new_password)s" +msgstr "Uw nieuwe wachtwoord is: %(new_password)s" + +#: contrib/admin/templates/registration/password_reset_email.html:7 +msgid "Feel free to change this password by going to this page:" +msgstr "Aarzel niet om op deze pagina uw wachtwoord te wijzigen:" + +#: contrib/admin/templates/registration/password_reset_email.html:11 +msgid "Your username, in case you've forgotten:" +msgstr "Uw gebruikersnaam, mocht u deze vergeten zijn:" + +#: contrib/admin/templates/registration/password_reset_email.html:13 +msgid "Thanks for using our site!" +msgstr "Bedankt voor het gebruik van onze site!" + +#: contrib/admin/templates/registration/password_reset_email.html:15 +#, python-format +msgid "The %(site_name)s team" +msgstr "Het %(site_name)s team" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Bedankt voor de aanwezigheid op de site vandaag." + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Meld u opnieuw aan" + +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:10 +msgid "Password reset successful" +msgstr "Wachtwoord herstel geslaagd" + +#: 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 "" +"Een nieuw wachtwoord is per e-mail verstuurd. U zult het binnenkort " +"ontvangen." + +#: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/registration/password_change_form.html:6 +#: contrib/admin/templates/registration/password_change_form.html:10 +#: contrib/admin/templates/registration/password_change_done.html:4 +msgid "Password change" +msgstr "Wachtwoord wijziging" + +#: 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 "" +"Geef voor de veiligheid uw oude wachtwoord op en twee keer een nieuw " +"wachtwoord, zodat we kunnen controleren of er geen typefouten zijn gemaakt." + +#: contrib/admin/templates/registration/password_change_form.html:17 +msgid "Old password:" +msgstr "Oud wachtwoord:" + +#: contrib/admin/templates/registration/password_change_form.html:19 +msgid "New password:" +msgstr "Nieuw wachtwoord:" + +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Confirm password:" +msgstr "Bevestig wachtwoord:" + +#: contrib/admin/templates/registration/password_change_form.html:23 +msgid "Change my password" +msgstr "Wijzig mijn wachtwoord" + +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_done.html:10 +msgid "Password change successful" +msgstr "Wachtwoord wijzigen is geslaagd" + +#: contrib/admin/templates/registration/password_change_done.html:12 +msgid "Your password was changed." +msgstr "Uw wachtwoord is gewijzigd." + +#: contrib/sites/models.py:10 +msgid "domain name" +msgstr "domeinnaam" + +#: contrib/sites/models.py:11 +msgid "display name" +msgstr "weergavenaam" + +#: contrib/sites/models.py:15 +msgid "site" +msgstr "site" + +#: contrib/sites/models.py:16 +msgid "sites" +msgstr "sites" + +#: contrib/flatpages/models.py:8 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "Voorbeeld: '/about/contact/'. Zorg voor slashes aan begin en eind" + +#: contrib/flatpages/models.py:9 +msgid "title" +msgstr "titel" + +#: contrib/flatpages/models.py:10 +msgid "content" +msgstr "inhoud" + +#: contrib/flatpages/models.py:11 +msgid "enable comments" +msgstr "opmerkingen toestaan" + +#: contrib/flatpages/models.py:12 +msgid "template name" +msgstr "sjabloonnaam" + +#: contrib/flatpages/models.py:13 +msgid "" +"Example: 'flatpages/contact_page'. If this isn't provided, the system will " +"use 'flatpages/default'." +msgstr "" +"Voorbeeld: 'flatpages/contact_page'. Als deze niet is opgegeven, dan wordt " +"'flatpages/default' gebruikt." + +#: contrib/flatpages/models.py:14 +msgid "registration required" +msgstr "registratie verplicht" + +#: contrib/flatpages/models.py:14 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "" +"Alleen ingelogde gebruikers kunnen deze pagina zien, indien dit is " +"aangekruist." + +#: contrib/flatpages/models.py:18 +msgid "flat page" +msgstr "platte pagina" + +#: contrib/flatpages/models.py:19 +msgid "flat pages" +msgstr "platte pagina's" + +#: contrib/redirects/models.py:7 +msgid "redirect from" +msgstr "omgeleid via" + +#: contrib/redirects/models.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Dit moet een absoluut pad zijn, zonder de domein naam. Bijvoorbeeld: '/" +"events/search/'." + +#: contrib/redirects/models.py:9 +msgid "redirect to" +msgstr "omleiden naar" + +#: contrib/redirects/models.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Dit kan een absoluut pad zijn (zoals boven) of een volledige URL beginnend " +"met 'http://'." + +#: contrib/redirects/models.py:12 +msgid "redirect" +msgstr "omleiding" + +#: contrib/redirects/models.py:13 +msgid "redirects" +msgstr "omleidingen" + #: contrib/comments/models.py:67 contrib/comments/models.py:166 msgid "object ID" msgstr "object ID" @@ -74,10 +1473,6 @@ msgstr "datum/tijd toegevoegd" msgid "is public" msgstr "is publiek" -#: contrib/comments/models.py:85 contrib/admin/views/doc.py:289 -msgid "IP address" -msgstr "IP adres" - #: contrib/comments/models.py:86 msgid "is removed" msgstr "is verwijderd" @@ -231,13 +1626,13 @@ msgid_plural "" "\n" "%(text)s" msgstr[0] "" -"Deze opmerking is gepost door een gebruiker welke minder dan %(count)s heeft " -"gepostopmerking:\n" +"Deze opmerking is gepost door een gebruiker welke minder dan %(count)s opmerking " +"heeft gepost:\n" "\n" "%(text)s" msgstr[1] "" -"Deze opmerking is gepost door een gebruiker welke minder dan %(count)s heeft " -"gepostopmerkingen:\n" +"Deze opmerking is gepost door een gebruiker welke minder dan %(count)s opmerkingen " +"heeft gepost:\n" "\n" "%(text)s" @@ -281,42 +1676,10 @@ msgstr "" msgid "The comment form didn't provide either 'preview' or 'post'" msgstr "Het opmerkingenformulier heeft geen 'voorbeeld' of 'post'" -#: contrib/comments/templates/comments/form.html:6 -#: contrib/comments/templates/comments/form.html:8 -#: contrib/admin/templates/admin/login.html:17 -msgid "Username:" -msgstr "Gebruikersnaam:" - -#: contrib/comments/templates/comments/form.html:6 -#: contrib/admin/templates/admin/login.html:20 -msgid "Password:" -msgstr "Wachtwoord:" - #: contrib/comments/templates/comments/form.html:6 msgid "Forgotten your password?" msgstr "Uw wachtwoord vergeten?" -#: contrib/comments/templates/comments/form.html:8 -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/base.html:23 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Afmelden" - #: contrib/comments/templates/comments/form.html:12 msgid "Ratings" msgstr "Waarderingen" @@ -349,930 +1712,6 @@ msgstr "Concept opmerking" msgid "Your name:" msgstr "Uw gebruikernaam:" -#: contrib/admin/filterspecs.py:40 -#, python-format -msgid "" -"
To install bookmarklets, drag the link to your bookmarks\n" -"toolbar, or right-click the link and add it to your bookmarks. Now you can\n" -"select the bookmarklet from any page in the site. Note that some of these\n" -"bookmarklets require you to be viewing the site from a computer designated\n" -"as \"internal\" (talk to your system administrator if you aren't sure if\n" -"your computer is \"internal\").
\n" -msgstr "" -"\n" -"Om bookmarklets te installeren, sleep de link naar uw " -"bladwijzers\n" -"werkbalk, of rechtermuis klik op de link en voeg het toe aan de bladwijzer. " -"Nu kan\n" -"de bookmarklet vanuit elke pagina op de site worden gekozen. Let erop dat " -"het soms\n" -"noodzakelijk is dat de computer vanwaaruit de pagina wordt bekeken intern " -"is\n" -"(Raadpleeg uw systeembeheerder of uw computer zich op het interne netwerk " -"bevind).
\n"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid "Documentation for this page"
-msgstr "Documentatie voor deze pagina"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid ""
-"Jumps you from any page to the documentation for the view that generates "
-"that page."
-msgstr ""
-"Spring vanuit elke pagina naar de documentatie voor de view die gegenereerd "
-"wordt door die pagina"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid "Show object ID"
-msgstr "Toon object ID"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid ""
-"Shows the content-type and unique ID for pages that represent a single "
-"object."
-msgstr ""
-"Toont de content-type en unieke ID voor pagina's die een enkel object "
-"voorsteld."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
-msgstr "Bewerk dit object (huidig venster)"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "Ga naar de beheerpagina voor pagina's die een enkel object weergeven."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-msgid "Edit this object (new window)"
-msgstr "Bewerk dit object (nieuwe pagina)"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
-msgid "As above, but opens the admin page in a new window."
-msgstr "Als boven, maar opent de beheerpagina in een nieuw venster."
-
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Datum:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Tijd:"
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Huidige:"
-
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Wijziging:"
-
-#: contrib/redirects/models.py:7
-msgid "redirect from"
-msgstr "omgeleid via"
-
-#: contrib/redirects/models.py:8
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Dit moet een absoluut pad zijn, zonder de domein naam. Bijvoorbeeld: '/"
-"events/search/'."
-
-#: contrib/redirects/models.py:9
-msgid "redirect to"
-msgstr "omleiden naar"
-
-#: contrib/redirects/models.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Dit kan een absoluut pad (zoals boven) of een volledige URL beginnend met "
-"'http://'."
-
-#: contrib/redirects/models.py:12
-msgid "redirect"
-msgstr "omleiding"
-
-#: contrib/redirects/models.py:13
-msgid "redirects"
-msgstr "omleidingen"
-
-#: contrib/flatpages/models.py:8
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "Voorbeeld: '/about/contact/'. Zorg voor slashes aan begin en eind"
-
-#: contrib/flatpages/models.py:9
-msgid "title"
-msgstr "titel"
-
-#: contrib/flatpages/models.py:10
-msgid "content"
-msgstr "inhoud"
-
-#: contrib/flatpages/models.py:11
-msgid "enable comments"
-msgstr "opmerkingen toestaan"
-
-#: contrib/flatpages/models.py:12
-msgid "template name"
-msgstr "Naam sjabloon"
-
-#: contrib/flatpages/models.py:13
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-"Voorbeeld: 'flatpages/contact_page'. Als deze niet is opgegeven, dan wordt "
-"'flatpages/default' gebruikt."
-
-#: contrib/flatpages/models.py:14
-msgid "registration required"
-msgstr "registratie verplicht"
-
-#: contrib/flatpages/models.py:14
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Alleen ingelogde gebruikers kunnen deze pagina zien, indien dit is "
-"aangekruist."
-
-#: contrib/flatpages/models.py:18
-msgid "flat page"
-msgstr "platte pagina"
-
-#: contrib/flatpages/models.py:19
-msgid "flat pages"
-msgstr "platte pagina's"
-
-#: contrib/auth/models.py:13 contrib/auth/models.py:26
-msgid "name"
-msgstr "naam"
-
-#: contrib/auth/models.py:15
-msgid "codename"
-msgstr "codenaam"
-
-#: contrib/auth/models.py:17
-msgid "permission"
-msgstr "recht"
-
-#: contrib/auth/models.py:18 contrib/auth/models.py:27
-msgid "permissions"
-msgstr "rechten"
-
-#: contrib/auth/models.py:29
-msgid "group"
-msgstr "groep"
-
-#: contrib/auth/models.py:30 contrib/auth/models.py:65
-msgid "groups"
-msgstr "groepen"
-
-#: contrib/auth/models.py:55
-msgid "username"
-msgstr "gebruikernaam"
-
-#: contrib/auth/models.py:56
-msgid "first name"
-msgstr "voornaam"
-
-#: contrib/auth/models.py:57
-msgid "last name"
-msgstr "achternaam"
-
-#: contrib/auth/models.py:58
-msgid "e-mail address"
-msgstr "e-mailadres"
-
-#: contrib/auth/models.py:59
-msgid "password"
-msgstr "wachtwoord"
-
-#: contrib/auth/models.py:59
-msgid "Use '[algo]$[salt]$[hexdigest]'"
-msgstr "Gebruik '[algo]$[salt]$[hexdigest]'"
-
-#: contrib/auth/models.py:60
-msgid "staff status"
-msgstr "staf status"
-
-#: contrib/auth/models.py:60
-msgid "Designates whether the user can log into this admin site."
-msgstr "Bepaalt of gebruiker kan inloggen op deze admin site"
-
-#: contrib/auth/models.py:61
-msgid "active"
-msgstr "actief"
-
-#: contrib/auth/models.py:62
-msgid "superuser status"
-msgstr "supergebruiker status"
-
-#: contrib/auth/models.py:63
-msgid "last login"
-msgstr "laatste aanmelding"
-
-#: contrib/auth/models.py:64
-msgid "date joined"
-msgstr "datum toegetreden"
-
-#: contrib/auth/models.py:66
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr ""
-"Bovenop de rechten welke handmatig zijn toegekend, krijgt deze gebruiker ook "
-"alle rechten van de groepen waar hij of zij deel van uitmaakt."
-
-#: contrib/auth/models.py:67
-msgid "user permissions"
-msgstr "gebruikersrechten"
-
-#: contrib/auth/models.py:70
-msgid "user"
-msgstr "gebruiker"
-
-#: contrib/auth/models.py:71
-msgid "users"
-msgstr "gebruikers"
-
-#: contrib/auth/models.py:76
-msgid "Personal info"
-msgstr "Persoonlijke informatie"
-
-#: contrib/auth/models.py:77
-msgid "Permissions"
-msgstr "Rechten"
-
-#: contrib/auth/models.py:78
-msgid "Important dates"
-msgstr "Belangrijke data"
-
-#: contrib/auth/models.py:79
-msgid "Groups"
-msgstr "Groepen"
-
-#: contrib/auth/models.py:219
-msgid "message"
-msgstr "bericht"
-
-#: contrib/auth/forms.py:30
-msgid ""
-"Your Web browser doesn't appear to have cookies enabled. Cookies are "
-"required for logging in."
-msgstr ""
-"Lijkt erop dat uw browser geen cookies accepteerd. Om aan te melden moeten "
-"cookies worden geaccepteerd."
-
-#: contrib/contenttypes/models.py:25
-msgid "python model class name"
-msgstr "python model-class-naam"
-
-#: contrib/contenttypes/models.py:28
-msgid "content type"
-msgstr "inhoudtype"
-
-#: contrib/contenttypes/models.py:29
-msgid "content types"
-msgstr "inhoudtypen"
-
#: contrib/sessions/models.py:35
msgid "session key"
msgstr "sessiesleutel"
@@ -1293,33 +1732,49 @@ msgstr "sessie"
msgid "sessions"
msgstr "sessies"
-#: contrib/sites/models.py:10
-msgid "domain name"
-msgstr "domeinnaam"
+#: contrib/contenttypes/models.py:25
+msgid "python model class name"
+msgstr "python model-class-naam"
-#: contrib/sites/models.py:11
-msgid "display name"
-msgstr "weergavenaam"
+#: contrib/contenttypes/models.py:28
+msgid "content type"
+msgstr "inhoudtype"
-#: contrib/sites/models.py:15
-msgid "site"
-msgstr "site"
+#: contrib/contenttypes/models.py:29
+msgid "content types"
+msgstr "inhoudtypen"
-#: contrib/sites/models.py:16
-msgid "sites"
-msgstr "sites"
+#: forms/__init__.py:380
+#, python-format
+msgid "Ensure your text is less than %s character."
+msgid_plural "Ensure your text is less than %s characters."
+msgstr[0] "Zorg ervoor dat uw tekst korter is dan %s teken."
+msgstr[1] "Zorg ervoor dat uw tekst korter is dan %S tekens."
-#: utils/translation.py:360
-msgid "DATE_FORMAT"
-msgstr "DATE_FORMAT"
+#: forms/__init__.py:385
+msgid "Line breaks are not allowed here."
+msgstr "Regeleindes zijn niet toegestaan."
-#: utils/translation.py:361
-msgid "DATETIME_FORMAT"
-msgstr "DATETIME_FORMAT"
+#: forms/__init__.py:480 forms/__init__.py:551 forms/__init__.py:589
+#, python-format
+msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
+msgstr "Selecteer een geldige keuze; '%(data)s is niet in %(choices)s."
-#: utils/translation.py:362
-msgid "TIME_FORMAT"
-msgstr "TIME_FORMAT"
+#: forms/__init__.py:645
+msgid "The submitted file is empty."
+msgstr "Het gegeven bestand is leeg."
+
+#: forms/__init__.py:699
+msgid "Enter a whole number between -32,768 and 32,767."
+msgstr "Geef een geheel getal op tussen -32.768 en 32.767."
+
+#: forms/__init__.py:708
+msgid "Enter a positive number."
+msgstr "Geef een geheel getal op."
+
+#: forms/__init__.py:717
+msgid "Enter a whole number between 0 and 32,767."
+msgstr "Geef een geheel getal op tussen 0 en 32.767."
#: utils/dates.py:6
msgid "Monday"
@@ -1398,54 +1853,52 @@ msgid "December"
msgstr "december"
#: utils/dates.py:19
-#, fuzzy
msgid "jan"
-msgstr "en"
+msgstr "jan"
#: utils/dates.py:19
msgid "feb"
-msgstr ""
+msgstr "feb"
#: utils/dates.py:19
msgid "mar"
-msgstr ""
+msgstr "mar"
#: utils/dates.py:19
msgid "apr"
-msgstr ""
+msgstr "apr"
#: utils/dates.py:19
-#, fuzzy
msgid "may"
-msgstr "dag"
+msgstr "mei"
#: utils/dates.py:19
msgid "jun"
-msgstr ""
+msgstr "jun"
#: utils/dates.py:20
msgid "jul"
-msgstr ""
+msgstr "jul"
#: utils/dates.py:20
msgid "aug"
-msgstr ""
+msgstr "aug"
#: utils/dates.py:20
msgid "sep"
-msgstr ""
+msgstr "sep"
#: utils/dates.py:20
msgid "oct"
-msgstr ""
+msgstr "oct"
#: utils/dates.py:20
msgid "nov"
-msgstr ""
+msgstr "nov"
#: utils/dates.py:20
msgid "dec"
-msgstr ""
+msgstr "dec"
#: utils/dates.py:27
msgid "Jan."
@@ -1475,6 +1928,18 @@ msgstr "nov."
msgid "Dec."
msgstr "dec."
+#: utils/translation.py:360
+msgid "DATE_FORMAT"
+msgstr "d-n-Y"
+
+#: utils/translation.py:361
+msgid "DATETIME_FORMAT"
+msgstr "d-n-Y H:i"
+
+#: utils/translation.py:362
+msgid "TIME_FORMAT"
+msgstr "H:i"
+
#: utils/timesince.py:12
msgid "year"
msgid_plural "years"
@@ -1511,471 +1976,7 @@ msgid_plural "minutes"
msgstr[0] "minuut"
msgstr[1] "minuten"
-#: conf/global_settings.py:37
-msgid "Bengali"
-msgstr "Bengaals"
-
-#: conf/global_settings.py:38
-msgid "Czech"
-msgstr "Tjechisch"
-
-#: conf/global_settings.py:39
-msgid "Welsh"
-msgstr "Wels"
-
-#: conf/global_settings.py:40
-msgid "Danish"
-msgstr "Deens"
-
-#: conf/global_settings.py:41
-msgid "German"
-msgstr "Duits"
-
-#: conf/global_settings.py:42
-msgid "Greek"
-msgstr "Grieks"
-
-#: conf/global_settings.py:43
-msgid "English"
-msgstr "Engels"
-
-#: conf/global_settings.py:44
-msgid "Spanish"
-msgstr "Spaans"
-
-#: conf/global_settings.py:45
-msgid "French"
-msgstr "Frans"
-
-#: conf/global_settings.py:46
-msgid "Galician"
-msgstr "Galisisch"
-
-#: conf/global_settings.py:47
-msgid "Hungarian"
-msgstr ""
-
-#: conf/global_settings.py:48
-msgid "Hebrew"
-msgstr "Hebreews"
-
-#: conf/global_settings.py:49
-msgid "Icelandic"
-msgstr "IJslands"
-
-#: conf/global_settings.py:50
-msgid "Italian"
-msgstr "Italiaans"
-
-#: conf/global_settings.py:51
-msgid "Japanese"
-msgstr "Japans"
-
-#: conf/global_settings.py:52
-msgid "Dutch"
-msgstr "Nederlands"
-
-#: conf/global_settings.py:53
-msgid "Norwegian"
-msgstr "Noors"
-
-#: conf/global_settings.py:54
-msgid "Brazilian"
-msgstr "Braziliaans"
-
-#: conf/global_settings.py:55
-msgid "Romanian"
-msgstr "Roemeens"
-
-#: conf/global_settings.py:56
-msgid "Russian"
-msgstr "Russisch"
-
-#: conf/global_settings.py:57
-msgid "Slovak"
-msgstr "Slovaaks"
-
-#: conf/global_settings.py:58
-msgid "Slovenian"
-msgstr "Sloveens"
-
-#: conf/global_settings.py:59
-msgid "Serbian"
-msgstr "Servisch"
-
-#: conf/global_settings.py:60
-msgid "Swedish"
-msgstr "Zweeds"
-
-#: conf/global_settings.py:61
-msgid "Ukrainian"
-msgstr "Ukraiens"
-
-#: conf/global_settings.py:62
-msgid "Simplified Chinese"
-msgstr "Vereenvoudigd Chinees"
-
-#: conf/global_settings.py:63
-msgid "Traditional Chinese"
-msgstr "Traditioneel Chinees"
-
-#: core/validators.py:60
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Deze waarde mag alleen letters, getallen en liggende strepen bevatten."
-
-#: core/validators.py:64
-msgid ""
-"This value must contain only letters, numbers, underscores, dashes or "
-"slashes."
-msgstr ""
-"Deze waarde mag alleen letters, cijfers, liggende strepen en schuine "
-"strepen bevatten."
-
-#: core/validators.py:72
-msgid "Uppercase letters are not allowed here."
-msgstr "Hoofdletters niet toegestaan."
-
-#: core/validators.py:76
-msgid "Lowercase letters are not allowed here."
-msgstr "Kleine letters niet toegestaan."
-
-#: core/validators.py:83
-msgid "Enter only digits separated by commas."
-msgstr "Geef alleen cijfers gescheiden door komma's."
-
-#: core/validators.py:95
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "Geef een geldig e-mail adres gescheiden door komma's."
-
-#: core/validators.py:99
-msgid "Please enter a valid IP address."
-msgstr "Geef een geldig IP adres."
-
-#: core/validators.py:103
-msgid "Empty values are not allowed here."
-msgstr "Lege waarden niet toegestaan."
-
-#: core/validators.py:107
-msgid "Non-numeric characters aren't allowed here."
-msgstr "Niet-numerieke karakters niet toegestaan."
-
-#: core/validators.py:111
-msgid "This value can't be comprised solely of digits."
-msgstr "Deze waarde kan niet alleen uit cijfers bestaan."
-
-#: core/validators.py:116
-msgid "Enter a whole number."
-msgstr "Geef geheel getal."
-
-#: core/validators.py:120
-msgid "Only alphabetical characters are allowed here."
-msgstr "Alleen alfabethische karakters zijn toegestaan"
-
-#: core/validators.py:124
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Geef een geldige datum in JJJJ-MM-DD formaat."
-
-#: core/validators.py:128
-msgid "Enter a valid time in HH:MM format."
-msgstr "Geef een geldige tijd in HH:MM formaat."
-
-#: core/validators.py:132 db/models/fields/__init__.py:468
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Geef geldige datum/tijd in JJJJ-MM-DD HH:MM formaat."
-
-#: core/validators.py:136
-msgid "Enter a valid e-mail address."
-msgstr "Geef geldig e-mail adres."
-
-#: core/validators.py:148
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
-msgstr ""
-"Bestand ongeldig. Het bestand dat is gegeven is geen afbeelding of was "
-"beschadigd."
-
-#: core/validators.py:155
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "De URL %s wijst niet naar een afbeelding."
-
-#: core/validators.py:159
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr ""
-"Telefoonnummers moeten in het XXX-XXX-XXXX formaat. \"%s\" is ongeldig."
-
-#: core/validators.py:167
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "De URL %s wijst niet naar een QuickTime video."
-
-#: core/validators.py:171
-msgid "A valid URL is required."
-msgstr "Een geldig URL is nodig."
-
-#: core/validators.py:185
-#, python-format
-msgid ""
-"Valid HTML is required. Specific errors are:\n"
-"%s"
-msgstr ""
-"Geldige HTML is vereist. De specifieke fouten zijn:\n"
-"%s"
-
-#: core/validators.py:192
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "Foute XML: %s"
-
-#: core/validators.py:202
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "Ongeldige URL: %s"
-
-#: core/validators.py:206 core/validators.py:208
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "De URL %s is een gebroken link."
-
-#: core/validators.py:214
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "Geef een geldige afkorting van een VS staat."
-
-#: core/validators.py:229
-#, 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] "Pas op uw taalgebruik! Gebruik van %s niet toegestaan."
-msgstr[1] "Pas op uw taalgebruik! Gebruik van de woorden %s niet toegestaan."
-
-#: core/validators.py:236
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "Dit veld moet overeenkomen met het '%s' veld."
-
-#: core/validators.py:255
-msgid "Please enter something for at least one field."
-msgstr "Geef in minimaal een veld een waarde."
-
-#: core/validators.py:264 core/validators.py:275
-msgid "Please enter both fields or leave them both empty."
-msgstr "Voer waarden in in beide velden of laat beide leeg."
-
-#: core/validators.py:282
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
-msgstr "Dit veld moet opgegeven worden indien %(field)s is %(value)s"
-
-#: core/validators.py:294
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
-msgstr "Dit veld moet worden opgegeven indien %(field)s niet %(value)s is"
-
-#: core/validators.py:313
-msgid "Duplicate values are not allowed."
-msgstr "Dubbele waarden niet toegestaan."
-
-#: core/validators.py:336
-#, python-format
-msgid "This value must be a power of %s."
-msgstr "De waarde moet een macht van %s zijn."
-
-#: core/validators.py:347
-msgid "Please enter a valid decimal number."
-msgstr "Geef een geldig decimaal getal."
-
-#: core/validators.py:349
-#, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s total digits."
-msgstr[0] "Geef een geldig decimaal getal met maximaal %s cijfer."
-msgstr[1] "Geef een geldig decimaal getal met maximaal %s cijfers."
-
-#: core/validators.py:352
-#, 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] "Geef een decimaal getal met maximaal %s cijfer achter de komma."
-msgstr[1] "Geef een decimaal getal met maximaal %s cijfers achter de komma."
-
-#: core/validators.py:362
-#, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "Zorg ervoor dat het bestand minimaal %s bytes groot is."
-
-#: core/validators.py:363
-#, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "Zorg ervoor dat het bestand maximaal %s bytes groot is."
-
-#: core/validators.py:376
-msgid "The format for this field is wrong."
-msgstr "Het formaat van dit veld is fout."
-
-#: core/validators.py:391
-msgid "This field is invalid."
-msgstr "Dit veld is ongeldig."
-
-#: core/validators.py:426
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "Kan niks ophalen van %s."
-
-#: core/validators.py:429
-#, python-format
-msgid ""
-"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr ""
-"De geretourneerde URL %(url)s bevat een ongeldige Content-Type '%"
-"(contenttype)s."
-
-#: core/validators.py:462
-#, python-format
-msgid ""
-"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
-"\"%(start)s\".)"
-msgstr ""
-"Sluit de niet gesloten %(tag)s tag op regel %(line)s. (Regel start met \"%"
-"(start)s\".)"
-
-#: core/validators.py:466
-#, python-format
-msgid ""
-"Some text starting on line %(line)s is not allowed in that context. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"Tekst beginnend op regel %(line)s is in deze context niet toegestaan. (Regel "
-"start met \"%(start)s\".)"
-
-#: core/validators.py:471
-#, python-format
-msgid ""
-"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"\"%(attr)s\" op regel %(line)s is een ongeldig attribuut. (Regel start met "
-"\"%(start)s\".)"
-
-#: core/validators.py:476
-#, python-format
-msgid ""
-"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"\"<%(tag)s>\" op regel %(line)s is een ongeldige tag. (Regel start met \"%"
-"(start)s\".)"
-
-#: core/validators.py:480
-#, python-format
-msgid ""
-"A tag on line %(line)s is missing one or more required attributes. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"Een of meerdere attributen ontbreken bij een tag op regel %(line)s. (Regel "
-"start met \"%(start)s\".)"
-
-#: core/validators.py:485
-#, python-format
-msgid ""
-"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"De \"%(attr)s\" attribuut op regel %(line)s heeft een ongeldige waarde. "
-"(Regel start met \"%(start)s\".)"
-
-#: db/models/manipulators.py:302
-#, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."
-msgstr ""
-"%(object)s van het type %(type)s bestaat al voor het gegeven %(field)s."
-
-#: db/models/fields/__init__.py:40
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "%(optname)s met deze %(fieldname)s bestaat al."
-
-#: db/models/fields/__init__.py:114 db/models/fields/__init__.py:265
-#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:553
-#: forms/__init__.py:346
-msgid "This field is required."
-msgstr "Dit veld is verplicht."
-
-#: db/models/fields/__init__.py:337
-msgid "This value must be an integer."
-msgstr "De waarde moet een geheel getal zijn."
-
-#: db/models/fields/__init__.py:369
-msgid "This value must be either True or False."
-msgstr "De waarde moet of True (waar) of False (onwaar) zijn."
-
-#: db/models/fields/__init__.py:385
-msgid "This field cannot be null."
-msgstr "Dit veld kan niet oningevuld zijn."
-
-#: db/models/fields/__init__.py:562
-msgid "Enter a valid filename."
-msgstr "Geef geldige bestandsnaam."
-
-#: db/models/fields/related.py:43
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Geef een geldig IP adres."
-
-#: db/models/fields/related.py:579
-msgid "Separate multiple IDs with commas."
-msgstr "Meerdere ID's door komma's gescheiden."
-
-#: db/models/fields/related.py:581
-msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr ""
-"Houd \"Control\", of \"Command\" op een Mac, ingedrukt om meerdere te "
-"selecteren."
-
-#: db/models/fields/related.py:625
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural ""
-"Please enter valid %(self)s IDs. The values %(value)r are invalid."
-msgstr[0] "Geef een geldig %(self)s IDs. De waarde %(value)r is ongeldig."
-msgstr[1] "Geef een geldig %(self)s IDs. de waarden %(value)r zijn ongeldig."
-
-#: forms/__init__.py:380
-#, python-format
-msgid "Ensure your text is less than %s character."
-msgid_plural "Ensure your text is less than %s characters."
-msgstr[0] "Zorg ervoor dat uw tekst korter is dan %s."
-msgstr[1] "Zorg ervoor dat uw tekst korter is dan %S."
-
-#: forms/__init__.py:385
-msgid "Line breaks are not allowed here."
-msgstr "Regeleindes zijn niet toegestaan."
-
-#: forms/__init__.py:480 forms/__init__.py:551 forms/__init__.py:589
-#, python-format
-msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
-msgstr "Selecteer een geldige keuze; '%(data)s is niet in %(choices)s."
-
-#: forms/__init__.py:645
-msgid "The submitted file is empty."
-msgstr "Het gegeven bestand is leeg."
-
-#: forms/__init__.py:699
-msgid "Enter a whole number between -32,768 and 32,767."
-msgstr "Geef geheel getal tussen -32.768 en 32.767."
-
-#: forms/__init__.py:708
-msgid "Enter a positive number."
-msgstr "Geef geheel getal."
-
-#: forms/__init__.py:717
-msgid "Enter a whole number between 0 and 32,767."
-msgstr "Geef geheel getal tussen 0 en 32.767."
-
#: template/defaultfilters.py:379
msgid "yes,no,maybe"
msgstr "ja,nee,misschien"
+
diff --git a/django/conf/locale/nl/LC_MESSAGES/djangojs.mo b/django/conf/locale/nl/LC_MESSAGES/djangojs.mo
index 7a9a2d4353..6b3dfaf035 100644
Binary files a/django/conf/locale/nl/LC_MESSAGES/djangojs.mo and b/django/conf/locale/nl/LC_MESSAGES/djangojs.mo differ
diff --git a/django/conf/locale/nl/LC_MESSAGES/djangojs.po b/django/conf/locale/nl/LC_MESSAGES/djangojs.po
index e323debc72..0a4ccd5145 100644
--- a/django/conf/locale/nl/LC_MESSAGES/djangojs.po
+++ b/django/conf/locale/nl/LC_MESSAGES/djangojs.po
@@ -1,16 +1,16 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Dutch Javascript translations.
+# Copyright (C) 2006
+# This file is distributed under the same license as the Django package.
# Rudolph Froger Permission denied
')
+ except SystemExit:
+ pass # See http://code.djangoproject.com/ticket/1023
except: # Handle everything else, including SuspiciousOperation, etc.
if settings.DEBUG:
return self.get_technical_error_response(request)
diff --git a/django/core/mail.py b/django/core/mail.py
index 415cb6e8fc..da4cacbe29 100644
--- a/django/core/mail.py
+++ b/django/core/mail.py
@@ -3,7 +3,7 @@
from django.conf import settings
from email.MIMEText import MIMEText
from email.Header import Header
-import smtplib
+import smtplib, rfc822
class BadHeaderError(ValueError):
pass
@@ -49,6 +49,7 @@ def send_mass_mail(datatuple, fail_silently=False, auth_user=settings.EMAIL_HOST
msg['Subject'] = subject
msg['From'] = from_email
msg['To'] = ', '.join(recipient_list)
+ msg['Date'] = rfc822.formatdate()
try:
server.sendmail(from_email, recipient_list, msg.as_string())
num_sent += 1
diff --git a/django/core/management.py b/django/core/management.py
index a3a28af1af..8e8133f443 100644
--- a/django/core/management.py
+++ b/django/core/management.py
@@ -328,13 +328,23 @@ def get_sql_initial_data_for_model(model):
app_dir = os.path.normpath(os.path.join(os.path.dirname(models.get_app(model._meta.app_label).__file__), 'sql'))
output = []
+ # Some backends can't execute more than one SQL statement at a time,
+ # so split into separate statements.
+ sql_expr = re.compile(
+ r"""( # each statement is...
+ (?: # one or more chunks of ...
+ (?:[^;'"]+) # not the end of a statement or start of a quote
+ | (?:'[^']+') # something in single quotes
+ | (?:"[^"]+") # something in double quotes
+ )+)""", re.VERBOSE)
+
# Find custom SQL, if it's available.
sql_files = [os.path.join(app_dir, "%s.%s.sql" % (opts.object_name.lower(), settings.DATABASE_ENGINE)),
os.path.join(app_dir, "%s.sql" % opts.object_name.lower())]
for sql_file in sql_files:
if os.path.exists(sql_file):
fp = open(sql_file)
- output.append(fp.read())
+ output.extend(sql_expr.findall(fp.read()))
fp.close()
return output
diff --git a/django/db/__init__.py b/django/db/__init__.py
index 317d6059bf..f21ae6a727 100644
--- a/django/db/__init__.py
+++ b/django/db/__init__.py
@@ -17,8 +17,11 @@ except ImportError, e:
backend_dir = os.path.join(__path__[0], 'backends')
available_backends = [f for f in os.listdir(backend_dir) if not f.startswith('_') and not f.startswith('.') and not f.endswith('.py') and not f.endswith('.pyc')]
available_backends.sort()
- raise ImproperlyConfigured, "Could not load database backend: %s. Is your DATABASE_ENGINE setting (currently, %r) spelled correctly? Available options are: %s" % \
- (e, settings.DATABASE_ENGINE, ", ".join(map(repr, available_backends)))
+ if settings.DATABASE_ENGINE not in available_backends:
+ raise ImproperlyConfigured, "%r isn't an available database backend. vailable options are: %s" % \
+ (settings.DATABASE_ENGINE, ", ".join(map(repr, available_backends)))
+ else:
+ raise # If there's some other error, this must be an error in Django itself.
get_introspection_module = lambda: __import__('django.db.backends.%s.introspection' % settings.DATABASE_ENGINE, '', '', [''])
get_creation_module = lambda: __import__('django.db.backends.%s.creation' % settings.DATABASE_ENGINE, '', '', [''])
diff --git a/django/db/backends/ado_mssql/base.py b/django/db/backends/ado_mssql/base.py
index fe36303565..c5a3b2cc33 100644
--- a/django/db/backends/ado_mssql/base.py
+++ b/django/db/backends/ado_mssql/base.py
@@ -5,7 +5,11 @@ Requires adodbapi 2.0.1: http://adodbapi.sourceforge.net/
"""
from django.db.backends import util
-import adodbapi as Database
+try:
+ import adodbapi as Database
+except ImportError, e:
+ from django.core.exceptions import ImproperlyConfigured
+ raise ImproperlyConfigured, "Error loading adodbapi module: %s" % e
import datetime
try:
import mx
diff --git a/django/db/backends/mysql/base.py b/django/db/backends/mysql/base.py
index e2d6cbfc5e..6a53956cad 100644
--- a/django/db/backends/mysql/base.py
+++ b/django/db/backends/mysql/base.py
@@ -5,7 +5,11 @@ Requires MySQLdb: http://sourceforge.net/projects/mysql-python
"""
from django.db.backends import util
-import MySQLdb as Database
+try:
+ import MySQLdb as Database
+except ImportError, e:
+ from django.core.exceptions import ImproperlyConfigured
+ raise ImproperlyConfigured, "Error loading MySQLdb module: %s" % e
from MySQLdb.converters import conversions
from MySQLdb.constants import FIELD_TYPE
import types
diff --git a/django/db/backends/oracle/__init__.py b/django/db/backends/oracle/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
new file mode 100644
index 0000000000..a7c866484e
--- /dev/null
+++ b/django/db/backends/oracle/base.py
@@ -0,0 +1,126 @@
+"""
+Oracle database backend for Django.
+
+Requires cx_Oracle: http://www.python.net/crew/atuining/cx_Oracle/
+"""
+
+from django.db.backends import util
+try:
+ import cx_Oracle as Database
+except ImportError, e:
+ from django.core.exceptions import ImproperlyConfigured
+ raise ImproperlyConfigured, "Error loading cx_Oracle module: %s" % e
+import types
+
+DatabaseError = Database.Error
+
+try:
+ # Only exists in Python 2.4+
+ from threading import local
+except ImportError:
+ # Import copy of _thread_local.py from Python 2.4
+ from django.utils._threading_local import local
+
+class DatabaseWrapper(local):
+ def __init__(self):
+ self.connection = None
+ self.queries = []
+
+ def _valid_connection(self):
+ return self.connection is not None
+
+ def cursor(self):
+ from django.conf import settings
+ if not self._valid_connection():
+ if len(settings.DATABASE_HOST.strip()) == 0:
+ settings.DATABASE_HOST = 'localhost'
+ if len(settings.DATABASE_PORT.strip()) != 0:
+ dsn = Database.makedsn(settings.DATABASE_HOST, int(settings.DATABASE_PORT), settings.DATABASE_NAME)
+ self.connection = Database.connect(settings.DATABASE_USER, settings.DATABASE_PASSWORD, dsn)
+ else:
+ conn_string = "%s/%s@%s" % (settings.DATABASE_USER, settings.DATABASE_PASSWORD, settings.DATABASE_NAME)
+ self.connection = Database.connect(conn_string)
+ return FormatStylePlaceholderCursor(self.connection)
+
+ def _commit(self):
+ self.connection.commit()
+
+ def _rollback(self):
+ if self.connection:
+ try:
+ self.connection.rollback()
+ except Database.NotSupportedError:
+ pass
+
+ def close(self):
+ if self.connection is not None:
+ self.connection.close()
+ self.connection = None
+
+supports_constraints = True
+
+class FormatStylePlaceholderCursor(Database.Cursor):
+ """
+ Django uses "format" (e.g. '%s') style placeholders, but Oracle uses ":var" style.
+ This fixes it -- but note that if you want to use a literal "%s" in a query,
+ you'll need to use "%%s".
+ """
+ def execute(self, query, params=[]):
+ query = self.convert_arguments(query, len(params))
+ return Database.Cursor.execute(self, query, params)
+
+ def executemany(self, query, params=[]):
+ query = self.convert_arguments(query, len(params[0]))
+ return Database.Cursor.executemany(self, query, params)
+
+ def convert_arguments(self, query, num_params):
+ # replace occurances of "%s" with ":arg" - Oracle requires colons for parameter placeholders.
+ args = [':arg' for i in range(num_params)]
+ return query % tuple(args)
+
+def quote_name(name):
+ return name
+
+dictfetchone = util.dictfetchone
+dictfetchmany = util.dictfetchmany
+dictfetchall = util.dictfetchall
+
+def get_last_insert_id(cursor, table_name, pk_name):
+ query = "SELECT %s_sq.currval from dual" % table_name
+ cursor.execute(query)
+ return cursor.fetchone()[0]
+
+def get_date_extract_sql(lookup_type, table_name):
+ # lookup_type is 'year', 'month', 'day'
+ # http://www.psoug.org/reference/date_func.html
+ return "EXTRACT(%s FROM %s)" % (lookup_type, table_name)
+
+def get_date_trunc_sql(lookup_type, field_name):
+ return "EXTRACT(%s FROM TRUNC(%s))" % (lookup_type, field_name)
+
+def get_limit_offset_sql(limit, offset=None):
+ # Limits and offset are too complicated to be handled here.
+ # Instead, they are handled in django/db/query.py.
+ pass
+
+def get_random_function_sql():
+ return "DBMS_RANDOM.RANDOM"
+
+def get_drop_foreignkey_sql():
+ return "DROP FOREIGN KEY"
+
+OPERATOR_MAPPING = {
+ 'exact': '= %s',
+ 'iexact': 'LIKE %s',
+ 'contains': 'LIKE %s',
+ 'icontains': 'LIKE %s',
+ 'ne': '!= %s',
+ 'gt': '> %s',
+ 'gte': '>= %s',
+ 'lt': '< %s',
+ 'lte': '<= %s',
+ 'startswith': 'LIKE %s',
+ 'endswith': 'LIKE %s',
+ 'istartswith': 'LIKE %s',
+ 'iendswith': 'LIKE %s',
+}
diff --git a/django/db/backends/oracle/client.py b/django/db/backends/oracle/client.py
new file mode 100644
index 0000000000..7e32ebef2f
--- /dev/null
+++ b/django/db/backends/oracle/client.py
@@ -0,0 +1,10 @@
+from django.conf import settings
+import os
+
+def runshell():
+ args = ''
+ args += settings.DATABASE_USER
+ if settings.DATABASE_PASSWORD:
+ args += "/%s" % settings.DATABASE_PASSWORD
+ args += "@%s" % settings.DATABASE_NAME
+ os.execvp('sqlplus', args)
diff --git a/django/db/backends/oracle/creation.py b/django/db/backends/oracle/creation.py
new file mode 100644
index 0000000000..d45ceb64f5
--- /dev/null
+++ b/django/db/backends/oracle/creation.py
@@ -0,0 +1,26 @@
+DATA_TYPES = {
+ 'AutoField': 'number(38)',
+ 'BooleanField': 'number(1)',
+ 'CharField': 'varchar2(%(maxlength)s)',
+ 'CommaSeparatedIntegerField': 'varchar2(%(maxlength)s)',
+ 'DateField': 'date',
+ 'DateTimeField': 'date',
+ 'FileField': 'varchar2(100)',
+ 'FilePathField': 'varchar2(100)',
+ 'FloatField': 'number(%(max_digits)s, %(decimal_places)s)',
+ 'ImageField': 'varchar2(100)',
+ 'IntegerField': 'integer',
+ 'IPAddressField': 'char(15)',
+ 'ManyToManyField': None,
+ 'NullBooleanField': 'integer',
+ 'OneToOneField': 'integer',
+ 'PhoneNumberField': 'varchar(20)',
+ 'PositiveIntegerField': 'integer',
+ 'PositiveSmallIntegerField': 'smallint',
+ 'SlugField': 'varchar(50)',
+ 'SmallIntegerField': 'smallint',
+ 'TextField': 'long',
+ 'TimeField': 'timestamp',
+ 'URLField': 'varchar(200)',
+ 'USStateField': 'varchar(2)',
+}
diff --git a/django/db/backends/oracle/introspection.py b/django/db/backends/oracle/introspection.py
new file mode 100644
index 0000000000..656741e440
--- /dev/null
+++ b/django/db/backends/oracle/introspection.py
@@ -0,0 +1,52 @@
+from django.db import transaction
+from django.db.backends.oracle.base import quote_name
+import re
+
+foreign_key_re = re.compile(r"\sCONSTRAINT `[^`]*` FOREIGN KEY \(`([^`]*)`\) REFERENCES `([^`]*)` \(`([^`]*)`\)")
+
+def get_table_list(cursor):
+ "Returns a list of table names in the current database."
+ cursor.execute("SELECT TABLE_NAME FROM USER_TABLES")
+ return [row[0] for row in cursor.fetchall()]
+
+def get_table_description(cursor, table_name):
+ return table_name
+
+def _name_to_index(cursor, table_name):
+ """
+ Returns a dictionary of {field_name: field_index} for the given table.
+ Indexes are 0-based.
+ """
+ return dict([(d[0], i) for i, d in enumerate(get_table_description(cursor, table_name))])
+
+def get_relations(cursor, table_name):
+ """
+ Returns a dictionary of {field_index: (field_index_other_table, other_table)}
+ representing all relationships to the given table. Indexes are 0-based.
+ """
+ raise NotImplementedError
+
+def get_indexes(cursor, table_name):
+ """
+ Returns a dictionary of fieldname -> infodict for the given table,
+ where each infodict is in the format:
+ {'primary_key': boolean representing whether it's the primary key,
+ 'unique': boolean representing whether it's a unique index}
+ """
+ raise NotImplementedError
+
+# Maps type codes to Django Field types.
+DATA_TYPES_REVERSE = {
+ 16: 'BooleanField',
+ 21: 'SmallIntegerField',
+ 23: 'IntegerField',
+ 25: 'TextField',
+ 869: 'IPAddressField',
+ 1043: 'CharField',
+ 1082: 'DateField',
+ 1083: 'TimeField',
+ 1114: 'DateTimeField',
+ 1184: 'DateTimeField',
+ 1266: 'TimeField',
+ 1700: 'FloatField',
+}
diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py
index 3c807f2120..a365434318 100644
--- a/django/db/backends/postgresql/base.py
+++ b/django/db/backends/postgresql/base.py
@@ -5,7 +5,11 @@ Requires psycopg 1: http://initd.org/projects/psycopg1
"""
from django.db.backends import util
-import psycopg as Database
+try:
+ import psycopg as Database
+except ImportError, e:
+ from django.core.exceptions import ImproperlyConfigured
+ raise ImproperlyConfigured, "Error loading psycopg module: %s" % e
DatabaseError = Database.DatabaseError
diff --git a/django/db/backends/postgresql_psycopg2/base.py b/django/db/backends/postgresql_psycopg2/base.py
index 9376c36772..13e7be7a98 100644
--- a/django/db/backends/postgresql_psycopg2/base.py
+++ b/django/db/backends/postgresql_psycopg2/base.py
@@ -5,7 +5,11 @@ Requires psycopg 2: http://initd.org/projects/psycopg2
"""
from django.db.backends import util
-import psycopg2 as Database
+try:
+ import psycopg2 as Database
+except ImportError, e:
+ from django.core.exceptions import ImproperlyConfigured
+ raise ImproperlyConfigured, "Error loading psycopg2 module: %s" % e
DatabaseError = Database.DatabaseError
diff --git a/django/db/backends/sqlite3/base.py b/django/db/backends/sqlite3/base.py
index b884e9d27b..7c3018aed9 100644
--- a/django/db/backends/sqlite3/base.py
+++ b/django/db/backends/sqlite3/base.py
@@ -3,7 +3,11 @@ SQLite3 backend for django. Requires pysqlite2 (http://pysqlite.org/).
"""
from django.db.backends import util
-from pysqlite2 import dbapi2 as Database
+try:
+ from pysqlite2 import dbapi2 as Database
+except ImportError, e:
+ from django.core.exceptions import ImproperlyConfigured
+ raise ImproperlyConfigured, "Error loading pysqlite2 module: %s" % e
DatabaseError = Database.DatabaseError
diff --git a/django/db/models/base.py b/django/db/models/base.py
index 08a81c9ab9..bc722de505 100644
--- a/django/db/models/base.py
+++ b/django/db/models/base.py
@@ -269,8 +269,8 @@ class Model(object):
q._params.extend([param, param, getattr(self, self._meta.pk.attname)])
try:
return q[0]
- except IndexError, e:
- raise self.DoesNotExist, e.args
+ except IndexError:
+ raise self.DoesNotExist, "%s matching query does not exist." % self.__class__._meta.object_name
def _get_next_or_previous_in_order(self, is_next):
cachename = "__%s_order_cache" % is_next
diff --git a/django/db/models/loading.py b/django/db/models/loading.py
index a9e0348f8e..7f5c97924b 100644
--- a/django/db/models/loading.py
+++ b/django/db/models/loading.py
@@ -17,9 +17,15 @@ def get_apps():
_app_list = []
for app_name in settings.INSTALLED_APPS:
try:
- _app_list.append(__import__(app_name, '', '', ['models']).models)
- except (ImportError, AttributeError), e:
- pass
+ mod = __import__(app_name, '', '', ['models'])
+ except ImportError:
+ pass # Assume this app doesn't have a models.py in it.
+ # GOTCHA: It may have a models.py that raises ImportError.
+ else:
+ try:
+ _app_list.append(mod.models)
+ except AttributeError:
+ pass # This app doesn't have a models.py in it.
return _app_list
def get_app(app_label):
diff --git a/django/db/models/query.py b/django/db/models/query.py
index b8fc0c695f..91ae294a62 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -95,6 +95,9 @@ class QuerySet(object):
def __getitem__(self, k):
"Retrieve an item or slice from the set of results."
+ assert (not isinstance(k, slice) and (k >= 0)) \
+ or (isinstance(k, slice) and (k.start is None or k.start >= 0) and (k.stop is None or k.stop >= 0)), \
+ "Negative indexing is not supported."
if self._result_cache is None:
if isinstance(k, slice):
# Offset:
@@ -129,7 +132,7 @@ class QuerySet(object):
return list(self._clone(_offset=offset, _limit=limit))[::k.step]
else:
try:
- return self._clone(_offset=k, _limit=1).get()
+ return list(self._clone(_offset=k, _limit=1))[0]
except self.model.DoesNotExist, e:
raise IndexError, e.args
else:
@@ -193,6 +196,7 @@ class QuerySet(object):
def get(self, *args, **kwargs):
"Performs the SELECT and returns a single object matching the given keyword arguments."
clone = self.filter(*args, **kwargs)
+ # clean up SQL by removing unneeded ORDER BY
if not clone._order_by:
clone._order_by = ()
obj_list = list(clone)
@@ -287,22 +291,26 @@ class QuerySet(object):
def filter(self, *args, **kwargs):
"Returns a new QuerySet instance with the args ANDed to the existing set."
- return self._filter_or_exclude(Q, *args, **kwargs)
+ return self._filter_or_exclude(None, *args, **kwargs)
def exclude(self, *args, **kwargs):
"Returns a new QuerySet instance with NOT (args) ANDed to the existing set."
return self._filter_or_exclude(QNot, *args, **kwargs)
- def _filter_or_exclude(self, qtype, *args, **kwargs):
+ def _filter_or_exclude(self, mapper, *args, **kwargs):
+ # mapper is a callable used to transform Q objects,
+ # or None for identity transform
+ if mapper is None:
+ mapper = lambda x: x
if len(args) > 0 or len(kwargs) > 0:
assert self._limit is None and self._offset is None, \
"Cannot filter a query once a slice has been taken."
clone = self._clone()
if len(kwargs) > 0:
- clone._filters = clone._filters & qtype(**kwargs)
+ clone._filters = clone._filters & mapper(Q(**kwargs))
if len(args) > 0:
- clone._filters = clone._filters & reduce(operator.and_, args)
+ clone._filters = clone._filters & reduce(operator.and_, map(mapper, args))
return clone
def complex_filter(self, filter_obj):
@@ -314,7 +322,7 @@ class QuerySet(object):
if hasattr(filter_obj, 'get_sql'):
return self._filter_or_exclude(None, filter_obj)
else:
- return self._filter_or_exclude(Q, **filter_obj)
+ return self._filter_or_exclude(None, **filter_obj)
def select_related(self, true_or_false=True):
"Returns a new QuerySet instance with '_select_related' modified."
@@ -578,9 +586,12 @@ class Q(object):
class QNot(Q):
"Encapsulates NOT (...) queries as objects"
+ def __init__(self, q):
+ "Creates a negation of the q object passed in."
+ self.q = q
def get_sql(self, opts):
- tables, joins, where, params = super(QNot, self).get_sql(opts)
+ tables, joins, where, params = self.q.get_sql(opts)
where2 = ['(NOT (%s))' % " AND ".join(where)]
return tables, joins, where2, params
diff --git a/django/views/generic/list_detail.py b/django/views/generic/list_detail.py
index 68a1e73b07..7d254c08da 100644
--- a/django/views/generic/list_detail.py
+++ b/django/views/generic/list_detail.py
@@ -34,7 +34,6 @@ def object_list(request, queryset, paginate_by=None, allow_empty=False,
number of objects, total
"""
queryset = queryset._clone()
- model = queryset.model
if paginate_by:
paginator = ObjectPaginator(queryset, paginate_by)
page = request.GET.get('page', 1)
@@ -71,6 +70,7 @@ def object_list(request, queryset, paginate_by=None, allow_empty=False,
else:
c[key] = value
if not template_name:
+ model = queryset.model
template_name = "%s/%s_list.html" % (model._meta.app_label, model._meta.object_name.lower())
t = template_loader.get_template(template_name)
return HttpResponse(t.render(c))
diff --git a/docs/cache.txt b/docs/cache.txt
index 2c54f60456..2ef3d6503f 100644
--- a/docs/cache.txt
+++ b/docs/cache.txt
@@ -209,12 +209,12 @@ The per-site cache
==================
Once the cache is set up, the simplest way to use caching is to cache your
-entire site. Just add ``django.middleware.cache.CacheMiddleware`` to your
+entire site. Just add ``'django.middleware.cache.CacheMiddleware'`` to your
``MIDDLEWARE_CLASSES`` setting, as in this example::
MIDDLEWARE_CLASSES = (
- "django.middleware.cache.CacheMiddleware",
- "django.middleware.common.CommonMiddleware",
+ 'django.middleware.cache.CacheMiddleware',
+ 'django.middleware.common.CommonMiddleware',
)
(The order of ``MIDDLEWARE_CLASSES`` matters. See "Order of MIDDLEWARE_CLASSES"
diff --git a/docs/csrf.txt b/docs/csrf.txt
index 4ea09552fc..218b43a61a 100644
--- a/docs/csrf.txt
+++ b/docs/csrf.txt
@@ -17,7 +17,7 @@ middleware into your list of installed middleware.
How to use it
=============
-Add the middleware ``"django.contrib.csrf.middleware.CsrfMiddleware"`` to
+Add the middleware ``'django.contrib.csrf.middleware.CsrfMiddleware'`` to
your list of middleware classes, ``MIDDLEWARE_CLASSES``. It needs to process
the response after the SessionMiddleware, so must come before it in the
list. It also must process the response before things like compression
diff --git a/docs/middleware.txt b/docs/middleware.txt
index f3dbcb82d1..bad00fd890 100644
--- a/docs/middleware.txt
+++ b/docs/middleware.txt
@@ -23,10 +23,10 @@ name. For example, here's the default ``MIDDLEWARE_CLASSES`` created by
``django-admin.py startproject``::
MIDDLEWARE_CLASSES = (
- "django.middleware.common.CommonMiddleware",
- "django.contrib.sessions.middleware.SessionMiddleware",
- "django.contrib.auth.middleware.AuthenticationMiddleware",
- "django.middleware.doc.XViewMiddleware",
+ 'django.middleware.common.CommonMiddleware',
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.contrib.auth.middleware.AuthenticationMiddleware',
+ 'django.middleware.doc.XViewMiddleware',
)
Django applies middleware in the order it's defined in ``MIDDLEWARE_CLASSES``,
diff --git a/docs/sessions.txt b/docs/sessions.txt
index 10d94cd4fd..b7f16b67b9 100644
--- a/docs/sessions.txt
+++ b/docs/sessions.txt
@@ -14,7 +14,7 @@ Sessions are implemented via middleware_.
Turn session functionality on and off by editing the ``MIDDLEWARE_CLASSES``
setting. To activate sessions, make sure ``MIDDLEWARE_CLASSES`` contains
-``"django.contrib.sessions.middleware.SessionMiddleware"``.
+``'django.contrib.sessions.middleware.SessionMiddleware'``.
The default ``settings.py`` created by ``django-admin.py startproject`` has
``SessionMiddleware`` activated.
diff --git a/docs/sites.txt b/docs/sites.txt
index 51f57afe4f..cca9f14f31 100644
--- a/docs/sites.txt
+++ b/docs/sites.txt
@@ -308,4 +308,4 @@ Here's how Django uses the sites framework:
.. _redirects framework: http://www.djangoproject.com/documentation/redirects/
.. _flatpages framework: http://www.djangoproject.com/documentation/flatpages/
.. _syndication framework: http://www.djangoproject.com/documentation/syndication/
-.. _authentication framework: http://www.djangoproject.com/documentation/syndication/
+.. _authentication framework: http://www.djangoproject.com/documentation/authentication/
diff --git a/docs/templates_python.txt b/docs/templates_python.txt
index 8ac2effd45..6c33052792 100644
--- a/docs/templates_python.txt
+++ b/docs/templates_python.txt
@@ -784,27 +784,23 @@ In Python 2.4, the decorator syntax also works::
Inclusion tags
~~~~~~~~~~~~~~
-Another type of template tag that is sometimes useful is when you want to
-display some data that is computed at render time in a template fragment. For
-example, in Django's admin interface, there is a line of buttons along the
-bottom of the `create/edit record` screen. These buttons always look the same,
-but the link targets change depending upon the object being edited. So they
-are a perfect example for using a small template that is filled in with
-details from the current object. To save typing, it would also be nice if we
-could wrap this whole display up in a single tag (in the admin templates this
-is the ``submit_row`` tag).
+Another common type of template tag is the type that displays some data by
+rendering *another* template. For example, Django's admin interface uses custom
+template tags to display the buttons along the botton of the "add/change" form
+pages. Those buttons always look the same, but the link targets change depending
+on the object being edited -- so they're a perfect case for using a small
+template that is filled with details from the current object. (In the admin's
+case, this is the ``submit_row`` tag.)
-We call these sorts of tags `inclusion tags`. In your template, you pass in
-any appropriate arguments and the tag uses those arguments, together with the
-current context to render a template and include the result in the output.
+These sorts of tags are called `inclusion tags`.
-Writing inclusion tags is probably best demonstrated by example. We will write
-a tag that outputs a list of choices for a Poll object, such as was created in
-the tutorials_. We will use this tag like this::
+Writing inclusion tags is probably best demonstrated by example. Let's write a
+tag that outputs a list of choices for a given ``Poll`` object, such as was
+created in the tutorials_. We'll use the tag like this::
- {{ show_results poll }}
+ {% show_results poll %}
-and the output will be something like this::
+...and the output will be something like this::
-First, we define the function which takes the argument and produces a
-dictionary of data for the result. The important point here is we only need to
-return a dictionary, not anything more complex. This will be used to substitue
-for values in the template fragment, just as when templates are used
-elsewhere.
-
-::
+First, define the function that takes the argument and produces a dictionary of
+data for the result. The important point here is we only need to return a
+dictionary, not anything more complex. This will be used as a template context
+for the template fragment. Example::
def show_results(poll):
choices = poll.choice_set.all()
return {'choices': choices}
-We also need to create the template that is used to render the output. This
-template is a fixed feature of the tag: the tag writer specifies it, not the
-template designer. In our case, the template is very simple::
+Next, create the template used to render the tag's output. This template is a
+fixed feature of the tag: the tag writer specifies it, not the template
+designer. Following our example, the template is very simple::
{% for choice in choices %}
@@ -834,50 +827,33 @@ template designer. In our case, the template is very simple::
{% endfor %}
-Now we can create the inclusion tag. Suppose the above template is in a file
-called ``results.html`` in a directory that is searched by the template
-loader. We register our new tag similarly to a normal tag.
-
-::
+Now, create and register the inclusion tag by calling the ``inclusion_tag()``
+method on a ``Library`` object. Following our example, if the above template is
+in a file called ``results.html`` in a directory that's searched by the template
+loader, we'd register the tag like this::
# Here, register is a django.template.Library instance, as before
register.inclusion_tag('results.html')(show_results)
As always, Python 2.4 decorator syntax works as well, so we could have
-written
-
-::
+written::
@inclusion_tag('results.html')
def show_results(poll):
...
-when first creating the function.
+...when first creating the function.
-In some cases, an inclusion tag might require a large number of arguments to
-display itself properly. In essence, it would depend largely on the current
-context it was being rendered with. We can make these sorts of tags easier to
-write by telling the ``inclusion_tag`` function that the whole context
-should be passed in as an argument to the function. This will be done
-invisibly as far as the template tag user is concerned: they will not need to
-do anything to pass in the context.
+Sometimes, your inclusion tags might require a large number of arguments,
+making it a pain for template authors to pass in all the arguments and remember
+their order. To solve this, Django provides a ``takes_context`` option for
+inclusion tags. If you specify ``takes_context`` in creating a template tag,
+the tag will have no required arguments, and the underlying Python function
+will have one argument -- the template context as of when the tag was called.
-For example, suppose we are writing an inclusion tag that will always be used
-in a context that contains ``home_link`` and ``home_title`` variables that
-point back to the main page. We can write a tag that is used like this::
-
- {{ jump_link }}
-
-and renders this::
-
- Jump directly to Home
-
-The tag function is almost as simple as before. This time it takes no
-arguments except the ``context`` (and the parameter `must` be called
-``context`` in this case; the special parameter named is used internally by
-Django to fill in the values correctly).
-
-::
+For example, say you're writing an inclusion tag that will always be used in a
+context that contains ``home_link`` and ``home_title`` variables that point
+back to the main page. Here's what the Python function would look like::
# The first argument *must* be called "context" here.
def jump_link(context):
@@ -885,19 +861,28 @@ Django to fill in the values correctly).
'link': context['home_link'],
'title': context['home_title'],
}
+ # Register the custom tag as an inclusion tag with takes_context=True.
+ register.inclusion_tag('link.html', takes_context=True)(jump_link)
-Our template is very simple again::
+(Note that the first parameter to the function *must* be called ``context``.)
+
+In that ``register.inclusion_tag()`` line, we specified ``takes_context=True``
+and the name of the template. Here's what the template ``link.html`` might look
+like::
Jump directly to {{ title }}.
-Assuming the template is in a file called ``link.html``, we register this new
-tag as follows::
+Then, any time you want to use that custom tag, load its library and call it
+without any arguments, like so::
- register.inclusion_tag('link.html', takes_context = True)(jump_link)
+ {% jump_link %}
-The ``takes_context`` parameter here defaults to *False*. When it is set to
-*True*, our tag is passed the implicit context as in this example. That is the
-only difference between this case and our previous use of ``inclusion_tag``.
+Note that when you're using ``takes_context=True``, there's no need to pass
+arguments to the template tag. It automatically gets access to the context.
+
+The ``takes_context`` parameter defaults to ``False``. When it's set to *True*,
+the tag is passed the context object, as in this example. That's the only
+difference between this case and the previous ``inclusion_tag`` example.
.. _tutorials: http://www.djangoproject.com/documentation/tutorial1/#creating-models
diff --git a/docs/transactions.txt b/docs/transactions.txt
index 378aa959d1..c1cd5aa984 100644
--- a/docs/transactions.txt
+++ b/docs/transactions.txt
@@ -32,10 +32,10 @@ To activate this feature, just add the ``TransactionMiddleware`` middleware to
your ``MIDDLEWARE_CLASSES`` setting::
MIDDLEWARE_CLASSES = (
- "django.contrib.sessions.middleware.SessionMiddleware",
- "django.middleware.common.CommonMiddleware",
- "django.middleware.cache.CacheMiddleware",
- "django.middleware.transaction.TransactionMiddleware",
+ 'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.middleware.common.CommonMiddleware',
+ 'django.middleware.cache.CacheMiddleware',
+ 'django.middleware.transaction.TransactionMiddleware',
)
The order is quite important. The transaction middleware applies not only to
diff --git a/docs/tutorial02.txt b/docs/tutorial02.txt
index d95476aeaf..4cc263dddc 100644
--- a/docs/tutorial02.txt
+++ b/docs/tutorial02.txt
@@ -284,8 +284,8 @@ Here's what it looks like at this point:
:alt: Polls change list page
:target: http://media.djangoproject.com/img/doc/tutorial/admin04.png
-By default, Django displays the ``repr()`` of each object. But it'd be more
-helpful if we could display individual fields. To do that, use the
+By default, Django displays the ``str()`` of each object. But sometimes it'd
+be more helpful if we could display individual fields. To do that, use the
``list_display`` option, which is a tuple of field names to display, as columns,
on the change list page for the object::
diff --git a/setup.py b/setup.py
index 09c821b655..a872eb10cc 100644
--- a/setup.py
+++ b/setup.py
@@ -22,8 +22,10 @@ setup(
'locale/el/LC_MESSAGES/*',
'locale/en/LC_MESSAGES/*',
'locale/es/LC_MESSAGES/*',
+ 'locale/es_AR/LC_MESSAGES/*',
'locale/fr/LC_MESSAGES/*',
'locale/gl/LC_MESSAGES/*',
+ 'locale/hu/LC_MESSAGES/*',
'locale/he/LC_MESSAGES/*',
'locale/is/LC_MESSAGES/*',
'locale/it/LC_MESSAGES/*',
diff --git a/tests/modeltests/basic/models.py b/tests/modeltests/basic/models.py
index 0470d6bc9b..f60c3777e7 100644
--- a/tests/modeltests/basic/models.py
+++ b/tests/modeltests/basic/models.py
@@ -283,6 +283,16 @@ Traceback (most recent call last):
...
AssertionError: Cannot combine queries once a slice has been taken.
+# Negative slices are not supported, due to database constraints.
+# (hint: inverting your ordering might do what you need).
+>>> Article.objects.all()[-1]
+Traceback (most recent call last):
+ ...
+AssertionError: Negative indexing is not supported.
+>>> Article.objects.all()[0:-5]
+Traceback (most recent call last):
+ ...
+AssertionError: Negative indexing is not supported.
# An Article instance doesn't have access to the "objects" attribute.
# That's only available on the class.
diff --git a/tests/modeltests/or_lookups/models.py b/tests/modeltests/or_lookups/models.py
index a07dacdd5a..ef4d4dc5ca 100644
--- a/tests/modeltests/or_lookups/models.py
+++ b/tests/modeltests/or_lookups/models.py
@@ -89,6 +89,10 @@ Hello and goodbye
>>> Article.objects.filter(Q(headline__startswith='Hello')).in_bulk([1,2])
{1: Hello}
+# Demonstrating exclude with a Q object
+>>> Article.objects.exclude(Q(headline__startswith='Hello'))
+[Goodbye]
+
# The 'complex_filter' method supports framework features such as
# 'limit_choices_to' which normally take a single dictionary of lookup arguments
# but need to support arbitrary queries via Q objects too.
diff --git a/tests/modeltests/ordering/models.py b/tests/modeltests/ordering/models.py
index de08a75755..8b56731c55 100644
--- a/tests/modeltests/ordering/models.py
+++ b/tests/modeltests/ordering/models.py
@@ -56,6 +56,10 @@ API_TESTS = """
>>> Article.objects.order_by('headline')[1:3]
[Article 2, Article 3]
+# Getting a single item should work too:
+>>> Article.objects.all()[0]
+Article 4
+
# Use '?' to order randomly. (We're using [...] in the output to indicate we
# don't know what order the output will be in.
>>> Article.objects.order_by('?')
diff --git a/tests/runtests.py b/tests/runtests.py
index 32f893e1ea..f0eee97ec5 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -20,6 +20,17 @@ def log_error(model_name, title, description):
MODEL_TEST_DIR = os.path.join(os.path.dirname(__file__), MODEL_TESTS_DIR_NAME)
+ALWAYS_INSTALLED_APPS = [
+ 'django.contrib.admin',
+ 'django.contrib.auth',
+ 'django.contrib.comments',
+ 'django.contrib.contenttypes',
+ 'django.contrib.flatpages',
+ 'django.contrib.redirects',
+ 'django.contrib.sessions',
+ 'django.contrib.sites',
+]
+
def get_test_models():
return [f for f in os.listdir(MODEL_TEST_DIR) if not f.startswith('__init__') and not f.startswith('.')]
@@ -78,7 +89,7 @@ class TestRunner:
settings.INSTALLED_APPS
# Manually set INSTALLED_APPS to point to the test models.
- settings.INSTALLED_APPS = [MODEL_TESTS_DIR_NAME + '.' + a for a in get_test_models()]
+ settings.INSTALLED_APPS = ALWAYS_INSTALLED_APPS + [MODEL_TESTS_DIR_NAME + '.' + a for a in get_test_models()]
# Manually set DEBUG = False.
settings.DEBUG = False