diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py
index e69f27660fb4a..8eea31b0db457 100644
--- a/django/conf/global_settings.py
+++ b/django/conf/global_settings.py
@@ -11,6 +11,10 @@
DEBUG = False
TEMPLATE_DEBUG = False
+# True if BaseHandler.get_response() should propagate raw exceptions
+# rather than catching them. This is useful under some testing siutations,
+# and should never be used on a live site.
+DEBUG_PROPAGATE_EXCEPTIONS = False
# Whether to use the "Etag" header. This saves bandwidth but slows down performance.
USE_ETAGS = False
diff --git a/django/conf/locale/ca/LC_MESSAGES/django.mo b/django/conf/locale/ca/LC_MESSAGES/django.mo
index ee65dfe5341dd..fe790857066db 100644
Binary files a/django/conf/locale/ca/LC_MESSAGES/django.mo and b/django/conf/locale/ca/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/ca/LC_MESSAGES/django.po b/django/conf/locale/ca/LC_MESSAGES/django.po
index 6c99137f213a7..0b216f757cef4 100644
--- a/django/conf/locale/ca/LC_MESSAGES/django.po
+++ b/django/conf/locale/ca/LC_MESSAGES/django.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-04-25 00:18+0200\n"
-"PO-Revision-Date: 2008-03-29 01:37+0100\n"
+"POT-Creation-Date: 2007-02-15 00:00+0200\n"
+"PO-Revision-Date: 2008-05-14 11:15+0200\n"
"Last-Translator: Django Catalan Group \n"
"Language-Team: Catalan \n"
"MIME-Version: 1.0\n"
@@ -409,8 +409,8 @@ msgid ""
"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
"All of the following related items will be deleted:"
msgstr ""
-"Esteu segurs de voler esborrar els/les %(object_name)s \"%(escaped_object)s\"? "
-"S'esborraran els següents elements relacionats:"
+"Esteu segurs de voler esborrar els/les %(object_name)s \"%(escaped_object)s"
+"\"? S'esborraran els següents elements relacionats:"
#: contrib/admin/templates/admin/delete_confirmation.html:25
msgid "Yes, I'm sure"
@@ -546,8 +546,8 @@ msgid ""
"First, enter a username and password. Then, you'll be able to edit more user "
"options."
msgstr ""
-"Primer, entreu un usuari i una contrasenya. Després podreu editar més opcions "
-"de l'usuari."
+"Primer, entreu un usuari i una contrasenya. Després podreu editar més "
+"opcions de l'usuari."
#: contrib/admin/templates/admin/auth/user/add_form.html:12
msgid "Username"
@@ -599,8 +599,8 @@ msgstr ""
"Ara podeu escollir el 'bookmarklet' des de qualsevol pàgina del lloc.\n"
"Observeu que alguns d'aquests 'bookmarklets' precisen que estigui veient\n"
"el lloc des de un ordinador senyalat com a \"intern\" (parleu\n"
-"amb el vostre administrador de sistemes si no esteu segurs de la condició del "
-"vostre).
\n"
+"amb el vostre administrador de sistemes si no esteu segurs de la condició "
+"del vostre).\n"
#: contrib/admin/templates/admin_doc/bookmarklets.html:18
msgid "Documentation for this page"
@@ -826,8 +826,8 @@ msgid ""
"cookies, reload this page, and try again."
msgstr ""
"Sembla ser que el vostre navegador no està configurat per acceptar "
-"'cookies' (galetes). Si us plau, habiliteu les 'cookies', recarregueu aquesta "
-"pàgina i proveu-ho de nou. "
+"'cookies' (galetes). Si us plau, habiliteu les 'cookies', recarregueu "
+"aquesta pàgina i proveu-ho de nou. "
#: contrib/admin/views/decorators.py:90
msgid "Usernames cannot contain the '@' character."
@@ -837,7 +837,8 @@ msgstr "Els noms d'usuari no poden contenir el caracter '@'."
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
-"La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en tot cas."
+"La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en tot "
+"cas."
#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
#: contrib/admin/views/doc.py:52
@@ -1070,7 +1071,7 @@ msgstr "Seleccioneu %s"
msgid "Select %s to change"
msgstr "Seleccioneu %s per modificar"
-#: contrib/admin/views/main.py:784
+#: contrib/admin/views/main.py:765
msgid "Database error"
msgstr "Error de base de dades"
@@ -1099,8 +1100,8 @@ msgid ""
"That e-mail address doesn't have an associated user account. Are you sure "
"you've registered?"
msgstr ""
-"Aquesta adreça de correu no té associada cap compte d'usuari. Esteu segurs de "
-"que s'ha registrat?"
+"Aquesta adreça de correu no té associada cap compte d'usuari. Esteu segurs "
+"de que s'ha registrat?"
#: contrib/auth/forms.py:107
#, python-format
@@ -1173,8 +1174,8 @@ msgid ""
"Use '[algo]$[salt]$[hexdigest]' or use the change "
"password form."
msgstr ""
-"Utilitzeu '[algo]$[salt]$[hexdigest]' o el formulari de "
-"canvi de contrasenya."
+"Utilitzeu '[algo]$[salt]$[hexdigest]' o el formulari "
+"de canvi de contrasenya."
#: contrib/auth/models.py:136
msgid "staff status"
@@ -1189,12 +1190,11 @@ msgid "active"
msgstr "actiu"
#: contrib/auth/models.py:137
-#, fuzzy
msgid ""
"Designates whether this user should be treated as active. Unselect this "
"instead of deleting accounts."
msgstr ""
-"Designa si aquest usuari ha de ser tractat com a actiu. Desekeccioneu-ho "
+"Designa si aquest usuari ha de ser tractat com a actiu. Deseleccioneu-ho "
"enlloc d'esborrar comptes d'usuari."
#: contrib/auth/models.py:138
@@ -1327,8 +1327,8 @@ msgid ""
"Check this box if the comment is inappropriate. A \"This comment has been "
"removed\" message will be displayed instead."
msgstr ""
-"Marqueu aquesta caixa si el comentari no és apropiat. En lloc seu es mostrarà "
-"\"Aquest comentari ha estat eliminat\" "
+"Marqueu aquesta caixa si el comentari no és apropiat. En lloc seu es "
+"mostrarà \"Aquest comentari ha estat eliminat\" "
#: contrib/comments/models.py:96
msgid "comments"
@@ -1572,8 +1572,8 @@ msgstr "tipus de continguts"
msgid ""
"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
-"Exemple: '/about/contact/'. Assegureu-vos de posar les barres al principi i al "
-"final."
+"Exemple: '/about/contact/'. Assegureu-vos de posar les barres al principi i "
+"al final."
#: contrib/flatpages/models.py:10
msgid "title"
@@ -1617,7 +1617,7 @@ msgstr "pàgines estàtiques"
#: contrib/flatpages/models.py:27
msgid "Advanced options"
-msgstr ""
+msgstr "Opcions avançades"
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
@@ -2254,8 +2254,8 @@ msgid ""
"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
"9XXXXXXXX."
msgstr ""
-"Introduïu un número de telèfon vàlid en un dels formats 6XXXXXXXX, "
-"8XXXXXXXX o 9XXXXXXXX."
+"Introduïu un número de telèfon vàlid en un dels formats 6XXXXXXXX, 8XXXXXXXX "
+"o 9XXXXXXXX."
#: contrib/localflavor/es/forms.py:66
msgid "Please enter a valid NIF, NIE, or CIF."
@@ -3628,7 +3628,7 @@ msgstr "L'any ha de ser posterior al 1900"
msgid "Invalid date: %s"
msgstr "Data invàlida: %s"
-#: core/validators.py:156 db/models/fields/__init__.py:527
+#: core/validators.py:156 db/models/fields/__init__.py:548
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Introduïu una data vàlida en el forma AAAA-MM-DD."
@@ -3636,7 +3636,7 @@ msgstr "Introduïu una data vàlida en el forma AAAA-MM-DD."
msgid "Enter a valid time in HH:MM format."
msgstr "Introduïu una hora vàlida en el format HH:MM."
-#: core/validators.py:165 db/models/fields/__init__.py:604
+#: core/validators.py:165 db/models/fields/__init__.py:625
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "Introduïu un data/hora vàlida en format YYYY-MM-DD HH:MM."
@@ -3655,8 +3655,8 @@ msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-"Envieu una imatge vàlida. El fitxer que heu enviat no era una imatge o estava "
-"corrupte."
+"Envieu una imatge vàlida. El fitxer que heu enviat no era una imatge o "
+"estava corrupte."
#: core/validators.py:200
#, python-format
@@ -3712,7 +3712,8 @@ msgstr "Introdueixi una abreviatura vàlida d'estat dels E.U.A.."
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] "Vigileu amb el vostre llenguatge! Aquí no s'admet la paraula: %s."
-msgstr[1] "Vigileu amb el vostre llenguatge! Aquí no s'admeten les paraules: %s."
+msgstr[1] ""
+"Vigileu amb el vostre llenguatge! Aquí no s'admeten les paraules: %s."
#: core/validators.py:288
#, python-format
@@ -3782,11 +3783,11 @@ msgid ""
msgid_plural ""
"Please enter a valid decimal number with a whole part of at most %s digits."
msgstr[0] ""
-"Si us plau, introduïu un número decimal vàlid que la seva part sencera "
-"sigui de com a màxim %s digit."
+"Si us plau, introduïu un número decimal vàlid que la seva part sencera sigui "
+"de com a màxim %s digit."
msgstr[1] ""
-"Si us plau, introduïu un número decimal vàlid que la seva part sencera "
-"sigui de com a màxim %s digits."
+"Si us plau, introduïu un número decimal vàlid que la seva part sencera sigui "
+"de com a màxim %s digits."
#: core/validators.py:450
#, python-format
@@ -3807,12 +3808,14 @@ msgstr "Si us plau, introduïu un número amb punt de coma flotant vàlid."
#: core/validators.py:467
#, python-format
msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "Assegureu-vos de que el fitxer que heu enviat té, com a mínim, %s bytes."
+msgstr ""
+"Assegureu-vos de que el fitxer que heu enviat té, com a mínim, %s bytes."
#: core/validators.py:468
#, python-format
msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "Assegureu-vos de que el fitxer que heu enviat té, com a màxim %s bytes."
+msgstr ""
+"Assegureu-vos de que el fitxer que heu enviat té, com a màxim %s bytes."
#: core/validators.py:485
msgid "The format for this field is wrong."
@@ -3894,58 +3897,58 @@ msgstr ""
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr "Ja existeix un %(object)s del tipus %(type)s amb aquest %(field)s."
-#: db/models/fields/__init__.py:52
+#: db/models/fields/__init__.py:54
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "Ja existeix %(optname)s amb aquest %(fieldname)s."
-#: db/models/fields/__init__.py:161 db/models/fields/__init__.py:327
-#: db/models/fields/__init__.py:759 db/models/fields/__init__.py:770
+#: db/models/fields/__init__.py:179 db/models/fields/__init__.py:348
+#: db/models/fields/__init__.py:780 db/models/fields/__init__.py:791
#: newforms/fields.py:46 oldforms/__init__.py:374
msgid "This field is required."
msgstr "Aquest camp és obligatori."
-#: db/models/fields/__init__.py:427
+#: db/models/fields/__init__.py:448
msgid "This value must be an integer."
msgstr "Aquest valor ha de ser un enter."
-#: db/models/fields/__init__.py:466
+#: db/models/fields/__init__.py:487
msgid "This value must be either True or False."
msgstr "Aquest valor ha de ser True (Veritat) o False (Fals)"
-#: db/models/fields/__init__.py:490
+#: db/models/fields/__init__.py:511
msgid "This field cannot be null."
msgstr "Aquest camp no pot ser nul."
-#: db/models/fields/__init__.py:668
+#: db/models/fields/__init__.py:689
msgid "This value must be a decimal number."
msgstr "Aquest valor ha de ser un número decimal."
-#: db/models/fields/__init__.py:779
+#: db/models/fields/__init__.py:800
msgid "Enter a valid filename."
msgstr "Introduïu un nom de fitxer vàlid."
-#: db/models/fields/__init__.py:960
+#: db/models/fields/__init__.py:981
msgid "This value must be either None, True or False."
msgstr "Aquest valor ha de ser None (Cap), True (Veritat) o False (Fals)"
-#: db/models/fields/related.py:93
+#: db/models/fields/related.py:94
#, python-format
msgid "Please enter a valid %s."
msgstr "Si us plau, introduïu un %s vàlid."
-#: db/models/fields/related.py:701
+#: db/models/fields/related.py:721
msgid "Separate multiple IDs with commas."
msgstr "Separi múltiples IDs amb comes."
-#: db/models/fields/related.py:703
+#: db/models/fields/related.py:723
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Premeu la tecla \"Control\" -o \"Command\" en un Mac- per seleccionar més "
"d'un valor."
-#: db/models/fields/related.py:750
+#: db/models/fields/related.py:770
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@@ -3965,15 +3968,15 @@ msgstr "Introduïu un valor vàlid."
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Assegureu-vos de que el valor té com a màxim %(max)d caràcters (en té %(length)"
-"d)."
+"Assegureu-vos de que el valor té com a màxim %(max)d caràcters (en té %"
+"(length)d)."
#: newforms/fields.py:125
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
-"Assegureu-vos de que el valor té com a mínim %(min)d caràcters (en té %(length)"
-"d)."
+"Assegureu-vos de que el valor té com a mínim %(min)d caràcters (en té %"
+"(length)d)."
#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211
#, python-format
@@ -4035,7 +4038,8 @@ msgstr "Aquesta URL sembla ser un enllaç trencat."
#: newforms/fields.py:560 newforms/models.py:299
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-"Escolliy una opció vàlida; Aquesta opció no és una de les opcions disponibles."
+"Escolli una opció vàlida; Aquesta opció no és una de les opcions "
+"disponibles."
#: newforms/fields.py:599
#, python-format
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index fc820c6bbcce8..93fc7da545cd7 100644
Binary files a/django/conf/locale/it/LC_MESSAGES/django.mo and b/django/conf/locale/it/LC_MESSAGES/django.mo differ
diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index 0020b0d3f7130..ebe0b5a45e47b 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@@ -1,13 +1,14 @@
# translation of django.po to Italiano
+# Nicola Larosa , 2008.
# Italian translation of Django.
# Copyright (C) 2006 the Lawrence Journal-World
# This file is distributed under the same license as the Django package.
msgid ""
msgstr ""
-"Project-Id-Version: Django\n"
+"Project-Id-Version: django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-02-02 18:31+0100\n"
-"PO-Revision-Date: 2008-03-02 11:40+0100\n"
+"POT-Creation-Date: 2008-05-18 18:39+0200\n"
+"PO-Revision-Date: 2008-05-18 19:13+0200\n"
"Last-Translator: Nicola Larosa \n"
"Language-Team: Italiano\n"
"MIME-Version: 1.0\n"
@@ -16,183 +17,191 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: conf/global_settings.py:39
+#: conf/global_settings.py:43
msgid "Arabic"
msgstr "Arabo"
-#: conf/global_settings.py:40
+#: conf/global_settings.py:44
msgid "Bengali"
-msgstr ""
+msgstr "Bengali"
-#: conf/global_settings.py:41
+#: conf/global_settings.py:45
msgid "Bulgarian"
msgstr "Bulgaro"
-#: conf/global_settings.py:42
+#: conf/global_settings.py:46
msgid "Catalan"
msgstr "Catalano"
-#: conf/global_settings.py:43
+#: conf/global_settings.py:47
msgid "Czech"
msgstr "Ceco"
-#: conf/global_settings.py:44
+#: conf/global_settings.py:48
msgid "Welsh"
msgstr "Gallese"
-#: conf/global_settings.py:45
+#: conf/global_settings.py:49
msgid "Danish"
msgstr "Danese"
-#: conf/global_settings.py:46
+#: conf/global_settings.py:50
msgid "German"
msgstr "Tedesco"
-#: conf/global_settings.py:47
+#: conf/global_settings.py:51
msgid "Greek"
msgstr "Greco"
-#: conf/global_settings.py:48
+#: conf/global_settings.py:52
msgid "English"
msgstr "Inglese"
-#: conf/global_settings.py:49
+#: conf/global_settings.py:53
msgid "Spanish"
msgstr "Spagnolo"
-#: conf/global_settings.py:50
+#: conf/global_settings.py:54
msgid "Argentinean Spanish"
msgstr "Spagnolo argentino"
-#: conf/global_settings.py:51
+#: conf/global_settings.py:55
+msgid "Basque"
+msgstr "Basco"
+
+#: conf/global_settings.py:56
msgid "Persian"
msgstr "Persiano"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:57
msgid "Finnish"
msgstr "Finlandese"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:58
msgid "French"
msgstr "Francese"
-#: conf/global_settings.py:54
-msgid "Gaeilge"
-msgstr "Gaelico"
+#: conf/global_settings.py:59
+msgid "Irish"
+msgstr "Irlandese"
-#: conf/global_settings.py:55
+#: conf/global_settings.py:60
msgid "Galician"
msgstr "Galiziano"
-#: conf/global_settings.py:56
+#: conf/global_settings.py:61
msgid "Hungarian"
msgstr "Ungherese"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:62
msgid "Hebrew"
msgstr "Ebraico"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:63
msgid "Croatian"
msgstr "Croato"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:64
msgid "Icelandic"
msgstr "Islandese"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:65
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:66
msgid "Japanese"
msgstr "Giapponese"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:67
+msgid "Georgian"
+msgstr "Georgiano"
+
+#: conf/global_settings.py:68
msgid "Korean"
msgstr "Coreano"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:69
msgid "Khmer"
-msgstr ""
+msgstr "Khmer"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:70
msgid "Kannada"
-msgstr ""
+msgstr "Kannada"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:71
msgid "Latvian"
msgstr "Lettone"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:72
msgid "Macedonian"
msgstr "Macedone"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:73
msgid "Dutch"
msgstr "Olandese"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:74
msgid "Norwegian"
msgstr "Norvegese"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:75
msgid "Polish"
msgstr "Polacco"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:76
msgid "Portugese"
msgstr "Portoghese"
-#: conf/global_settings.py:71
-msgid "Brazilian"
-msgstr "Brasiliano"
+#: conf/global_settings.py:77
+msgid "Brazilian Portuguese"
+msgstr "Brasiliano Portoghese"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:78
msgid "Romanian"
msgstr "Rumeno"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:79
msgid "Russian"
msgstr "Russo"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:80
msgid "Slovak"
msgstr "Slovacco"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:81
msgid "Slovenian"
msgstr "Sloveno"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:82
msgid "Serbian"
msgstr "Serbo"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:83
msgid "Swedish"
msgstr "Svedese"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:84
msgid "Tamil"
-msgstr ""
+msgstr "Tamil"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:85
msgid "Telugu"
-msgstr ""
+msgstr "Telugu"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:86
msgid "Turkish"
msgstr "Turco"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:87
msgid "Ukrainian"
msgstr "Ucraino"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:88
msgid "Simplified Chinese"
msgstr "Cinese semplificato"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:89
msgid "Traditional Chinese"
msgstr "Cinese tradizionale"
@@ -471,7 +480,7 @@ msgid "Password:"
msgstr "Password:"
#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:25
+#: contrib/admin/views/decorators.py:31
msgid "Log in"
msgstr "Accedi"
@@ -797,7 +806,7 @@ msgstr "La password è stata cambiata correttamente."
msgid "Change password: %s"
msgstr "Cambia la password: %s"
-#: contrib/admin/views/decorators.py:11 contrib/auth/forms.py:60
+#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60
msgid ""
"Please enter a correct username and password. Note that both fields are case-"
"sensitive."
@@ -805,7 +814,7 @@ msgstr ""
"Inserire nome utente e password corretti. Entrambi i campi sono case "
"sensitive."
-#: contrib/admin/views/decorators.py:63
+#: contrib/admin/views/decorators.py:69
msgid ""
"Please log in again, because your session has expired. Don't worry: Your "
"submission has been saved."
@@ -813,7 +822,7 @@ msgstr ""
"La sessione è scaduta: occorre accedere nuovamente. I dati inseriti sono "
"stati comunque salvati."
-#: contrib/admin/views/decorators.py:70
+#: contrib/admin/views/decorators.py:76
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@@ -821,15 +830,15 @@ msgstr ""
"Il browser non sembra configurato per accettare i cookie. Una volta "
"abilitati, ricaricare la pagina e riprovare."
-#: contrib/admin/views/decorators.py:84
-msgid "Usernames cannot contain the '@' character."
-msgstr "I nomi utente non possono contenere il carattere '@'."
-
-#: contrib/admin/views/decorators.py:86
+#: contrib/admin/views/decorators.py:89
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr "Il nome utente non è costituito dall'indirizzo e-mail. Provare con '%s'."
+#: contrib/admin/views/decorators.py:93
+msgid "Usernames cannot contain the '@' character."
+msgstr "I nomi utente non possono contenere il carattere '@'."
+
#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
#: contrib/admin/views/doc.py:52
msgid "tag:"
@@ -953,7 +962,7 @@ msgstr "Testo"
msgid "Time"
msgstr "Ora"
-#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:7
+#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:8
msgid "URL"
msgstr "URL"
@@ -1060,7 +1069,7 @@ msgstr "Scegli %s"
msgid "Select %s to change"
msgstr "Scegli %s da modificare"
-#: contrib/admin/views/main.py:784
+#: contrib/admin/views/main.py:765
msgid "Database error"
msgstr "Errore nel database"
@@ -1179,10 +1188,10 @@ msgstr "attivo"
#: contrib/auth/models.py:137
msgid ""
-"Designates whether this user can log into the Django admin. Unselect this "
+"Designates whether this user should be treated as active. Unselect this "
"instead of deleting accounts."
msgstr ""
-"Indica se l'utente può accedere all'amministrazione di Django. Deselezionare "
+"Indica se l'utente debba essere considerato attivo. Deselezionare "
"qui, piuttosto che cancellare gli account."
#: contrib/auth/models.py:138
@@ -1544,41 +1553,41 @@ msgstr "ID commento non valido"
msgid "No voting for yourself"
msgstr "Impossibile votare per se stessi"
-#: contrib/contenttypes/models.py:37
+#: contrib/contenttypes/models.py:67
msgid "python model class name"
msgstr "nome della classe del modello Python"
-#: contrib/contenttypes/models.py:40
+#: contrib/contenttypes/models.py:71
msgid "content type"
msgstr "content type"
-#: contrib/contenttypes/models.py:41
+#: contrib/contenttypes/models.py:72
msgid "content types"
msgstr "content type"
-#: contrib/flatpages/models.py:8
+#: contrib/flatpages/models.py:9
msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
msgstr ""
"Esempio: '/about/contact/'. Assicurarsi di inserire le barre diagonali "
"iniziali e finali."
-#: contrib/flatpages/models.py:9
+#: contrib/flatpages/models.py:10
msgid "title"
msgstr "titolo"
-#: contrib/flatpages/models.py:10
+#: contrib/flatpages/models.py:11
msgid "content"
msgstr "contenuto"
-#: contrib/flatpages/models.py:11
+#: contrib/flatpages/models.py:12
msgid "enable comments"
msgstr "abilita commenti"
-#: contrib/flatpages/models.py:12
+#: contrib/flatpages/models.py:13
msgid "template name"
msgstr "nome modello"
-#: contrib/flatpages/models.py:13
+#: contrib/flatpages/models.py:14
msgid ""
"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
"will use 'flatpages/default.html'."
@@ -1586,128 +1595,132 @@ msgstr ""
"Esempio: 'flatpages/contact_page.html'. Se non specificato, il sistema userà "
"'flatpages/default.html'."
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:15
msgid "registration required"
msgstr "registrazione obbligatoria"
-#: contrib/flatpages/models.py:14
+#: contrib/flatpages/models.py:15
msgid "If this is checked, only logged-in users will be able to view the page."
msgstr ""
"Se selezionato, solo gli utenti che hanno effettuato l'accesso potranno "
"vedere la pagina."
-#: contrib/flatpages/models.py:18
+#: contrib/flatpages/models.py:20
msgid "flat page"
msgstr "pagina statica"
-#: contrib/flatpages/models.py:19
+#: contrib/flatpages/models.py:21
msgid "flat pages"
msgstr "pagine statiche"
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/flatpages/models.py:27
+msgid "Advanced options"
+msgstr "Opzioni avanzate"
+
+#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr "º"
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "st"
msgstr "º"
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "nd"
msgstr "º"
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "rd"
msgstr "º"
-#: contrib/humanize/templatetags/humanize.py:52
+#: contrib/humanize/templatetags/humanize.py:51
#, python-format
msgid "%(value).1f million"
msgid_plural "%(value).1f million"
msgstr[0] "%(value).1f milione"
msgstr[1] "%(value).1f milioni"
-#: contrib/humanize/templatetags/humanize.py:55
+#: contrib/humanize/templatetags/humanize.py:54
#, python-format
msgid "%(value).1f billion"
msgid_plural "%(value).1f billion"
msgstr[0] "%(value).1f miliardo"
msgstr[1] "%(value).1f miliardi"
-#: contrib/humanize/templatetags/humanize.py:58
+#: contrib/humanize/templatetags/humanize.py:57
#, python-format
msgid "%(value).1f trillion"
msgid_plural "%(value).1f trillion"
msgstr[0] "%(value).1f migliaio di miliardi"
msgstr[1] "%(value).1f migliaia di miliardi"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "one"
msgstr "uno"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "two"
msgstr "due"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "three"
msgstr "tre"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "four"
msgstr "quattro"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "five"
msgstr "cinque"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "six"
msgstr "sei"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "seven"
msgstr "sette"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "eight"
msgstr "otto"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "nine"
msgstr "nove"
-#: contrib/humanize/templatetags/humanize.py:94
+#: contrib/humanize/templatetags/humanize.py:93
msgid "today"
msgstr "oggi"
-#: contrib/humanize/templatetags/humanize.py:96
+#: contrib/humanize/templatetags/humanize.py:95
msgid "tomorrow"
msgstr "domani"
-#: contrib/humanize/templatetags/humanize.py:98
+#: contrib/humanize/templatetags/humanize.py:97
msgid "yesterday"
msgstr "ieri"
-#: contrib/localflavor/ar/forms.py:28
+#: contrib/localflavor/ar/forms.py:27
msgid "Enter a postal code in the format NNNN or ANNNNAAA."
msgstr "Inserire un codice postale nel formato NNNN o ANNNNAAA."
-#: contrib/localflavor/ar/forms.py:50 contrib/localflavor/br/forms.py:96
+#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96
#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23
#: contrib/localflavor/pe/forms.py:51
msgid "This field requires only numbers."
msgstr "In questo campo possono essere solo presenti numeri."
-#: contrib/localflavor/ar/forms.py:51
+#: contrib/localflavor/ar/forms.py:50
msgid "This field requires 7 or 8 digits."
msgstr "Questo campo richiede 7 o 8 cifre."
-#: contrib/localflavor/ar/forms.py:80
+#: contrib/localflavor/ar/forms.py:79
msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
msgstr "Inserire un CUIT valido nel formato XX-XXXXXXXX-X o XXXXXXXXXXXX."
-#: contrib/localflavor/ar/forms.py:81
+#: contrib/localflavor/ar/forms.py:80
msgid "Invalid CUIT."
msgstr "CUIT non valido."
@@ -1727,7 +1740,9 @@ msgstr "I numeri di telefono devono essere in formato XX-XXXX-XXXX ."
msgid ""
"Select a valid brazilian state. That state is not one of the available "
"states."
-msgstr "Scegliere uno stato brasiliano valido. Questo stato non è uno di quelli disponibili."
+msgstr ""
+"Scegliere uno stato brasiliano valido. Questo stato non è uno di quelli "
+"disponibili."
#: contrib/localflavor/br/forms.py:94
msgid "Invalid CPF number."
@@ -1743,7 +1758,7 @@ msgstr "Numero CNPJ non valido."
#: contrib/localflavor/br/forms.py:136
msgid "This field requires at least 14 digits"
-msgstr "Questo campo richiede almeno 14 cifre."
+msgstr "Questo campo richiede almeno 14 cifre"
#: contrib/localflavor/ca/forms.py:17
msgid "Enter a postal code in the format XXX XXX."
@@ -1752,28 +1767,28 @@ msgstr "Inserire un codice postale nel formato XXX XXX."
#: contrib/localflavor/ca/forms.py:88
msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
msgstr ""
-"Inserire un numero di assicurazione sociale canadese valido, nel formato "
-"XXX-XXX-XXX."
+"Inserire un numero di assicurazione sociale canadese valido, nel formato XXX-"
+"XXX-XXX."
#: contrib/localflavor/ch/ch_states.py:5
msgid "Aargau"
-msgstr ""
+msgstr "Aargau"
#: contrib/localflavor/ch/ch_states.py:6
msgid "Appenzell Innerrhoden"
-msgstr ""
+msgstr "Appenzell Innerrhoden"
#: contrib/localflavor/ch/ch_states.py:7
msgid "Appenzell Ausserrhoden"
-msgstr ""
+msgstr "Appenzell Ausserrhoden"
#: contrib/localflavor/ch/ch_states.py:8
msgid "Basel-Stadt"
-msgstr ""
+msgstr "Basel-Stadt"
#: contrib/localflavor/ch/ch_states.py:9
msgid "Basel-Land"
-msgstr ""
+msgstr "Basel-Land"
#: contrib/localflavor/ch/ch_states.py:10
msgid "Berne"
@@ -1789,15 +1804,15 @@ msgstr "Ginevra"
#: contrib/localflavor/ch/ch_states.py:13
msgid "Glarus"
-msgstr ""
+msgstr "Glarus"
#: contrib/localflavor/ch/ch_states.py:14
msgid "Graubuenden"
-msgstr ""
+msgstr "Graubuenden"
#: contrib/localflavor/ch/ch_states.py:15
msgid "Jura"
-msgstr ""
+msgstr "Jura"
#: contrib/localflavor/ch/ch_states.py:16
msgid "Lucerne"
@@ -1805,55 +1820,55 @@ msgstr "Lucerna"
#: contrib/localflavor/ch/ch_states.py:17
msgid "Neuchatel"
-msgstr ""
+msgstr "Neuchatel"
#: contrib/localflavor/ch/ch_states.py:18
msgid "Nidwalden"
-msgstr ""
+msgstr "Nidwalden"
#: contrib/localflavor/ch/ch_states.py:19
msgid "Obwalden"
-msgstr ""
+msgstr "Obwalden"
#: contrib/localflavor/ch/ch_states.py:20
msgid "Schaffhausen"
-msgstr ""
+msgstr "Schaffhausen"
#: contrib/localflavor/ch/ch_states.py:21
msgid "Schwyz"
-msgstr ""
+msgstr "Schwyz"
#: contrib/localflavor/ch/ch_states.py:22
msgid "Solothurn"
-msgstr ""
+msgstr "Solothurn"
#: contrib/localflavor/ch/ch_states.py:23
msgid "St. Gallen"
-msgstr ""
+msgstr "St. Gallen"
#: contrib/localflavor/ch/ch_states.py:24
msgid "Thurgau"
-msgstr ""
+msgstr "Thurgau"
#: contrib/localflavor/ch/ch_states.py:25
msgid "Ticino"
-msgstr ""
+msgstr "Ticino"
#: contrib/localflavor/ch/ch_states.py:26
msgid "Uri"
-msgstr ""
+msgstr "Uri"
#: contrib/localflavor/ch/ch_states.py:27
msgid "Valais"
-msgstr ""
+msgstr "Valais"
#: contrib/localflavor/ch/ch_states.py:28
msgid "Vaud"
-msgstr ""
+msgstr "Vaud"
#: contrib/localflavor/ch/ch_states.py:29
msgid "Zug"
-msgstr ""
+msgstr "Zug"
#: contrib/localflavor/ch/ch_states.py:30
msgid "Zurich"
@@ -1885,7 +1900,7 @@ msgstr "Il RUT cileno non è valido."
#: contrib/localflavor/de/de_states.py:5
msgid "Baden-Wuerttemberg"
-msgstr ""
+msgstr "Baden-Wuerttemberg"
#: contrib/localflavor/de/de_states.py:6
msgid "Bavaria"
@@ -1909,11 +1924,11 @@ msgstr "Amburgo"
#: contrib/localflavor/de/de_states.py:11
msgid "Hessen"
-msgstr ""
+msgstr "Hessen"
#: contrib/localflavor/de/de_states.py:12
msgid "Mecklenburg-Western Pomerania"
-msgstr ""
+msgstr "Mecklenburg-Pomerania Ovest"
#: contrib/localflavor/de/de_states.py:13
msgid "Lower Saxony"
@@ -1921,15 +1936,15 @@ msgstr "Bassa Sassonia"
#: contrib/localflavor/de/de_states.py:14
msgid "North Rhine-Westphalia"
-msgstr ""
+msgstr "Reno Nord-Wesfalia"
#: contrib/localflavor/de/de_states.py:15
msgid "Rhineland-Palatinate"
-msgstr ""
+msgstr "Rhineland-Palatinate"
#: contrib/localflavor/de/de_states.py:16
msgid "Saarland"
-msgstr ""
+msgstr "Saarland"
#: contrib/localflavor/de/de_states.py:17
msgid "Saxony"
@@ -1937,15 +1952,15 @@ msgstr "Sassonia"
#: contrib/localflavor/de/de_states.py:18
msgid "Saxony-Anhalt"
-msgstr ""
+msgstr "Saxony-Anhalt"
#: contrib/localflavor/de/de_states.py:19
msgid "Schleswig-Holstein"
-msgstr ""
+msgstr "Schleswig-Holstein"
#: contrib/localflavor/de/de_states.py:20
msgid "Thuringia"
-msgstr ""
+msgstr "Thuringia"
#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12
#: contrib/localflavor/fr/forms.py:15
@@ -1962,31 +1977,31 @@ msgstr ""
#: contrib/localflavor/es/es_provinces.py:5
msgid "Arava"
-msgstr ""
+msgstr "Arava"
#: contrib/localflavor/es/es_provinces.py:6
msgid "Albacete"
-msgstr ""
+msgstr "Albacete"
#: contrib/localflavor/es/es_provinces.py:7
msgid "Alacant"
-msgstr ""
+msgstr "Alacant"
#: contrib/localflavor/es/es_provinces.py:8
msgid "Almeria"
-msgstr ""
+msgstr "Almeria"
#: contrib/localflavor/es/es_provinces.py:9
msgid "Avila"
-msgstr ""
+msgstr "Avila"
#: contrib/localflavor/es/es_provinces.py:10
msgid "Badajoz"
-msgstr ""
+msgstr "Badajoz"
#: contrib/localflavor/es/es_provinces.py:11
msgid "Illes Balears"
-msgstr ""
+msgstr "Isole Baleari"
#: contrib/localflavor/es/es_provinces.py:12
msgid "Barcelona"
@@ -1994,11 +2009,11 @@ msgstr "Barcellona"
#: contrib/localflavor/es/es_provinces.py:13
msgid "Burgos"
-msgstr ""
+msgstr "Burgos"
#: contrib/localflavor/es/es_provinces.py:14
msgid "Caceres"
-msgstr ""
+msgstr "Caceres"
#: contrib/localflavor/es/es_provinces.py:15
msgid "Cadiz"
@@ -2006,122 +2021,122 @@ msgstr "Cadice"
#: contrib/localflavor/es/es_provinces.py:16
msgid "Castello"
-msgstr ""
+msgstr "Castello"
#: contrib/localflavor/es/es_provinces.py:17
msgid "Ciudad Real"
-msgstr ""
+msgstr "Città Reale"
#: contrib/localflavor/es/es_provinces.py:18
msgid "Cordoba"
-msgstr ""
+msgstr "Cordoba"
#: contrib/localflavor/es/es_provinces.py:19
msgid "A Coruna"
-msgstr ""
+msgstr "A Coruna"
#: contrib/localflavor/es/es_provinces.py:20
msgid "Cuenca"
-msgstr ""
+msgstr "Cuenca"
#: contrib/localflavor/es/es_provinces.py:21
msgid "Girona"
-msgstr ""
+msgstr "Girona"
#: contrib/localflavor/es/es_provinces.py:22
msgid "Granada"
-msgstr ""
+msgstr "Granada"
#: contrib/localflavor/es/es_provinces.py:23
msgid "Guadalajara"
-msgstr ""
+msgstr "Guadalajara"
#: contrib/localflavor/es/es_provinces.py:24
msgid "Guipuzkoa"
-msgstr ""
+msgstr "Guipuzkoa"
#: contrib/localflavor/es/es_provinces.py:25
msgid "Huelva"
-msgstr ""
+msgstr "Huelva"
#: contrib/localflavor/es/es_provinces.py:26
msgid "Huesca"
-msgstr ""
+msgstr "Huesca"
#: contrib/localflavor/es/es_provinces.py:27
msgid "Jaen"
-msgstr ""
+msgstr "Jaen"
#: contrib/localflavor/es/es_provinces.py:28
msgid "Leon"
-msgstr ""
+msgstr "Leon"
#: contrib/localflavor/es/es_provinces.py:29
msgid "Lleida"
-msgstr ""
+msgstr "Lleida"
#: contrib/localflavor/es/es_provinces.py:30
#: contrib/localflavor/es/es_regions.py:17
msgid "La Rioja"
-msgstr ""
+msgstr "La Rioja"
#: contrib/localflavor/es/es_provinces.py:31
msgid "Lugo"
-msgstr ""
+msgstr "Lugo"
#: contrib/localflavor/es/es_provinces.py:32
#: contrib/localflavor/es/es_regions.py:18
msgid "Madrid"
-msgstr ""
+msgstr "Madrid"
#: contrib/localflavor/es/es_provinces.py:33
msgid "Malaga"
-msgstr ""
+msgstr "Malaga"
#: contrib/localflavor/es/es_provinces.py:34
msgid "Murcia"
-msgstr ""
+msgstr "Murcia"
#: contrib/localflavor/es/es_provinces.py:35
msgid "Navarre"
-msgstr ""
+msgstr "Navarre"
#: contrib/localflavor/es/es_provinces.py:36
msgid "Ourense"
-msgstr ""
+msgstr "Ourense"
#: contrib/localflavor/es/es_provinces.py:37
msgid "Asturias"
-msgstr ""
+msgstr "Asturias"
#: contrib/localflavor/es/es_provinces.py:38
msgid "Palencia"
-msgstr ""
+msgstr "Palencia"
#: contrib/localflavor/es/es_provinces.py:39
msgid "Las Palmas"
-msgstr ""
+msgstr "Las Palmas"
#: contrib/localflavor/es/es_provinces.py:40
msgid "Pontevedra"
-msgstr ""
+msgstr "Pontevedra"
#: contrib/localflavor/es/es_provinces.py:41
msgid "Salamanca"
-msgstr ""
+msgstr "Salamanca"
#: contrib/localflavor/es/es_provinces.py:42
msgid "Santa Cruz de Tenerife"
-msgstr ""
+msgstr "Santa Croce di Tenerife"
#: contrib/localflavor/es/es_provinces.py:43
#: contrib/localflavor/es/es_regions.py:11
msgid "Cantabria"
-msgstr ""
+msgstr "Cantabria"
#: contrib/localflavor/es/es_provinces.py:44
msgid "Segovia"
-msgstr ""
+msgstr "Segovia"
#: contrib/localflavor/es/es_provinces.py:45
msgid "Seville"
@@ -2129,19 +2144,19 @@ msgstr "Siviglia"
#: contrib/localflavor/es/es_provinces.py:46
msgid "Soria"
-msgstr ""
+msgstr "Soria"
#: contrib/localflavor/es/es_provinces.py:47
msgid "Tarragona"
-msgstr ""
+msgstr "Tarragona"
#: contrib/localflavor/es/es_provinces.py:48
msgid "Teruel"
-msgstr ""
+msgstr "Teruel"
#: contrib/localflavor/es/es_provinces.py:49
msgid "Toledo"
-msgstr ""
+msgstr "Toledo"
#: contrib/localflavor/es/es_provinces.py:50
msgid "Valencia"
@@ -2149,35 +2164,35 @@ msgstr "Valenza"
#: contrib/localflavor/es/es_provinces.py:51
msgid "Valladolid"
-msgstr ""
+msgstr "Valladolid"
#: contrib/localflavor/es/es_provinces.py:52
msgid "Bizkaia"
-msgstr ""
+msgstr "Bizkaia"
#: contrib/localflavor/es/es_provinces.py:53
msgid "Zamora"
-msgstr ""
+msgstr "Zamora"
#: contrib/localflavor/es/es_provinces.py:54
msgid "Zaragoza"
-msgstr ""
+msgstr "Saragozza"
#: contrib/localflavor/es/es_provinces.py:55
msgid "Ceuta"
-msgstr ""
+msgstr "Ceuta"
#: contrib/localflavor/es/es_provinces.py:56
msgid "Melilla"
-msgstr ""
+msgstr "Melilla"
#: contrib/localflavor/es/es_regions.py:5
msgid "Andalusia"
-msgstr ""
+msgstr "Andalusia"
#: contrib/localflavor/es/es_regions.py:6
msgid "Aragon"
-msgstr ""
+msgstr "Aragon"
#: contrib/localflavor/es/es_regions.py:7
msgid "Principality of Asturias"
@@ -2197,11 +2212,11 @@ msgstr "Isole Canarie"
#: contrib/localflavor/es/es_regions.py:12
msgid "Castile-La Mancha"
-msgstr ""
+msgstr "Castile-La Mancha"
#: contrib/localflavor/es/es_regions.py:13
msgid "Castile and Leon"
-msgstr ""
+msgstr "Castile and Leon"
#: contrib/localflavor/es/es_regions.py:14
msgid "Catalonia"
@@ -2221,7 +2236,7 @@ msgstr "Regione Murzia"
#: contrib/localflavor/es/es_regions.py:20
msgid "Foral Community of Navarre"
-msgstr ""
+msgstr "Comunità Forale di Navarra"
#: contrib/localflavor/es/es_regions.py:21
msgid "Valencian Community"
@@ -2236,8 +2251,8 @@ msgid ""
"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
"9XXXXXXXX."
msgstr ""
-"Inserire un numero telefonico valido in uno dei formati 6XXXXXXXX, 8XXXXXXXX o "
-"9XXXXXXXX."
+"Inserire un numero telefonico valido in uno dei formati 6XXXXXXXX, 8XXXXXXXX "
+"o 9XXXXXXXX."
#: contrib/localflavor/es/forms.py:66
msgid "Please enter a valid NIF, NIE, or CIF."
@@ -2262,8 +2277,8 @@ msgstr "Checksum non valido per il CIF."
#: contrib/localflavor/es/forms.py:142
msgid "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
msgstr ""
-"Inserire un numero di conto corrente bancario valido nel formato "
-"XXXX-XXXX-XX-XXXXXXXXXX."
+"Inserire un numero di conto corrente bancario valido nel formato XXXX-XXXX-"
+"XX-XXXXXXXXXX."
#: contrib/localflavor/es/forms.py:143
msgid "Invalid checksum for bank account number."
@@ -2299,229 +2314,229 @@ msgstr "Inserire un numero di assistenza sociale valido."
msgid "Enter a valid VAT number."
msgstr "Inserire una partita IVA valida."
-#: contrib/localflavor/jp/forms.py:19
+#: contrib/localflavor/jp/forms.py:17
msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
msgstr "Inserire un codice postale nel formato XXXXXXX o XXX-XXXX ."
#: contrib/localflavor/jp/jp_prefectures.py:4
msgid "Hokkaido"
-msgstr ""
+msgstr "Hokkaido"
#: contrib/localflavor/jp/jp_prefectures.py:5
msgid "Aomori"
-msgstr ""
+msgstr "Aomori"
#: contrib/localflavor/jp/jp_prefectures.py:6
msgid "Iwate"
-msgstr ""
+msgstr "Iwate"
#: contrib/localflavor/jp/jp_prefectures.py:7
msgid "Miyagi"
-msgstr ""
+msgstr "Miyagi"
#: contrib/localflavor/jp/jp_prefectures.py:8
msgid "Akita"
-msgstr ""
+msgstr "Akita"
#: contrib/localflavor/jp/jp_prefectures.py:9
msgid "Yamagata"
-msgstr ""
+msgstr "Yamagata"
#: contrib/localflavor/jp/jp_prefectures.py:10
msgid "Fukushima"
-msgstr ""
+msgstr "Fukushima"
#: contrib/localflavor/jp/jp_prefectures.py:11
msgid "Ibaraki"
-msgstr ""
+msgstr "Ibaraki"
#: contrib/localflavor/jp/jp_prefectures.py:12
msgid "Tochigi"
-msgstr ""
+msgstr "Tochigi"
#: contrib/localflavor/jp/jp_prefectures.py:13
msgid "Gunma"
-msgstr ""
+msgstr "Gunma"
#: contrib/localflavor/jp/jp_prefectures.py:14
msgid "Saitama"
-msgstr ""
+msgstr "Saitama"
#: contrib/localflavor/jp/jp_prefectures.py:15
msgid "Chiba"
-msgstr ""
+msgstr "Chiba"
#: contrib/localflavor/jp/jp_prefectures.py:16
msgid "Tokyo"
-msgstr ""
+msgstr "Tokyo"
#: contrib/localflavor/jp/jp_prefectures.py:17
msgid "Kanagawa"
-msgstr ""
+msgstr "Kanagawa"
#: contrib/localflavor/jp/jp_prefectures.py:18
msgid "Yamanashi"
-msgstr ""
+msgstr "Yamanashi"
#: contrib/localflavor/jp/jp_prefectures.py:19
msgid "Nagano"
-msgstr ""
+msgstr "Nagano"
#: contrib/localflavor/jp/jp_prefectures.py:20
msgid "Niigata"
-msgstr ""
+msgstr "Niigata"
#: contrib/localflavor/jp/jp_prefectures.py:21
msgid "Toyama"
-msgstr ""
+msgstr "Toyama"
#: contrib/localflavor/jp/jp_prefectures.py:22
msgid "Ishikawa"
-msgstr ""
+msgstr "Ishikawa"
#: contrib/localflavor/jp/jp_prefectures.py:23
msgid "Fukui"
-msgstr ""
+msgstr "Fukui"
#: contrib/localflavor/jp/jp_prefectures.py:24
msgid "Gifu"
-msgstr ""
+msgstr "Gifu"
#: contrib/localflavor/jp/jp_prefectures.py:25
msgid "Shizuoka"
-msgstr ""
+msgstr "Shizuoka"
#: contrib/localflavor/jp/jp_prefectures.py:26
msgid "Aichi"
-msgstr ""
+msgstr "Aichi"
#: contrib/localflavor/jp/jp_prefectures.py:27
msgid "Mie"
-msgstr ""
+msgstr "Mie"
#: contrib/localflavor/jp/jp_prefectures.py:28
msgid "Shiga"
-msgstr ""
+msgstr "Shiga"
#: contrib/localflavor/jp/jp_prefectures.py:29
msgid "Kyoto"
-msgstr ""
+msgstr "Kyoto"
#: contrib/localflavor/jp/jp_prefectures.py:30
msgid "Osaka"
-msgstr ""
+msgstr "Osaka"
#: contrib/localflavor/jp/jp_prefectures.py:31
msgid "Hyogo"
-msgstr ""
+msgstr "Hyogo"
#: contrib/localflavor/jp/jp_prefectures.py:32
msgid "Nara"
-msgstr ""
+msgstr "Nara"
#: contrib/localflavor/jp/jp_prefectures.py:33
msgid "Wakayama"
-msgstr ""
+msgstr "Wakayama"
#: contrib/localflavor/jp/jp_prefectures.py:34
msgid "Tottori"
-msgstr ""
+msgstr "Tottori"
#: contrib/localflavor/jp/jp_prefectures.py:35
msgid "Shimane"
-msgstr ""
+msgstr "Shimane"
#: contrib/localflavor/jp/jp_prefectures.py:36
msgid "Okayama"
-msgstr ""
+msgstr "Okayama"
#: contrib/localflavor/jp/jp_prefectures.py:37
msgid "Hiroshima"
-msgstr ""
+msgstr "Hiroshima"
#: contrib/localflavor/jp/jp_prefectures.py:38
msgid "Yamaguchi"
-msgstr ""
+msgstr "Yamaguchi"
#: contrib/localflavor/jp/jp_prefectures.py:39
msgid "Tokushima"
-msgstr ""
+msgstr "Tokushima"
#: contrib/localflavor/jp/jp_prefectures.py:40
msgid "Kagawa"
-msgstr ""
+msgstr "Kagawa"
#: contrib/localflavor/jp/jp_prefectures.py:41
msgid "Ehime"
-msgstr ""
+msgstr "Ehime"
#: contrib/localflavor/jp/jp_prefectures.py:42
msgid "Kochi"
-msgstr ""
+msgstr "Kochi"
#: contrib/localflavor/jp/jp_prefectures.py:43
msgid "Fukuoka"
-msgstr ""
+msgstr "Fukuoka"
#: contrib/localflavor/jp/jp_prefectures.py:44
msgid "Saga"
-msgstr ""
+msgstr "Saga"
#: contrib/localflavor/jp/jp_prefectures.py:45
msgid "Nagasaki"
-msgstr ""
+msgstr "Nagasaki"
#: contrib/localflavor/jp/jp_prefectures.py:46
msgid "Kumamoto"
-msgstr ""
+msgstr "Kumamoto"
#: contrib/localflavor/jp/jp_prefectures.py:47
msgid "Oita"
-msgstr ""
+msgstr "Oita"
#: contrib/localflavor/jp/jp_prefectures.py:48
msgid "Miyazaki"
-msgstr ""
+msgstr "Miyazaki"
#: contrib/localflavor/jp/jp_prefectures.py:49
msgid "Kagoshima"
-msgstr ""
+msgstr "Kagoshima"
#: contrib/localflavor/jp/jp_prefectures.py:50
msgid "Okinawa"
-msgstr ""
+msgstr "Okinawa"
#: contrib/localflavor/mx/mx_states.py:12
msgid "Aguascalientes"
-msgstr ""
+msgstr "Aguascalientes"
#: contrib/localflavor/mx/mx_states.py:13
msgid "Baja California"
-msgstr ""
+msgstr "Baia California"
#: contrib/localflavor/mx/mx_states.py:14
msgid "Baja California Sur"
-msgstr ""
+msgstr "Baia California Sud"
#: contrib/localflavor/mx/mx_states.py:15
msgid "Campeche"
-msgstr ""
+msgstr "Campeche"
#: contrib/localflavor/mx/mx_states.py:16
msgid "Chihuahua"
-msgstr ""
+msgstr "Chihuahua"
#: contrib/localflavor/mx/mx_states.py:17
msgid "Chiapas"
-msgstr ""
+msgstr "Chiapas"
#: contrib/localflavor/mx/mx_states.py:18
msgid "Coahuila"
-msgstr ""
+msgstr "Coahuila"
#: contrib/localflavor/mx/mx_states.py:19
msgid "Colima"
-msgstr ""
+msgstr "Colima"
#: contrib/localflavor/mx/mx_states.py:20
msgid "Distrito Federal"
@@ -2529,23 +2544,23 @@ msgstr "Distretto Federale"
#: contrib/localflavor/mx/mx_states.py:21
msgid "Durango"
-msgstr ""
+msgstr "Durango"
#: contrib/localflavor/mx/mx_states.py:22
msgid "Guerrero"
-msgstr ""
+msgstr "Guerrero"
#: contrib/localflavor/mx/mx_states.py:23
msgid "Guanajuato"
-msgstr ""
+msgstr "Guanajuato"
#: contrib/localflavor/mx/mx_states.py:24
msgid "Hidalgo"
-msgstr ""
+msgstr "Hidalgo"
#: contrib/localflavor/mx/mx_states.py:25
msgid "Jalisco"
-msgstr ""
+msgstr "Jalisco"
#: contrib/localflavor/mx/mx_states.py:26
msgid "Estado de México"
@@ -2553,15 +2568,15 @@ msgstr "Stato del Messico"
#: contrib/localflavor/mx/mx_states.py:27
msgid "Michoacán"
-msgstr ""
+msgstr "Michoacán"
#: contrib/localflavor/mx/mx_states.py:28
msgid "Morelos"
-msgstr ""
+msgstr "Morelos"
#: contrib/localflavor/mx/mx_states.py:29
msgid "Nayarit"
-msgstr ""
+msgstr "Nayarit"
#: contrib/localflavor/mx/mx_states.py:30
msgid "Nuevo León"
@@ -2569,55 +2584,55 @@ msgstr "Nuova Leòn"
#: contrib/localflavor/mx/mx_states.py:31
msgid "Oaxaca"
-msgstr ""
+msgstr "Oaxaca"
#: contrib/localflavor/mx/mx_states.py:32
msgid "Puebla"
-msgstr ""
+msgstr "Puebla"
#: contrib/localflavor/mx/mx_states.py:33
msgid "Querétaro"
-msgstr ""
+msgstr "Querétaro"
#: contrib/localflavor/mx/mx_states.py:34
msgid "Quintana Roo"
-msgstr ""
+msgstr "Quintana Roo"
#: contrib/localflavor/mx/mx_states.py:35
msgid "Sinaloa"
-msgstr ""
+msgstr "Sinaloa"
#: contrib/localflavor/mx/mx_states.py:36
msgid "San Luis Potosí"
-msgstr ""
+msgstr "San Luis Potosí"
#: contrib/localflavor/mx/mx_states.py:37
msgid "Sonora"
-msgstr ""
+msgstr "Sonora"
#: contrib/localflavor/mx/mx_states.py:38
msgid "Tabasco"
-msgstr ""
+msgstr "Tabasco"
#: contrib/localflavor/mx/mx_states.py:39
msgid "Tamaulipas"
-msgstr ""
+msgstr "Tamaulipas"
#: contrib/localflavor/mx/mx_states.py:40
msgid "Tlaxcala"
-msgstr ""
+msgstr "Tlaxcala"
#: contrib/localflavor/mx/mx_states.py:41
msgid "Veracruz"
-msgstr ""
+msgstr "Veracruz"
#: contrib/localflavor/mx/mx_states.py:42
msgid "Yucatán"
-msgstr ""
+msgstr "Yucatán"
#: contrib/localflavor/mx/mx_states.py:43
msgid "Zacatecas"
-msgstr ""
+msgstr "Zacatecas"
#: contrib/localflavor/nl/forms.py:21
msgid "Enter a valid postal code"
@@ -2633,51 +2648,51 @@ msgstr "Inserire un numero SoFi valido"
#: contrib/localflavor/nl/nl_provinces.py:4
msgid "Drente"
-msgstr ""
+msgstr "Drente"
#: contrib/localflavor/nl/nl_provinces.py:5
msgid "Flevoland"
-msgstr ""
+msgstr "Flevoland"
#: contrib/localflavor/nl/nl_provinces.py:6
msgid "Friesland"
-msgstr ""
+msgstr "Friesland"
#: contrib/localflavor/nl/nl_provinces.py:7
msgid "Gelderland"
-msgstr ""
+msgstr "Gelderland"
#: contrib/localflavor/nl/nl_provinces.py:8
msgid "Groningen"
-msgstr ""
+msgstr "Groningen"
#: contrib/localflavor/nl/nl_provinces.py:9
msgid "Limburg"
-msgstr ""
+msgstr "Limburg"
#: contrib/localflavor/nl/nl_provinces.py:10
msgid "Noord-Brabant"
-msgstr ""
+msgstr "Noord-Brabant"
#: contrib/localflavor/nl/nl_provinces.py:11
msgid "Noord-Holland"
-msgstr ""
+msgstr "Noord-Holland"
#: contrib/localflavor/nl/nl_provinces.py:12
msgid "Overijssel"
-msgstr ""
+msgstr "Overijssel"
#: contrib/localflavor/nl/nl_provinces.py:13
msgid "Utrecht"
-msgstr ""
+msgstr "Utrecht"
#: contrib/localflavor/nl/nl_provinces.py:14
msgid "Zeeland"
-msgstr ""
+msgstr "Zeeland"
#: contrib/localflavor/nl/nl_provinces.py:15
msgid "Zuid-Holland"
-msgstr ""
+msgstr "Zuid-Holland"
#: contrib/localflavor/no/forms.py:33
msgid "Enter a valid Norwegian social security number."
@@ -2701,7 +2716,9 @@ msgstr "Checksum errato per il Numero Identificativo Nazionale."
#: contrib/localflavor/pl/forms.py:72
msgid "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
-msgstr "Inserire un campo di numero d'imposta (NIP) nel formato XXX-XXX-XX-XX o XX-XX-XXX-XXX."
+msgstr ""
+"Inserire un campo di numero d'imposta (NIP) nel formato XXX-XXX-XX-XX o XX-"
+"XX-XXX-XXX."
#: contrib/localflavor/pl/forms.py:73
msgid "Wrong checksum for the Tax Number (NIP)."
@@ -2709,7 +2726,9 @@ msgstr "Checksum errato per il Numero d'Imposta (NIP)."
#: contrib/localflavor/pl/forms.py:112
msgid "National Business Register Number (REGON) consists of 7 or 9 digits."
-msgstr "Il Numero di Registro Nazionale d'Impresa (REGON) è costituito da 7 o 9 cifre."
+msgstr ""
+"Il Numero di Registro Nazionale d'Impresa (REGON) è costituito da 7 o 9 "
+"cifre."
#: contrib/localflavor/pl/forms.py:113
msgid "Wrong checksum for the National Business Register Number (REGON)."
@@ -2725,7 +2744,7 @@ msgstr "Bassa Silesia"
#: contrib/localflavor/pl/pl_voivodeships.py:9
msgid "Kuyavia-Pomerania"
-msgstr ""
+msgstr "Kuyavia-Pomerania"
#: contrib/localflavor/pl/pl_voivodeships.py:10
msgid "Lublin"
@@ -2733,11 +2752,11 @@ msgstr "Lublino"
#: contrib/localflavor/pl/pl_voivodeships.py:11
msgid "Lubusz"
-msgstr ""
+msgstr "Lubusz"
#: contrib/localflavor/pl/pl_voivodeships.py:12
msgid "Lodz"
-msgstr ""
+msgstr "Lodz"
#: contrib/localflavor/pl/pl_voivodeships.py:13
msgid "Lesser Poland"
@@ -2745,35 +2764,35 @@ msgstr "Polonia Minore"
#: contrib/localflavor/pl/pl_voivodeships.py:14
msgid "Masovia"
-msgstr ""
+msgstr "Masovia"
#: contrib/localflavor/pl/pl_voivodeships.py:15
msgid "Opole"
-msgstr ""
+msgstr "Opole"
#: contrib/localflavor/pl/pl_voivodeships.py:16
msgid "Subcarpatia"
-msgstr ""
+msgstr "Subcarpatia"
#: contrib/localflavor/pl/pl_voivodeships.py:17
msgid "Podlasie"
-msgstr ""
+msgstr "Podlasie"
#: contrib/localflavor/pl/pl_voivodeships.py:18
msgid "Pomerania"
-msgstr ""
+msgstr "Pomerania"
#: contrib/localflavor/pl/pl_voivodeships.py:19
msgid "Silesia"
-msgstr ""
+msgstr "Silesia"
#: contrib/localflavor/pl/pl_voivodeships.py:20
msgid "Swietokrzyskie"
-msgstr ""
+msgstr "Swietokrzyskie"
#: contrib/localflavor/pl/pl_voivodeships.py:21
msgid "Warmia-Masuria"
-msgstr ""
+msgstr "Warmia-Masuria"
#: contrib/localflavor/pl/pl_voivodeships.py:22
msgid "Greater Poland"
@@ -2789,323 +2808,323 @@ msgstr "Inserire un codice postale nel formato XXXXX o XXX XX ."
#: contrib/localflavor/sk/sk_districts.py:8
msgid "Banska Bystrica"
-msgstr ""
+msgstr "Banska Bystrica"
#: contrib/localflavor/sk/sk_districts.py:9
msgid "Banska Stiavnica"
-msgstr ""
+msgstr "Banska Stiavnica"
#: contrib/localflavor/sk/sk_districts.py:10
msgid "Bardejov"
-msgstr ""
+msgstr "Bardejov"
#: contrib/localflavor/sk/sk_districts.py:11
msgid "Banovce nad Bebravou"
-msgstr ""
+msgstr "Banovce nad Bebravou"
#: contrib/localflavor/sk/sk_districts.py:12
msgid "Brezno"
-msgstr ""
+msgstr "Brezno"
#: contrib/localflavor/sk/sk_districts.py:13
msgid "Bratislava I"
-msgstr ""
+msgstr "Bratislava I"
#: contrib/localflavor/sk/sk_districts.py:14
msgid "Bratislava II"
-msgstr ""
+msgstr "Bratislava II"
#: contrib/localflavor/sk/sk_districts.py:15
msgid "Bratislava III"
-msgstr ""
+msgstr "Bratislava III"
#: contrib/localflavor/sk/sk_districts.py:16
msgid "Bratislava IV"
-msgstr ""
+msgstr "Bratislava IV"
#: contrib/localflavor/sk/sk_districts.py:17
msgid "Bratislava V"
-msgstr ""
+msgstr "Bratislava V"
#: contrib/localflavor/sk/sk_districts.py:18
msgid "Bytca"
-msgstr ""
+msgstr "Bytca"
#: contrib/localflavor/sk/sk_districts.py:19
msgid "Cadca"
-msgstr ""
+msgstr "Cadca"
#: contrib/localflavor/sk/sk_districts.py:20
msgid "Detva"
-msgstr ""
+msgstr "Detva"
#: contrib/localflavor/sk/sk_districts.py:21
msgid "Dolny Kubin"
-msgstr ""
+msgstr "Dolny Kubin"
#: contrib/localflavor/sk/sk_districts.py:22
msgid "Dunajska Streda"
-msgstr ""
+msgstr "Dunajska Streda"
#: contrib/localflavor/sk/sk_districts.py:23
msgid "Galanta"
-msgstr ""
+msgstr "Galanta"
#: contrib/localflavor/sk/sk_districts.py:24
msgid "Gelnica"
-msgstr ""
+msgstr "Gelnica"
#: contrib/localflavor/sk/sk_districts.py:25
msgid "Hlohovec"
-msgstr ""
+msgstr "Hlohovec"
#: contrib/localflavor/sk/sk_districts.py:26
msgid "Humenne"
-msgstr ""
+msgstr "Humenne"
#: contrib/localflavor/sk/sk_districts.py:27
msgid "Ilava"
-msgstr ""
+msgstr "Ilava"
#: contrib/localflavor/sk/sk_districts.py:28
msgid "Kezmarok"
-msgstr ""
+msgstr "Kezmarok"
#: contrib/localflavor/sk/sk_districts.py:29
msgid "Komarno"
-msgstr ""
+msgstr "Komarno"
#: contrib/localflavor/sk/sk_districts.py:30
msgid "Kosice I"
-msgstr ""
+msgstr "Kosice I"
#: contrib/localflavor/sk/sk_districts.py:31
msgid "Kosice II"
-msgstr ""
+msgstr "Kosice II"
#: contrib/localflavor/sk/sk_districts.py:32
msgid "Kosice III"
-msgstr ""
+msgstr "Kosice III"
#: contrib/localflavor/sk/sk_districts.py:33
msgid "Kosice IV"
-msgstr ""
+msgstr "Kosice IV"
#: contrib/localflavor/sk/sk_districts.py:34
msgid "Kosice - okolie"
-msgstr ""
+msgstr "Kosice - okolie"
#: contrib/localflavor/sk/sk_districts.py:35
msgid "Krupina"
-msgstr ""
+msgstr "Krupina"
#: contrib/localflavor/sk/sk_districts.py:36
msgid "Kysucke Nove Mesto"
-msgstr ""
+msgstr "Kysucke Nove Mesto"
#: contrib/localflavor/sk/sk_districts.py:37
msgid "Levice"
-msgstr ""
+msgstr "Levice"
#: contrib/localflavor/sk/sk_districts.py:38
msgid "Levoca"
-msgstr ""
+msgstr "Levoca"
#: contrib/localflavor/sk/sk_districts.py:39
msgid "Liptovsky Mikulas"
-msgstr ""
+msgstr "Liptovsky Mikulas"
#: contrib/localflavor/sk/sk_districts.py:40
msgid "Lucenec"
-msgstr ""
+msgstr "Lucenec"
#: contrib/localflavor/sk/sk_districts.py:41
msgid "Malacky"
-msgstr ""
+msgstr "Malacky"
#: contrib/localflavor/sk/sk_districts.py:42
msgid "Martin"
-msgstr ""
+msgstr "Martin"
#: contrib/localflavor/sk/sk_districts.py:43
msgid "Medzilaborce"
-msgstr ""
+msgstr "Medzilaborce"
#: contrib/localflavor/sk/sk_districts.py:44
msgid "Michalovce"
-msgstr ""
+msgstr "Michalovce"
#: contrib/localflavor/sk/sk_districts.py:45
msgid "Myjava"
-msgstr ""
+msgstr "Myjava"
#: contrib/localflavor/sk/sk_districts.py:46
msgid "Namestovo"
-msgstr ""
+msgstr "Namestovo"
#: contrib/localflavor/sk/sk_districts.py:47
msgid "Nitra"
-msgstr ""
+msgstr "Nitra"
#: contrib/localflavor/sk/sk_districts.py:48
msgid "Nove Mesto nad Vahom"
-msgstr ""
+msgstr "Nove Mesto nad Vahom"
#: contrib/localflavor/sk/sk_districts.py:49
msgid "Nove Zamky"
-msgstr ""
+msgstr "Nove Zamky"
#: contrib/localflavor/sk/sk_districts.py:50
msgid "Partizanske"
-msgstr ""
+msgstr "Partizanske"
#: contrib/localflavor/sk/sk_districts.py:51
msgid "Pezinok"
-msgstr ""
+msgstr "Pezinok"
#: contrib/localflavor/sk/sk_districts.py:52
msgid "Piestany"
-msgstr ""
+msgstr "Piestany"
#: contrib/localflavor/sk/sk_districts.py:53
msgid "Poltar"
-msgstr ""
+msgstr "Poltar"
#: contrib/localflavor/sk/sk_districts.py:54
msgid "Poprad"
-msgstr ""
+msgstr "Poprad"
#: contrib/localflavor/sk/sk_districts.py:55
msgid "Povazska Bystrica"
-msgstr ""
+msgstr "Povazska Bystrica"
#: contrib/localflavor/sk/sk_districts.py:56
msgid "Presov"
-msgstr ""
+msgstr "Presov"
#: contrib/localflavor/sk/sk_districts.py:57
msgid "Prievidza"
-msgstr ""
+msgstr "Prievidza"
#: contrib/localflavor/sk/sk_districts.py:58
msgid "Puchov"
-msgstr ""
+msgstr "Puchov"
#: contrib/localflavor/sk/sk_districts.py:59
msgid "Revuca"
-msgstr ""
+msgstr "Revuca"
#: contrib/localflavor/sk/sk_districts.py:60
msgid "Rimavska Sobota"
-msgstr ""
+msgstr "Rimavska Sobota"
#: contrib/localflavor/sk/sk_districts.py:61
msgid "Roznava"
-msgstr ""
+msgstr "Roznava"
#: contrib/localflavor/sk/sk_districts.py:62
msgid "Ruzomberok"
-msgstr ""
+msgstr "Ruzomberok"
#: contrib/localflavor/sk/sk_districts.py:63
msgid "Sabinov"
-msgstr ""
+msgstr "Sabinov"
#: contrib/localflavor/sk/sk_districts.py:64
msgid "Senec"
-msgstr ""
+msgstr "Senec"
#: contrib/localflavor/sk/sk_districts.py:65
msgid "Senica"
-msgstr ""
+msgstr "Senica"
#: contrib/localflavor/sk/sk_districts.py:66
msgid "Skalica"
-msgstr ""
+msgstr "Skalica"
#: contrib/localflavor/sk/sk_districts.py:67
msgid "Snina"
-msgstr ""
+msgstr "Snina"
#: contrib/localflavor/sk/sk_districts.py:68
msgid "Sobrance"
-msgstr ""
+msgstr "Sobrance"
#: contrib/localflavor/sk/sk_districts.py:69
msgid "Spisska Nova Ves"
-msgstr ""
+msgstr "Spisska Nova Ves"
#: contrib/localflavor/sk/sk_districts.py:70
msgid "Stara Lubovna"
-msgstr ""
+msgstr "Stara Lubovna"
#: contrib/localflavor/sk/sk_districts.py:71
msgid "Stropkov"
-msgstr ""
+msgstr "Stropkov"
#: contrib/localflavor/sk/sk_districts.py:72
msgid "Svidnik"
-msgstr ""
+msgstr "Svidnik"
#: contrib/localflavor/sk/sk_districts.py:73
msgid "Sala"
-msgstr ""
+msgstr "Sala"
#: contrib/localflavor/sk/sk_districts.py:74
msgid "Topolcany"
-msgstr ""
+msgstr "Topolcany"
#: contrib/localflavor/sk/sk_districts.py:75
msgid "Trebisov"
-msgstr ""
+msgstr "Trebisov"
#: contrib/localflavor/sk/sk_districts.py:76
msgid "Trencin"
-msgstr ""
+msgstr "Trencin"
#: contrib/localflavor/sk/sk_districts.py:77
msgid "Trnava"
-msgstr ""
+msgstr "Trnava"
#: contrib/localflavor/sk/sk_districts.py:78
msgid "Turcianske Teplice"
-msgstr ""
+msgstr "Turcianske Teplice"
#: contrib/localflavor/sk/sk_districts.py:79
msgid "Tvrdosin"
-msgstr ""
+msgstr "Tvrdosin"
#: contrib/localflavor/sk/sk_districts.py:80
msgid "Velky Krtis"
-msgstr ""
+msgstr "Velky Krtis"
#: contrib/localflavor/sk/sk_districts.py:81
msgid "Vranov nad Toplou"
-msgstr ""
+msgstr "Vranov nad Toplou"
#: contrib/localflavor/sk/sk_districts.py:82
msgid "Zlate Moravce"
-msgstr ""
+msgstr "Zlate Moravce"
#: contrib/localflavor/sk/sk_districts.py:83
msgid "Zvolen"
-msgstr ""
+msgstr "Zvolen"
#: contrib/localflavor/sk/sk_districts.py:84
msgid "Zarnovica"
-msgstr ""
+msgstr "Zarnovica"
#: contrib/localflavor/sk/sk_districts.py:85
msgid "Ziar nad Hronom"
-msgstr ""
+msgstr "Ziar nad Hronom"
#: contrib/localflavor/sk/sk_districts.py:86
msgid "Zilina"
-msgstr ""
+msgstr "Zilina"
#: contrib/localflavor/sk/sk_regions.py:8
msgid "Banska Bystrica region"
-msgstr ""
+msgstr "Banska Bystrica region"
#: contrib/localflavor/sk/sk_regions.py:9
msgid "Bratislava region"
@@ -3141,15 +3160,15 @@ msgstr "Inserire un codice postale valido."
#: contrib/localflavor/uk/uk_regions.py:11
msgid "Bedfordshire"
-msgstr ""
+msgstr "Bedfordshire"
#: contrib/localflavor/uk/uk_regions.py:12
msgid "Buckinghamshire"
-msgstr ""
+msgstr "Buckinghamshire"
#: contrib/localflavor/uk/uk_regions.py:14
msgid "Cheshire"
-msgstr ""
+msgstr "Cheshire"
#: contrib/localflavor/uk/uk_regions.py:15
msgid "Cornwall and Isles of Scilly"
@@ -3157,23 +3176,23 @@ msgstr "Cornovaglia e Isole di Scilly"
#: contrib/localflavor/uk/uk_regions.py:16
msgid "Cumbria"
-msgstr ""
+msgstr "Cumbria"
#: contrib/localflavor/uk/uk_regions.py:17
msgid "Derbyshire"
-msgstr ""
+msgstr "Derbyshire"
#: contrib/localflavor/uk/uk_regions.py:18
msgid "Devon"
-msgstr ""
+msgstr "Devon"
#: contrib/localflavor/uk/uk_regions.py:19
msgid "Dorset"
-msgstr ""
+msgstr "Dorset"
#: contrib/localflavor/uk/uk_regions.py:20
msgid "Durham"
-msgstr ""
+msgstr "Durham"
#: contrib/localflavor/uk/uk_regions.py:21
msgid "East Sussex"
@@ -3181,51 +3200,51 @@ msgstr "Sussex dell'Est"
#: contrib/localflavor/uk/uk_regions.py:22
msgid "Essex"
-msgstr ""
+msgstr "Essex"
#: contrib/localflavor/uk/uk_regions.py:23
msgid "Gloucestershire"
-msgstr ""
+msgstr "Gloucestershire"
#: contrib/localflavor/uk/uk_regions.py:24
msgid "Greater London"
-msgstr ""
+msgstr "Greater London"
#: contrib/localflavor/uk/uk_regions.py:25
msgid "Greater Manchester"
-msgstr ""
+msgstr "Greater Manchester"
#: contrib/localflavor/uk/uk_regions.py:26
msgid "Hampshire"
-msgstr ""
+msgstr "Hampshire"
#: contrib/localflavor/uk/uk_regions.py:27
msgid "Hertfordshire"
-msgstr ""
+msgstr "Hertfordshire"
#: contrib/localflavor/uk/uk_regions.py:28
msgid "Kent"
-msgstr ""
+msgstr "Kent"
#: contrib/localflavor/uk/uk_regions.py:29
msgid "Lancashire"
-msgstr ""
+msgstr "Lancashire"
#: contrib/localflavor/uk/uk_regions.py:30
msgid "Leicestershire"
-msgstr ""
+msgstr "Leicestershire"
#: contrib/localflavor/uk/uk_regions.py:31
msgid "Lincolnshire"
-msgstr ""
+msgstr "Lincolnshire"
#: contrib/localflavor/uk/uk_regions.py:32
msgid "Merseyside"
-msgstr ""
+msgstr "Merseyside"
#: contrib/localflavor/uk/uk_regions.py:33
msgid "Norfolk"
-msgstr ""
+msgstr "Norfolk"
#: contrib/localflavor/uk/uk_regions.py:34
msgid "North Yorkshire"
@@ -3233,27 +3252,27 @@ msgstr "Yorkshire del Nord"
#: contrib/localflavor/uk/uk_regions.py:35
msgid "Northamptonshire"
-msgstr ""
+msgstr "Northamptonshire"
#: contrib/localflavor/uk/uk_regions.py:36
msgid "Northumberland"
-msgstr ""
+msgstr "Northumberland"
#: contrib/localflavor/uk/uk_regions.py:37
msgid "Nottinghamshire"
-msgstr ""
+msgstr "Nottinghamshire"
#: contrib/localflavor/uk/uk_regions.py:38
msgid "Oxfordshire"
-msgstr ""
+msgstr "Oxfordshire"
#: contrib/localflavor/uk/uk_regions.py:39
msgid "Shropshire"
-msgstr ""
+msgstr "Shropshire"
#: contrib/localflavor/uk/uk_regions.py:40
msgid "Somerset"
-msgstr ""
+msgstr "Somerset"
#: contrib/localflavor/uk/uk_regions.py:41
msgid "South Yorkshire"
@@ -3261,23 +3280,23 @@ msgstr "Yorkshire del Sud"
#: contrib/localflavor/uk/uk_regions.py:42
msgid "Staffordshire"
-msgstr ""
+msgstr "Staffordshire"
#: contrib/localflavor/uk/uk_regions.py:43
msgid "Suffolk"
-msgstr ""
+msgstr "Suffolk"
#: contrib/localflavor/uk/uk_regions.py:44
msgid "Surrey"
-msgstr ""
+msgstr "Surrey"
#: contrib/localflavor/uk/uk_regions.py:45
msgid "Tyne and Wear"
-msgstr ""
+msgstr "Tyne and Wear"
#: contrib/localflavor/uk/uk_regions.py:46
msgid "Warwickshire"
-msgstr ""
+msgstr "Warwickshire"
#: contrib/localflavor/uk/uk_regions.py:47
msgid "West Midlands"
@@ -3293,48 +3312,51 @@ msgstr "Yorkshire dell'Ovest"
#: contrib/localflavor/uk/uk_regions.py:50
msgid "Wiltshire"
-msgstr ""
+msgstr "Wiltshire"
#: contrib/localflavor/uk/uk_regions.py:51
msgid "Worcestershire"
-msgstr ""
+msgstr "Worcestershire"
#: contrib/localflavor/uk/uk_regions.py:55
msgid "County Antrim"
-msgstr ""
+msgstr "County Antrim"
#: contrib/localflavor/uk/uk_regions.py:56
msgid "County Armagh"
-msgstr ""
+msgstr "County Armagh"
#: contrib/localflavor/uk/uk_regions.py:57
-#: contrib/localflavor/uk/uk_regions.py:58
msgid "County Down"
-msgstr ""
+msgstr "County Down"
+
+#: contrib/localflavor/uk/uk_regions.py:58
+msgid "County Fermanagh"
+msgstr "County Fermanagh"
#: contrib/localflavor/uk/uk_regions.py:59
msgid "County Londonderry"
-msgstr ""
+msgstr "County Londonderry"
#: contrib/localflavor/uk/uk_regions.py:60
msgid "County Tyrone"
-msgstr ""
+msgstr "County Tyrone"
#: contrib/localflavor/uk/uk_regions.py:64
msgid "Clwyd"
-msgstr ""
+msgstr "Clwyd"
#: contrib/localflavor/uk/uk_regions.py:65
msgid "Dyfed"
-msgstr ""
+msgstr "Dyfed"
#: contrib/localflavor/uk/uk_regions.py:66
msgid "Gwent"
-msgstr ""
+msgstr "Gwent"
#: contrib/localflavor/uk/uk_regions.py:67
msgid "Gwynedd"
-msgstr ""
+msgstr "Gwynedd"
#: contrib/localflavor/uk/uk_regions.py:68
msgid "Mid Glamorgan"
@@ -3342,7 +3364,7 @@ msgstr "Glamorgan centrale"
#: contrib/localflavor/uk/uk_regions.py:69
msgid "Powys"
-msgstr ""
+msgstr "Powys"
#: contrib/localflavor/uk/uk_regions.py:70
msgid "South Glamorgan"
@@ -3354,7 +3376,7 @@ msgstr "Glamorgan Ovest"
#: contrib/localflavor/uk/uk_regions.py:75
msgid "Borders"
-msgstr ""
+msgstr "Borders"
#: contrib/localflavor/uk/uk_regions.py:76
msgid "Central Scotland"
@@ -3362,23 +3384,23 @@ msgstr "Scozia Centrale"
#: contrib/localflavor/uk/uk_regions.py:77
msgid "Dumfries and Galloway"
-msgstr ""
+msgstr "Dumfries and Galloway"
#: contrib/localflavor/uk/uk_regions.py:78
msgid "Fife"
-msgstr ""
+msgstr "Fife"
#: contrib/localflavor/uk/uk_regions.py:79
msgid "Grampian"
-msgstr ""
+msgstr "Grampian"
#: contrib/localflavor/uk/uk_regions.py:80
msgid "Highland"
-msgstr ""
+msgstr "Highland"
#: contrib/localflavor/uk/uk_regions.py:81
msgid "Lothian"
-msgstr ""
+msgstr "Lothian"
#: contrib/localflavor/uk/uk_regions.py:82
msgid "Orkney Islands"
@@ -3390,11 +3412,11 @@ msgstr "Isole Shetland"
#: contrib/localflavor/uk/uk_regions.py:84
msgid "Strathclyde"
-msgstr ""
+msgstr "Strathclyde"
#: contrib/localflavor/uk/uk_regions.py:85
msgid "Tayside"
-msgstr ""
+msgstr "Tayside"
#: contrib/localflavor/uk/uk_regions.py:86
msgid "Western Isles"
@@ -3444,19 +3466,19 @@ msgstr "Libero Stato"
#: contrib/localflavor/za/za_provinces.py:6
msgid "Gauteng"
-msgstr ""
+msgstr "Gauteng"
#: contrib/localflavor/za/za_provinces.py:7
msgid "KwaZulu-Natal"
-msgstr ""
+msgstr "KwaZulu-Natal"
#: contrib/localflavor/za/za_provinces.py:8
msgid "Limpopo"
-msgstr ""
+msgstr "Limpopo"
#: contrib/localflavor/za/za_provinces.py:9
msgid "Mpumalanga"
-msgstr ""
+msgstr "Mpumalanga"
#: contrib/localflavor/za/za_provinces.py:10
msgid "Northern Cape"
@@ -3502,23 +3524,23 @@ msgstr "redirezione"
msgid "redirects"
msgstr "redirezioni"
-#: contrib/sessions/models.py:46
+#: contrib/sessions/models.py:41
msgid "session key"
msgstr "chiave di sessione"
-#: contrib/sessions/models.py:47
+#: contrib/sessions/models.py:42
msgid "session data"
msgstr "dati di sessione"
-#: contrib/sessions/models.py:48
+#: contrib/sessions/models.py:43
msgid "expire date"
msgstr "data di scadenza"
-#: contrib/sessions/models.py:53
+#: contrib/sessions/models.py:48
msgid "session"
msgstr "sessione"
-#: contrib/sessions/models.py:54
+#: contrib/sessions/models.py:49
msgid "sessions"
msgstr "sessioni"
@@ -3586,7 +3608,7 @@ msgstr "Sono ammessi soltanto caratteri numerici."
msgid "This value can't be comprised solely of digits."
msgstr "Questo valore non può essere composto solo da cifre."
-#: core/validators.py:128 newforms/fields.py:151
+#: core/validators.py:128 newforms/fields.py:152
msgid "Enter a whole number."
msgstr "Inserire un numero intero."
@@ -3603,7 +3625,7 @@ msgstr "L'anno deve essere 1900 o successivo."
msgid "Invalid date: %s"
msgstr "Data non valida: %s"
-#: core/validators.py:156 db/models/fields/__init__.py:509
+#: core/validators.py:156 db/models/fields/__init__.py:548
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Inserire una data valida in formato AAAA-MM-GG."
@@ -3611,20 +3633,20 @@ msgstr "Inserire una data valida in formato AAAA-MM-GG."
msgid "Enter a valid time in HH:MM format."
msgstr "Inserire un ora valida in formato OO:MM."
-#: core/validators.py:165 db/models/fields/__init__.py:583
+#: core/validators.py:165 db/models/fields/__init__.py:625
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
msgstr "Inserire una data/ora valida in formato AAAA-MM-GG OO:MM."
-#: core/validators.py:170 newforms/fields.py:402
+#: core/validators.py:170 newforms/fields.py:403
msgid "Enter a valid e-mail address."
msgstr "Inserire un indirizzo e-mail valido."
-#: core/validators.py:182 core/validators.py:474 newforms/fields.py:432
+#: core/validators.py:182 core/validators.py:474 newforms/fields.py:433
#: oldforms/__init__.py:687
msgid "No file was submitted. Check the encoding type on the form."
msgstr "Non è stato inviato alcun file. Verificare il tipo di codifica della form."
-#: core/validators.py:193 newforms/fields.py:458
+#: core/validators.py:193 newforms/fields.py:459
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@@ -3855,154 +3877,158 @@ msgstr ""
msgid "%(object)s with this %(type)s already exists for the given %(field)s."
msgstr "Un %(object)s·con questo·%(type)s·esiste già per questo·%(field)s."
-#: db/models/fields/__init__.py:52
+#: db/models/fields/__init__.py:54
#, python-format
msgid "%(optname)s with this %(fieldname)s already exists."
msgstr "Un %(optname)s·con questo·%(fieldname)s·esiste già."
-#: db/models/fields/__init__.py:161 db/models/fields/__init__.py:318
-#: db/models/fields/__init__.py:735 db/models/fields/__init__.py:746
-#: newforms/fields.py:45 oldforms/__init__.py:374
+#: db/models/fields/__init__.py:179 db/models/fields/__init__.py:348
+#: db/models/fields/__init__.py:780 db/models/fields/__init__.py:791
+#: newforms/fields.py:46 oldforms/__init__.py:374
msgid "This field is required."
msgstr "Questo campo è obbligatorio."
-#: db/models/fields/__init__.py:418
+#: db/models/fields/__init__.py:448
msgid "This value must be an integer."
msgstr "Questo valore deve essere un intero."
-#: db/models/fields/__init__.py:454
+#: db/models/fields/__init__.py:487
msgid "This value must be either True or False."
msgstr "Questo valore deve essere True o False."
-#: db/models/fields/__init__.py:475
+#: db/models/fields/__init__.py:511
msgid "This field cannot be null."
msgstr "Questo campo non può essere nullo."
-#: db/models/fields/__init__.py:644
+#: db/models/fields/__init__.py:689
msgid "This value must be a decimal number."
msgstr "Questo valore deve essere un numero decimale."
-#: db/models/fields/__init__.py:755
+#: db/models/fields/__init__.py:800
msgid "Enter a valid filename."
msgstr "Inserire un nome di file valido."
-#: db/models/fields/__init__.py:908
+#: db/models/fields/__init__.py:981
msgid "This value must be either None, True or False."
msgstr "Questo valore deve essere None, True o False."
-#: db/models/fields/related.py:55
+#: db/models/fields/related.py:94
#, python-format
msgid "Please enter a valid %s."
msgstr "Inserire un %s valido."
-#: db/models/fields/related.py:658
+#: db/models/fields/related.py:721
msgid "Separate multiple IDs with commas."
msgstr "Separare gli ID multipli con virgole."
-#: db/models/fields/related.py:660
+#: db/models/fields/related.py:723
msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Tenere premuto \"Control\", o \"Command\" su Mac, per selezionarne più di "
"uno."
-#: db/models/fields/related.py:707
+#: db/models/fields/related.py:770
#, 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] "Inserire un ID valido per %(self)s. Il valore %(value)r non è valido."
msgstr[1] "Inserire ID validi per %(self)s. I valori %(value)r non sono validi."
-#: newforms/fields.py:46
+#: newforms/fields.py:47
msgid "Enter a valid value."
msgstr "Inserire un valore valido."
-#: newforms/fields.py:123
+#: newforms/fields.py:124
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
-msgstr "Assicurarsi che questo valore non contenga più di %(max)d caratteri (ne ha %(length)d)."
+msgstr ""
+"Assicurarsi che questo valore non contenga più di %(max)d caratteri (ne ha %"
+"(length)d)."
-#: newforms/fields.py:124
+#: newforms/fields.py:125
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
-msgstr "Assicurarsi che questo valore contenga almeno %(min)d caratteri (ne ha %(length)d)."
+msgstr ""
+"Assicurarsi che questo valore contenga almeno %(min)d caratteri (ne ha %"
+"(length)d)."
-#: newforms/fields.py:152 newforms/fields.py:181 newforms/fields.py:210
+#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "Assicurarsi che questo valore sia minore o uguale a %s."
-#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211
+#: newforms/fields.py:154 newforms/fields.py:183 newforms/fields.py:212
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "Assicurarsi che questo valore sia maggiore o uguale a %s."
-#: newforms/fields.py:180 newforms/fields.py:209
+#: newforms/fields.py:181 newforms/fields.py:210
msgid "Enter a number."
msgstr "Inserire un numero."
-#: newforms/fields.py:212
+#: newforms/fields.py:213
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Assicurarsi che non vi siano più di %s cifre in totale."
-#: newforms/fields.py:213
+#: newforms/fields.py:214
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Assicurarsi che non vi siano più di %s cifre decimali."
-#: newforms/fields.py:214
+#: newforms/fields.py:215
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Assicurarsi che non vi siano più di %s cifre prima della virgola."
-#: newforms/fields.py:262 newforms/fields.py:723
+#: newforms/fields.py:263 newforms/fields.py:751
msgid "Enter a valid date."
msgstr "Inserire una data valida."
-#: newforms/fields.py:295 newforms/fields.py:724
+#: newforms/fields.py:296 newforms/fields.py:752
msgid "Enter a valid time."
msgstr "Inserire un ora valida."
-#: newforms/fields.py:334
+#: newforms/fields.py:335
msgid "Enter a valid date/time."
msgstr "Inserire una coppia data/ora valida."
-#: newforms/fields.py:433
+#: newforms/fields.py:434
msgid "No file was submitted."
msgstr "Nessun file è stato inviato."
-#: newforms/fields.py:434 oldforms/__init__.py:689
+#: newforms/fields.py:435 oldforms/__init__.py:689
msgid "The submitted file is empty."
msgstr "Il file inviato è vuoto."
-#: newforms/fields.py:496
+#: newforms/fields.py:497
msgid "Enter a valid URL."
msgstr "Inserire una URL valida."
-#: newforms/fields.py:497
+#: newforms/fields.py:498
msgid "This URL appears to be a broken link."
msgstr "Questa URL non sembra funzionare."
-#: newforms/fields.py:559 newforms/models.py:317
+#: newforms/fields.py:560 newforms/models.py:299
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Scegliere un'opzione valida. La scelta effettuata non compare tra quelle "
"disponibili."
-#: newforms/fields.py:598
+#: newforms/fields.py:599
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Scegliere un'opzione valida. '%(value)s non compare tra quelle disponibili."
-#: newforms/fields.py:599 newforms/fields.py:661 newforms/models.py:377
+#: newforms/fields.py:600 newforms/fields.py:662 newforms/models.py:371
msgid "Enter a list of values."
msgstr "Inserire una lista di valori."
-#: newforms/fields.py:752
+#: newforms/fields.py:780
msgid "Enter a valid IPv4 address."
msgstr "Inserire un indirizzo IPv4 valido."
-#: newforms/models.py:378
+#: newforms/models.py:372
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Scegliere un'opzione valida. '%s non compare tra quelle disponibili."
@@ -4035,47 +4061,47 @@ msgstr "Inserire un numero positivo."
msgid "Enter a whole number between 0 and 32,767."
msgstr "Inserire un numero intero compreso tra 0 e 32.767 ."
-#: template/defaultfilters.py:691
+#: template/defaultfilters.py:698
msgid "yes,no,maybe"
msgstr "sì,no,forse"
-#: template/defaultfilters.py:722
+#: template/defaultfilters.py:729
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d byte"
-#: template/defaultfilters.py:724
+#: template/defaultfilters.py:731
#, python-format
msgid "%.1f KB"
-msgstr ""
+msgstr "%.1f KB"
-#: template/defaultfilters.py:726
+#: template/defaultfilters.py:733
#, python-format
msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
-#: template/defaultfilters.py:727
+#: template/defaultfilters.py:734
#, python-format
msgid "%.1f GB"
-msgstr ""
+msgstr "%.1f GB"
#: utils/dateformat.py:41
msgid "p.m."
-msgstr ""
+msgstr "p.m."
#: utils/dateformat.py:42
msgid "a.m."
-msgstr ""
+msgstr "a.m."
#: utils/dateformat.py:47
msgid "PM"
-msgstr ""
+msgstr "PM"
#: utils/dateformat.py:48
msgid "AM"
-msgstr ""
+msgstr "AM"
#: utils/dateformat.py:97
msgid "midnight"
@@ -4319,23 +4345,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:399
+#: utils/translation/trans_real.py:403
msgid "DATE_FORMAT"
msgstr "j F Y"
-#: utils/translation/trans_real.py:400
+#: utils/translation/trans_real.py:404
msgid "DATETIME_FORMAT"
msgstr "j F Y, H:i"
-#: utils/translation/trans_real.py:401
+#: utils/translation/trans_real.py:405
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:417
+#: utils/translation/trans_real.py:421
msgid "YEAR_MONTH_FORMAT"
msgstr "Y F"
-#: utils/translation/trans_real.py:418
+#: utils/translation/trans_real.py:422
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
diff --git a/django/contrib/admin/views/decorators.py b/django/contrib/admin/views/decorators.py
index cedb1f9cfd4ab..c27b2e7427132 100644
--- a/django/contrib/admin/views/decorators.py
+++ b/django/contrib/admin/views/decorators.py
@@ -84,12 +84,13 @@ def _checklogin(request, *args, **kwargs):
message = ERROR_MESSAGE
if '@' in username:
# Mistakenly entered e-mail address instead of username? Look it up.
- try:
- user = User.objects.get(email=username)
- except User.DoesNotExist:
- message = _("Usernames cannot contain the '@' character.")
+ users = list(User.objects.filter(email=username))
+ if len(users) == 1:
+ message = _("Your e-mail address is not your username. Try '%s' instead.") % users[0].username
else:
- message = _("Your e-mail address is not your username. Try '%s' instead.") % user.username
+ # Either we cannot find the user, or if more than 1
+ # we cannot guess which user is the correct one.
+ message = _("Usernames cannot contain the '@' character.")
return _display_login_form(request, message)
# The user data is correct; log in the user in and continue.
diff --git a/django/core/handlers/base.py b/django/core/handlers/base.py
index a81bec322f037..1fdd7c3d6bd76 100644
--- a/django/core/handlers/base.py
+++ b/django/core/handlers/base.py
@@ -115,7 +115,10 @@ def get_response(self, request):
# Get the exception info now, in case another exception is thrown later.
exc_info = sys.exc_info()
receivers = dispatcher.send(signal=signals.got_request_exception, request=request)
- if settings.DEBUG:
+
+ if settings.DEBUG_PROPAGATE_EXCEPTIONS:
+ raise
+ elif settings.DEBUG:
from django.views import debug
return debug.technical_500_response(request, *exc_info)
else:
diff --git a/docs/settings.txt b/docs/settings.txt
index 5aee19102b106..9b89c92343b26 100644
--- a/docs/settings.txt
+++ b/docs/settings.txt
@@ -391,6 +391,16 @@ are inappropriate for public consumption. File paths, configuration options, and
the like all give attackers extra information about your server. Never deploy a
site with ``DEBUG`` turned on.
+DEBUG_PROPAGATE_EXCEPTIONS
+--------------------------
+
+Default: ``False``
+
+If set to True, Django's normal exception handling of view functions
+will be suppressed, and exceptions will propagate upwards. This can
+be useful for some test setups, and should never be used on a live
+site.
+
DEFAULT_CHARSET
---------------