diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index 7db00665f4..23283c8c1f 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-26 15:49+0100\n"
+"POT-Creation-Date: 2010-05-03 07:53+0200\n"
 "PO-Revision-Date: 2009-12-26 16:12+0100\n"
 "Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
 "Language-Team: Italian <django-it@googlegroups.com>\n"
@@ -21,215 +21,235 @@ msgid "Arabic"
 msgstr "arabo"
 
 #: conf/global_settings.py:45
-msgid "Bengali"
-msgstr "bengali"
-
-#: conf/global_settings.py:46
 msgid "Bulgarian"
 msgstr "bulgaro"
 
+#: conf/global_settings.py:46
+msgid "Bengali"
+msgstr "bengali"
+
 #: conf/global_settings.py:47
+#, fuzzy
+msgid "Bosnian"
+msgstr "estone"
+
+#: conf/global_settings.py:48
 msgid "Catalan"
 msgstr "catalano"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Czech"
 msgstr "ceco"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Welsh"
 msgstr "gallese"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Danish"
 msgstr "danese"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "German"
 msgstr "tedesco"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Greek"
 msgstr "greco"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "English"
 msgstr "inglese"
 
-#: conf/global_settings.py:54
+#: conf/global_settings.py:55
 msgid "Spanish"
 msgstr "spagnolo"
 
-#: conf/global_settings.py:55
-msgid "Estonian"
-msgstr "estone"
-
 #: conf/global_settings.py:56
 msgid "Argentinean Spanish"
 msgstr "spagnolo argentino"
 
 #: conf/global_settings.py:57
+msgid "Estonian"
+msgstr "estone"
+
+#: conf/global_settings.py:58
 msgid "Basque"
 msgstr "basco"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
 msgid "Persian"
 msgstr "persiano"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
 msgid "Finnish"
 msgstr "finlandese"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
 msgid "French"
 msgstr "francese"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
+#, fuzzy
+msgid "Frisian"
+msgstr "Friesland"
+
+#: conf/global_settings.py:63
 msgid "Irish"
 msgstr "irlandese"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:64
 msgid "Galician"
 msgstr "galiziano"
 
-#: conf/global_settings.py:63
-msgid "Hungarian"
-msgstr "ungherese"
-
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
 msgid "Hebrew"
 msgstr "ebraico"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
 msgid "Hindi"
 msgstr "hindi"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
 msgid "Croatian"
 msgstr "croato"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
+msgid "Hungarian"
+msgstr "ungherese"
+
+#: conf/global_settings.py:69
 msgid "Icelandic"
 msgstr "islandese"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:70
 msgid "Italian"
 msgstr "italiano"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:71
 msgid "Japanese"
 msgstr "giapponese"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:72
 msgid "Georgian"
 msgstr "georgiano"
 
-#: conf/global_settings.py:71
-msgid "Korean"
-msgstr "coreano"
-
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
 msgid "Khmer"
 msgstr "khmer"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
 msgid "Kannada"
 msgstr "kannada"
 
-#: conf/global_settings.py:74
-msgid "Latvian"
-msgstr "lettone"
-
 #: conf/global_settings.py:75
+msgid "Korean"
+msgstr "coreano"
+
+#: conf/global_settings.py:76
 msgid "Lithuanian"
 msgstr "lituano"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
+msgid "Latvian"
+msgstr "lettone"
+
+#: conf/global_settings.py:78
 msgid "Macedonian"
 msgstr "macedone"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:79
 msgid "Dutch"
 msgstr "olandese"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:80
 msgid "Norwegian"
 msgstr "norvegese"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:81
 msgid "Polish"
 msgstr "polacco"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:82
 msgid "Portuguese"
 msgstr "portoghese"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:83
 msgid "Brazilian Portuguese"
 msgstr "brasiliano portoghese"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:84
 msgid "Romanian"
 msgstr "rumeno"
 
-#: conf/global_settings.py:83
+#: conf/global_settings.py:85
 msgid "Russian"
 msgstr "russo"
 
-#: conf/global_settings.py:84
+#: conf/global_settings.py:86
 msgid "Slovak"
 msgstr "slovacco"
 
-#: conf/global_settings.py:85
+#: conf/global_settings.py:87
 msgid "Slovenian"
 msgstr "sloveno"
 
-#: conf/global_settings.py:86
+#: conf/global_settings.py:88
+#, fuzzy
+msgid "Albanian"
+msgstr "Alacant"
+
+#: conf/global_settings.py:89
 msgid "Serbian"
 msgstr "serbo"
 
-#: conf/global_settings.py:87
+#: conf/global_settings.py:90
+#, fuzzy
+msgid "Serbian Latin"
+msgstr "serbo"
+
+#: conf/global_settings.py:91
 msgid "Swedish"
 msgstr "svedese"
 
-#: conf/global_settings.py:88
+#: conf/global_settings.py:92
 msgid "Tamil"
 msgstr "tamil"
 
-#: conf/global_settings.py:89
+#: conf/global_settings.py:93
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:90
+#: conf/global_settings.py:94
 msgid "Thai"
 msgstr "tailandese"
 
-#: conf/global_settings.py:91
+#: conf/global_settings.py:95
 msgid "Turkish"
 msgstr "turco"
 
-#: conf/global_settings.py:92
+#: conf/global_settings.py:96
 msgid "Ukrainian"
 msgstr "ucraino"
 
-#: conf/global_settings.py:93
+#: conf/global_settings.py:97
 msgid "Simplified Chinese"
 msgstr "cinese semplificato"
 
-#: conf/global_settings.py:94
+#: conf/global_settings.py:98
 msgid "Traditional Chinese"
 msgstr "cinese tradizionale"
 
-#: contrib/admin/actions.py:60
+#: contrib/admin/actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Cancellati/e con successo %(count)d %(items)s."
 
-#: contrib/admin/actions.py:67 contrib/admin/options.py:1033
+#: contrib/admin/actions.py:55 contrib/admin/options.py:1033
 msgid "Are you sure?"
 msgstr "Sei sicuro?"
 
-#: contrib/admin/actions.py:85
+#: contrib/admin/actions.py:73
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Cancella %(verbose_name_plural)s selezionati/e"
@@ -268,15 +288,15 @@ msgstr "Questo mese"
 msgid "This year"
 msgstr "Quest'anno"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:430
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:476
 msgid "Yes"
 msgstr "Sì"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:430
+#: contrib/admin/filterspecs.py:147 forms/widgets.py:476
 msgid "No"
 msgstr "No"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:430
+#: contrib/admin/filterspecs.py:154 forms/widgets.py:476
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -312,97 +332,100 @@ msgstr "voce di log"
 msgid "log entries"
 msgstr "voci di log"
 
-#: contrib/admin/options.py:133 contrib/admin/options.py:147
+#: contrib/admin/options.py:132 contrib/admin/options.py:146
 msgid "None"
 msgstr "Nessuno"
 
-#: contrib/admin/options.py:519
+#: contrib/admin/options.py:532
 #, python-format
 msgid "Changed %s."
 msgstr "%s modificato/a."
 
-#: contrib/admin/options.py:519 contrib/admin/options.py:529
-#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
-#: forms/models.py:600
+#: contrib/admin/options.py:532 contrib/admin/options.py:542
+#: contrib/comments/templates/comments/preview.html:16 forms/models.py:396
+#: forms/models.py:608
 msgid "and"
 msgstr "e"
 
-#: contrib/admin/options.py:524
+#: contrib/admin/options.py:537
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Aggiunto/a %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:528
+#: contrib/admin/options.py:541
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Cambiato/i %(list)s per %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:533
+#: contrib/admin/options.py:546
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Cancellato/a %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:537
+#: contrib/admin/options.py:550
 msgid "No fields changed."
 msgstr "Nessun campo modificato."
 
-#: contrib/admin/options.py:599 contrib/auth/admin.py:67
+#: contrib/admin/options.py:612 contrib/auth/admin.py:67
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "%(name)s \"%(obj)s\" aggiunto/a correttamente."
 
-#: contrib/admin/options.py:603 contrib/admin/options.py:636
+#: contrib/admin/options.py:616 contrib/admin/options.py:649
 #: contrib/auth/admin.py:75
 msgid "You may edit it again below."
 msgstr "È possibile modificare nuovamente qui sotto."
 
-#: contrib/admin/options.py:613 contrib/admin/options.py:646
+#: contrib/admin/options.py:626 contrib/admin/options.py:659
 #, python-format
 msgid "You may add another %s below."
 msgstr "Puoi aggiungere un altro/a %s qui sotto."
 
-#: contrib/admin/options.py:634
+#: contrib/admin/options.py:647
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "%(name)s \"%(obj)s\" modificato/a correttamente."
 
-#: contrib/admin/options.py:642
+#: contrib/admin/options.py:655
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
 "%(name)s \"%(obj)s\" aggiunto/a correttamente. Puoi modificare ancora qui "
 "sotto."
 
-#: contrib/admin/options.py:693
+#: contrib/admin/options.py:707
 msgid ""
 "Items must be selected in order to perform actions on them. No items have "
 "been changed."
-msgstr "Occorre selezionare degli oggetti per potervi eseguire azioni. Nessun oggetto è stato cambiato."
+msgstr ""
+"Occorre selezionare degli oggetti per potervi eseguire azioni. Nessun "
+"oggetto è stato cambiato."
 
-#: contrib/admin/options.py:707
+#: contrib/admin/options.py:721
 msgid "No action selected."
 msgstr "Nessuna azione selezionata."
 
-#: contrib/admin/options.py:779
+#: contrib/admin/options.py:793
 #, python-format
 msgid "Add %s"
 msgstr "Aggiungi %s"
 
-#: contrib/admin/options.py:810 contrib/admin/options.py:1011
+#: contrib/admin/options.py:818 contrib/admin/options.py:1013
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
 msgstr "L'oggetto %(name)s con chiave primaria %(key)r non esiste."
 
-#: contrib/admin/options.py:867
+#: contrib/admin/options.py:875
 #, python-format
 msgid "Change %s"
 msgstr "Modifica %s"
 
-#: contrib/admin/options.py:911
+#: contrib/admin/options.py:919
 msgid "Database error"
 msgstr "Errore nel database"
 
-#: contrib/admin/options.py:947
+#: contrib/admin/options.py:955
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
@@ -465,16 +488,6 @@ msgstr "Accedi"
 msgid "%s administration"
 msgstr "Amministrazione %s"
 
-#: contrib/admin/util.py:168
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Uno o più %(fieldname)s in %(name)s: %(obj)s"
-
-#: contrib/admin/util.py:173
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Uno o più %(fieldname)s in %(name)s:"
-
 #: contrib/admin/widgets.py:72
 msgid "Date:"
 msgstr "Data:"
@@ -495,7 +508,7 @@ msgstr "Modifica:"
 msgid "Lookup"
 msgstr "Recupero"
 
-#: contrib/admin/widgets.py:237
+#: contrib/admin/widgets.py:240
 msgid "Add Another"
 msgstr "Aggiungi un Altro"
 
@@ -511,13 +524,13 @@ msgstr "Spiacenti, ma la pagina richiesta non è stata trovata."
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/app_index.html:8
 #: contrib/admin/templates/admin/base.html:54
-#: contrib/admin/templates/admin/change_form.html:17
-#: contrib/admin/templates/admin/change_list.html:25
+#: contrib/admin/templates/admin/change_form.html:18
+#: contrib/admin/templates/admin/change_list.html:26
 #: contrib/admin/templates/admin/delete_confirmation.html:6
 #: contrib/admin/templates/admin/delete_selected_confirmation.html:6
 #: contrib/admin/templates/admin/invalid_setup.html:4
 #: contrib/admin/templates/admin/object_history.html:6
-#: contrib/admin/templates/admin/auth/user/change_password.html:10
+#: contrib/admin/templates/admin/auth/user/change_password.html:11
 #: contrib/admin/templates/registration/logged_out.html:4
 #: contrib/admin/templates/registration/password_change_done.html:4
 #: contrib/admin/templates/registration/password_change_form.html:4
@@ -575,8 +588,8 @@ msgid "Documentation"
 msgstr "Documentazione"
 
 #: contrib/admin/templates/admin/base.html:40
-#: contrib/admin/templates/admin/auth/user/change_password.html:14
-#: contrib/admin/templates/admin/auth/user/change_password.html:47
+#: contrib/admin/templates/admin/auth/user/change_password.html:15
+#: contrib/admin/templates/admin/auth/user/change_password.html:48
 #: contrib/admin/templates/registration/password_change_done.html:3
 #: contrib/admin/templates/registration/password_change_form.html:3
 msgid "Change password"
@@ -596,41 +609,41 @@ msgstr "Amministrazione sito Django"
 msgid "Django administration"
 msgstr "Amministrazione Django"
 
-#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/change_form.html:21
 #: contrib/admin/templates/admin/index.html:29
 msgid "Add"
 msgstr "Aggiungi"
 
-#: contrib/admin/templates/admin/change_form.html:27
+#: contrib/admin/templates/admin/change_form.html:28
 #: contrib/admin/templates/admin/object_history.html:10
 msgid "History"
 msgstr "Storia"
 
-#: contrib/admin/templates/admin/change_form.html:28
+#: contrib/admin/templates/admin/change_form.html:29
 #: contrib/admin/templates/admin/edit_inline/stacked.html:13
 #: contrib/admin/templates/admin/edit_inline/tabular.html:28
 msgid "View on site"
 msgstr "Vedi sul sito"
 
-#: contrib/admin/templates/admin/change_form.html:38
-#: contrib/admin/templates/admin/change_list.html:54
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
+#: contrib/admin/templates/admin/change_form.html:39
+#: contrib/admin/templates/admin/change_list.html:55
+#: contrib/admin/templates/admin/auth/user/change_password.html:24
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
 msgstr[0] "Correggi l'errore qui sotto."
 msgstr[1] "Correggi gli errori qui sotto."
 
-#: contrib/admin/templates/admin/change_list.html:46
+#: contrib/admin/templates/admin/change_list.html:47
 #, python-format
 msgid "Add %(name)s"
 msgstr "Aggiungi %(name)s"
 
-#: contrib/admin/templates/admin/change_list.html:65
+#: contrib/admin/templates/admin/change_list.html:66
 msgid "Filter"
 msgstr "Filtro"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:10
-#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275
+#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:278
 msgid "Delete"
 msgstr "Cancella"
 
@@ -680,8 +693,8 @@ msgid ""
 "Are you sure you want to delete the selected %(object_name)s objects? All of "
 "the following objects and their related items will be deleted:"
 msgstr ""
-"Sicuro di voler cancellare gli oggetti %(object_name)s selezionati? Tutti i seguenti "
-"oggetti, e i loro oggetti collegati, saranno cancellati:"
+"Sicuro di voler cancellare gli oggetti %(object_name)s selezionati? Tutti i "
+"seguenti oggetti, e i loro oggetti collegati, saranno cancellati:"
 
 #: contrib/admin/templates/admin/filter.html:2
 #, python-format
@@ -749,7 +762,7 @@ msgid "Action"
 msgstr "Azione"
 
 #: contrib/admin/templates/admin/object_history.html:30
-#: utils/translation/trans_real.py:400
+#: utils/translation/trans_real.py:407
 msgid "DATETIME_FORMAT"
 msgstr "j F Y, H:i"
 
@@ -812,26 +825,27 @@ msgid "Username"
 msgstr "Nome utente"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:20
-#: contrib/admin/templates/admin/auth/user/change_password.html:34
+#: contrib/admin/templates/admin/auth/user/change_password.html:35
 #: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185
 msgid "Password"
 msgstr "Password"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:26
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
+#: contrib/admin/templates/admin/auth/user/change_password.html:41
 #: contrib/auth/forms.py:186
 msgid "Password (again)"
 msgstr "Password (di nuovo)"
 
 #: contrib/admin/templates/admin/auth/user/add_form.html:27
-#: contrib/admin/templates/admin/auth/user/change_password.html:41
+#: contrib/admin/templates/admin/auth/user/change_password.html:42
 msgid "Enter the same password as above, for verification."
 msgstr "Inserisci la stessa password inserita sopra, come verifica."
 
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#: contrib/admin/templates/admin/auth/user/change_password.html:28
 #, python-format
 msgid "Enter a new password for the user <strong>%(username)s</strong>."
-msgstr "Inserisci una nuova password per l'utente <strong>%(username)s</strong>."
+msgstr ""
+"Inserisci una nuova password per l'utente <strong>%(username)s</strong>."
 
 #: contrib/admin/templates/admin/edit_inline/tabular.html:15
 msgid "Delete?"
@@ -949,7 +963,8 @@ msgstr ""
 
 #: 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 chiesto di reimpostare la password"
+msgstr ""
+"Hai ricevuto questa e-mail perché hai chiesto di reimpostare la password"
 
 #: contrib/admin/templates/registration/password_reset_email.html:3
 #, python-format
@@ -1141,7 +1156,8 @@ msgstr "Modifica quest'oggetto (in una nuova finestra)"
 
 #: contrib/admindocs/templates/admin_doc/bookmarklets.html:28
 msgid "As above, but opens the admin page in a new window."
-msgstr "Come sopra, ma apre la pagina di amministrazione in una nuova finestra."
+msgstr ""
+"Come sopra, ma apre la pagina di amministrazione in una nuova finestra."
 
 #: contrib/auth/admin.py:21
 msgid "Personal info"
@@ -1173,7 +1189,7 @@ msgid "Change password: %s"
 msgstr "Cambia la password: %s"
 
 #: contrib/auth/forms.py:15 contrib/auth/forms.py:48
-#: contrib/auth/models.py:128
+#: contrib/auth/models.py:144
 msgid ""
 "Required. 30 characters or fewer. Alphanumeric characters only (letters, "
 "digits and underscores)."
@@ -1241,7 +1257,8 @@ msgstr "Password attuale"
 
 #: contrib/auth/forms.py:177
 msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr "La password attuale non è stata inserita correttamente: va inserita di nuovo."
+msgstr ""
+"La password attuale non è stata inserita correttamente: va inserita di nuovo."
 
 #: contrib/auth/models.py:63 contrib/auth/models.py:86
 msgid "name"
@@ -1263,31 +1280,31 @@ msgstr "permessi"
 msgid "group"
 msgstr "gruppo"
 
-#: contrib/auth/models.py:91 contrib/auth/models.py:138
+#: contrib/auth/models.py:91 contrib/auth/models.py:154
 msgid "groups"
 msgstr "gruppi"
 
-#: contrib/auth/models.py:128
+#: contrib/auth/models.py:144
 msgid "username"
 msgstr "nome utente"
 
-#: contrib/auth/models.py:129
+#: contrib/auth/models.py:145
 msgid "first name"
 msgstr "nome"
 
-#: contrib/auth/models.py:130
+#: contrib/auth/models.py:146
 msgid "last name"
 msgstr "cognome"
 
-#: contrib/auth/models.py:131
+#: contrib/auth/models.py:147
 msgid "e-mail address"
 msgstr "indirizzo e-mail"
 
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:148
 msgid "password"
 msgstr "password"
 
-#: contrib/auth/models.py:132
+#: contrib/auth/models.py:148
 msgid ""
 "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
 "password form</a>."
@@ -1295,19 +1312,19 @@ msgstr ""
 "Usa '[algo]$[salt]$[hexdigest]' oppure la <a href=\"password/\">maschera di "
 "cambio password</a>."
 
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:149
 msgid "staff status"
 msgstr "privilegi di staff"
 
-#: contrib/auth/models.py:133
+#: contrib/auth/models.py:149
 msgid "Designates whether the user can log into this admin site."
 msgstr "Indica se l'utente può accedere a questo sito di amministrazione."
 
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:150
 msgid "active"
 msgstr "attivo"
 
-#: contrib/auth/models.py:134
+#: contrib/auth/models.py:150
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -1315,11 +1332,11 @@ msgstr ""
 "Indica se l'utente debba essere considerato attivo. Deseleziona qui, "
 "piuttosto che cancellare gli account."
 
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:151
 msgid "superuser status"
 msgstr "privilegi di superutente"
 
-#: contrib/auth/models.py:135
+#: contrib/auth/models.py:151
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
@@ -1327,15 +1344,15 @@ msgstr ""
 "Indica che l'utente ha tutti i privilegi, senza che siano stati assegnati "
 "esplicitamente."
 
-#: contrib/auth/models.py:136
+#: contrib/auth/models.py:152
 msgid "last login"
 msgstr "ultimo accesso"
 
-#: contrib/auth/models.py:137
+#: contrib/auth/models.py:153
 msgid "date joined"
 msgstr "iscritto in data"
 
-#: contrib/auth/models.py:139
+#: contrib/auth/models.py:155
 msgid ""
 "In addition to the permissions manually assigned, this user will also get "
 "all permissions granted to each group he/she is in."
@@ -1343,28 +1360,28 @@ msgstr ""
 "In aggiunta ai privilegi assegnati manualmente, l'utente riceverà anche "
 "tutti i privilegi assegnati ad ogni gruppo cui appartiene."
 
-#: contrib/auth/models.py:140
+#: contrib/auth/models.py:156
 msgid "user permissions"
 msgstr "privilegi utente"
 
-#: contrib/auth/models.py:144 contrib/comments/models.py:50
+#: contrib/auth/models.py:160 contrib/comments/models.py:50
 #: contrib/comments/models.py:168
 msgid "user"
 msgstr "utente"
 
-#: contrib/auth/models.py:145
+#: contrib/auth/models.py:161
 msgid "users"
 msgstr "utenti"
 
-#: contrib/auth/models.py:301
+#: contrib/auth/models.py:317
 msgid "message"
 msgstr "messaggio"
 
-#: contrib/auth/views.py:56
+#: contrib/auth/views.py:73
 msgid "Logged out"
 msgstr "Accesso annullato"
 
-#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:419
+#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:434
 msgid "Enter a valid e-mail address."
 msgstr "Inserisci un indirizzo e-mail valido."
 
@@ -1398,7 +1415,7 @@ msgstr "Indirizzo email"
 #: contrib/comments/forms.py:95
 #: contrib/comments/templates/comments/moderation_queue.html:37
 #: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
-#: db/models/fields/__init__.py:915
+#: db/models/fields/__init__.py:936
 msgid "URL"
 msgstr "URL"
 
@@ -1415,8 +1432,10 @@ msgstr[0] "Modera i termini: la parola %s non è ammessa qui."
 msgstr[1] "Modera i termini: le parole %s non sono ammesse qui."
 
 #: contrib/comments/forms.py:180
-msgid "If you enter anything in this field your comment will be treated as spam"
-msgstr "Se inserisci qualcosa in questo campo il tuo commento verrà considerato spam"
+msgid ""
+"If you enter anything in this field your comment will be treated as spam"
+msgstr ""
+"Se inserisci qualcosa in questo campo il tuo commento verrà considerato spam"
 
 #: contrib/comments/models.py:22 contrib/contenttypes/models.py:74
 msgid "content type"
@@ -1447,7 +1466,7 @@ msgstr "commento"
 msgid "date/time submitted"
 msgstr "data/ora di inserimento"
 
-#: contrib/comments/models.py:60 db/models/fields/__init__.py:735
+#: contrib/comments/models.py:60 db/models/fields/__init__.py:751
 msgid "IP address"
 msgstr "indirizzo IP"
 
@@ -1456,8 +1475,10 @@ msgid "is public"
 msgstr "è pubblico"
 
 #: contrib/comments/models.py:62
-msgid "Uncheck this box to make the comment effectively disappear from the site."
-msgstr "Deseleziona questa casella per far sparire del tutto il commento dal sito."
+msgid ""
+"Uncheck this box to make the comment effectively disappear from the site."
+msgstr ""
+"Deseleziona questa casella per far sparire del tutto il commento dal sito."
 
 #: contrib/comments/models.py:64
 msgid "is removed"
@@ -1542,7 +1563,8 @@ msgstr "Grazie per aver approvato"
 #: contrib/comments/templates/comments/approved.html:7
 #: contrib/comments/templates/comments/deleted.html:7
 #: contrib/comments/templates/comments/flagged.html:7
-msgid "Thanks for taking the time to improve the quality of discussion on our site"
+msgid ""
+"Thanks for taking the time to improve the quality of discussion on our site"
 msgstr ""
 "Grazie per aver speso tempo a migliorare la qualità della discussione sul "
 "nostro sito"
@@ -1659,7 +1681,8 @@ msgid "content types"
 msgstr "content type"
 
 #: contrib/flatpages/admin.py:9
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
 "Esempio: '/about/contact/'. Assicurati di inserire le barre diagonali "
 "iniziali e finali."
@@ -1718,7 +1741,7 @@ msgstr "pagina statica"
 msgid "flat pages"
 msgstr "pagine statiche"
 
-#: contrib/formtools/wizard.py:130
+#: contrib/formtools/wizard.py:136
 msgid ""
 "We apologize, but your form has expired. Please continue filling out the "
 "form from this page."
@@ -1728,7 +1751,8 @@ msgstr ""
 
 #: contrib/gis/db/models/fields/__init__.py:42
 msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
-msgstr "Il campo base GIS -- corrisponde al tipo Geometry delle specifiche OpenGIS."
+msgstr ""
+"Il campo base GIS -- corrisponde al tipo Geometry delle specifiche OpenGIS."
 
 #: contrib/gis/db/models/fields/__init__.py:264
 msgid "Point"
@@ -2168,7 +2192,8 @@ msgstr "Inserisci un numero di nascita nel formato XXXXXX/XXXX o XXXXXXXXXX."
 
 #: contrib/localflavor/cz/forms.py:48
 msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
-msgstr "Parametro opzionale 'Sesso' non valido, i valori validi sono 'f' ed 'm'"
+msgstr ""
+"Parametro opzionale 'Sesso' non valido, i valori validi sono 'f' ed 'm'"
 
 #: contrib/localflavor/cz/forms.py:49
 msgid "Enter a valid birth number."
@@ -2524,7 +2549,8 @@ msgstr "Comunità di Valenza"
 
 #: contrib/localflavor/es/forms.py:19
 msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
-msgstr "Inserisci un codice postale valido nell'intervallo e formato 01XXX - 52XXX."
+msgstr ""
+"Inserisci un codice postale valido nell'intervallo e formato 01XXX - 52XXX."
 
 #: contrib/localflavor/es/forms.py:39
 msgid ""
@@ -2555,7 +2581,8 @@ msgid "Invalid checksum for CIF."
 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."
+msgid ""
+"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
 msgstr ""
 "Inserisci un numero di conto corrente bancario valido nel formato XXXX-XXXX-"
 "XX-XXXXXXXXXX."
@@ -2577,7 +2604,8 @@ msgid "Enter a zip code in the format XXXXXXX."
 msgstr "Inserisci un codice postale nel formato XXXXXXX."
 
 #: contrib/localflavor/is_/forms.py:17
-msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
+msgid ""
+"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
 msgstr ""
 "Inserisci un numero di identificazione islandese valido. Il formato è XXXXXX-"
 "XXXX ."
@@ -2999,7 +3027,8 @@ msgid "Wrong checksum for the National Identification Number."
 msgstr "Checksum errato per il Numero Identificativo Nazionale."
 
 #: contrib/localflavor/pl/forms.py:71
-msgid "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
+msgid ""
+"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
 msgstr ""
 "Inserisci un campo di numero d'imposta (NIP) nel formato XXX-XXX-XX-XX o XX-"
 "XX-XXX-XXX."
@@ -3096,7 +3125,8 @@ msgstr "Inserisci un codice CNP valido."
 
 #: contrib/localflavor/ro/forms.py:141
 msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
-msgstr "Inserisci un codice IBAN valido nel formato ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
+msgstr ""
+"Inserisci un codice IBAN valido nel formato ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
 
 #: contrib/localflavor/ro/forms.py:171
 msgid "Phone numbers must be in XXXX-XXXXXX format."
@@ -3742,12 +3772,21 @@ msgstr "Galles"
 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
 msgstr "Inserisci un codice postale nel formato XXXXX o XXXXX-XXXX ."
 
+#: contrib/localflavor/us/forms.py:25
+#, fuzzy
+msgid "Phone numbers must be in XXX-XXX-XXXX format."
+msgstr "I numeri di telefono devono essere in formato XX-XXXX-XXXX ."
+
 #: contrib/localflavor/us/forms.py:54
 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
 msgstr ""
 "Inserisci un numero di assistenza sociale USA valido, nel formato XXX-XX-"
 "XXXX ."
 
+#: contrib/localflavor/us/forms.py:87
+msgid "Enter a U.S. state or territory."
+msgstr ""
+
 #: contrib/localflavor/us/models.py:8
 msgid "U.S. state (two uppercase letters)"
 msgstr "Stato USA (due lettere maiuscole)"
@@ -3864,113 +3903,114 @@ msgstr "nome visualizzato"
 msgid "sites"
 msgstr "siti"
 
-#: db/models/fields/__init__.py:62
+#: db/models/fields/__init__.py:67
 #, python-format
 msgid "Field of type: %(field_type)s"
 msgstr "Campo di tipo: %(field_type)s"
 
-#: db/models/fields/__init__.py:348 db/models/fields/__init__.py:710
-#: db/models/fields/__init__.py:790 db/models/fields/__init__.py:800
-#: db/models/fields/__init__.py:827
+#: db/models/fields/__init__.py:355 db/models/fields/__init__.py:720
+#: db/models/fields/__init__.py:806 db/models/fields/__init__.py:816
+#: db/models/fields/__init__.py:843
 msgid "Integer"
 msgstr "Intero"
 
-#: db/models/fields/__init__.py:362 db/models/fields/__init__.py:726
+#: db/models/fields/__init__.py:369 db/models/fields/__init__.py:742
 msgid "This value must be an integer."
 msgstr "Questo valore deve essere un intero."
 
-#: db/models/fields/__init__.py:380
+#: db/models/fields/__init__.py:387
 msgid "Boolean (Either True or False)"
 msgstr "Booleano (True o False)"
 
-#: db/models/fields/__init__.py:395
+#: db/models/fields/__init__.py:402
 msgid "This value must be either True or False."
 msgstr "Questo valore deve essere True o False."
 
-#: db/models/fields/__init__.py:423 db/models/fields/__init__.py:810
+#: db/models/fields/__init__.py:430 db/models/fields/__init__.py:826
 #, python-format
 msgid "String (up to %(max_length)s)"
 msgstr "Stringa (fino a %(max_length)s)"
 
-#: db/models/fields/__init__.py:435
+#: db/models/fields/__init__.py:442
 msgid "This field cannot be null."
 msgstr "Questo campo non può essere nullo."
 
-#: db/models/fields/__init__.py:445
+#: db/models/fields/__init__.py:455
 msgid "Comma-separated integers"
 msgstr "Interi separati da virgola"
 
-#: db/models/fields/__init__.py:452
+#: db/models/fields/__init__.py:462
 msgid "Enter only digits separated by commas."
 msgstr "Inserisci solo cifre separate da virgole."
 
-#: db/models/fields/__init__.py:461
+#: db/models/fields/__init__.py:471
 msgid "Date (without time)"
 msgstr "Data (senza ora)"
 
-#: db/models/fields/__init__.py:484
+#: db/models/fields/__init__.py:494
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "Inserisci una data valida in formato AAAA-MM-GG."
 
-#: db/models/fields/__init__.py:493
+#: db/models/fields/__init__.py:503
 #, python-format
 msgid "Invalid date: %s"
 msgstr "Data non valida: %s"
 
-#: db/models/fields/__init__.py:537
+#: db/models/fields/__init__.py:547
 msgid "Date (with time)"
 msgstr "Data (con ora)"
 
-#: db/models/fields/__init__.py:558 db/models/fields/__init__.py:576
+#: db/models/fields/__init__.py:568 db/models/fields/__init__.py:586
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Inserisci una data/ora valida nel formato AAAA-MM-GG OO:MM[ss[.uuuuuu]]."
+msgstr ""
+"Inserisci una data/ora valida nel formato AAAA-MM-GG OO:MM[ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:598
+#: db/models/fields/__init__.py:608
 msgid "Decimal number"
 msgstr "Numero decimale"
 
-#: db/models/fields/__init__.py:613
+#: db/models/fields/__init__.py:623
 msgid "This value must be a decimal number."
 msgstr "Questo valore deve essere un numero decimale."
 
-#: db/models/fields/__init__.py:652
+#: db/models/fields/__init__.py:662
 msgid "E-mail address"
 msgstr "Indirizzo e-mail"
 
-#: db/models/fields/__init__.py:663 db/models/fields/files.py:220
+#: db/models/fields/__init__.py:673 db/models/fields/files.py:220
 #: db/models/fields/files.py:331
 msgid "File path"
 msgstr "Percorso di file"
 
-#: db/models/fields/__init__.py:684
+#: db/models/fields/__init__.py:694
 msgid "Floating point number"
 msgstr "Numero decimale"
 
-#: db/models/fields/__init__.py:701
+#: db/models/fields/__init__.py:711
 msgid "This value must be a float."
 msgstr "Questo valore deve essere un numero a virgola mobile."
 
-#: db/models/fields/__init__.py:750
+#: db/models/fields/__init__.py:766
 msgid "Boolean (Either True, False or None)"
 msgstr "Booleano (True, False o None)"
 
-#: db/models/fields/__init__.py:764
+#: db/models/fields/__init__.py:780
 msgid "This value must be either None, True or False."
 msgstr "Questo valore deve essere None, True o False."
 
-#: db/models/fields/__init__.py:832
+#: db/models/fields/__init__.py:848
 msgid "Text"
 msgstr "Testo"
 
-#: db/models/fields/__init__.py:842
+#: db/models/fields/__init__.py:863
 msgid "Time"
 msgstr "Ora"
 
-#: db/models/fields/__init__.py:873 db/models/fields/__init__.py:887
+#: db/models/fields/__init__.py:894 db/models/fields/__init__.py:908
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
 msgstr "Inserisci un'ora valida nel formato OO:MM[ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:927
+#: db/models/fields/__init__.py:948
 msgid "XML text"
 msgstr "Testo XML"
 
@@ -3987,160 +4027,170 @@ msgid "Many-to-many relationship"
 msgstr "Relazione molti a molti"
 
 #: db/models/fields/related.py:819
-msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr "Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno."
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Tieni premuto \"Control\", o \"Command\" su Mac, per selezionarne più di uno."
 
 #: db/models/fields/related.py:897
 #, 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] "Inserisci un ID valido per %(self)s. Il valore %(value)r non è valido."
-msgstr[1] "Inserisci ID validi per %(self)s. I valori %(value)r non sono validi."
+msgid_plural ""
+"Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgstr[0] ""
+"Inserisci un ID valido per %(self)s. Il valore %(value)r non è valido."
+msgstr[1] ""
+"Inserisci ID validi per %(self)s. I valori %(value)r non sono validi."
 
-#: forms/fields.py:44
+#: forms/fields.py:53
 msgid "This field is required."
 msgstr "Questo campo è obbligatorio."
 
-#: forms/fields.py:45
+#: forms/fields.py:54
 msgid "Enter a valid value."
 msgstr "Inserisci un valore valido."
 
-#: forms/fields.py:128
+#: forms/fields.py:137
 #, 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)."
 
-#: forms/fields.py:129
+#: forms/fields.py:138
 #, 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)."
 
-#: forms/fields.py:156
+#: forms/fields.py:165
 msgid "Enter a whole number."
 msgstr "Inserisci un numero intero."
 
-#: forms/fields.py:157 forms/fields.py:186 forms/fields.py:215
+#: forms/fields.py:166 forms/fields.py:195 forms/fields.py:224
 #, python-format
 msgid "Ensure this value is less than or equal to %s."
 msgstr "Assicurarsi che questo valore sia minore o uguale a %s."
 
-#: forms/fields.py:158 forms/fields.py:187 forms/fields.py:216
+#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225
 #, python-format
 msgid "Ensure this value is greater than or equal to %s."
 msgstr "Assicurarsi che questo valore sia maggiore o uguale a %s."
 
-#: forms/fields.py:185 forms/fields.py:214
+#: forms/fields.py:194 forms/fields.py:223
 msgid "Enter a number."
 msgstr "Inserisci un numero."
 
-#: forms/fields.py:217
+#: forms/fields.py:226
 #, 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."
 
-#: forms/fields.py:218
+#: forms/fields.py:227
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
 msgstr "Assicurarsi che non vi siano più di %s cifre decimali."
 
-#: forms/fields.py:219
+#: forms/fields.py:228
 #, 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."
 
-#: forms/fields.py:278 forms/fields.py:853
+#: forms/fields.py:293 forms/fields.py:873
 msgid "Enter a valid date."
 msgstr "Inserisci una data valida."
 
-#: forms/fields.py:312 forms/fields.py:854
+#: forms/fields.py:327 forms/fields.py:874
 msgid "Enter a valid time."
 msgstr "Inserisci un'ora valida."
 
-#: forms/fields.py:351
+#: forms/fields.py:366
 msgid "Enter a valid date/time."
 msgstr "Inserisci una coppia data/ora valida."
 
-#: forms/fields.py:437
+#: forms/fields.py:452
 msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Non è stato inviato alcun file. Verifica il tipo di codifica della form."
+msgstr ""
+"Non è stato inviato alcun file. Verifica il tipo di codifica della form."
 
-#: forms/fields.py:438
+#: forms/fields.py:453
 msgid "No file was submitted."
 msgstr "Nessun file è stato inviato."
 
-#: forms/fields.py:439
+#: forms/fields.py:454
 msgid "The submitted file is empty."
 msgstr "Il file inviato è vuoto."
 
-#: forms/fields.py:440
+#: forms/fields.py:455
 #, python-format
-msgid "Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
 msgstr ""
 "Assicurarsi che questo nome di file non contenga più di %(max)d caratteri "
 "(ne ha %(length)d)."
 
-#: forms/fields.py:473
+#: forms/fields.py:488
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
-msgstr "Carica un'immagine valida. Il file caricato non è un'immagine o è corrotto."
+msgstr ""
+"Carica un'immagine valida. Il file caricato non è un'immagine o è corrotto."
 
-#: forms/fields.py:534
+#: forms/fields.py:554
 msgid "Enter a valid URL."
 msgstr "Inserisci una URL valida."
 
-#: forms/fields.py:535
+#: forms/fields.py:555
 msgid "This URL appears to be a broken link."
 msgstr "Questa URL non sembra funzionare."
 
-#: forms/fields.py:615 forms/fields.py:693
+#: forms/fields.py:635 forms/fields.py:713
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Scegli un'opzione valida. '%(value)s non compare tra quelle disponibili."
+msgstr ""
+"Scegli un'opzione valida. '%(value)s non compare tra quelle disponibili."
 
-#: forms/fields.py:694 forms/fields.py:755 forms/models.py:1005
+#: forms/fields.py:714 forms/fields.py:775 forms/models.py:1019
 msgid "Enter a list of values."
 msgstr "Inserisci una lista di valori."
 
-#: forms/fields.py:882
+#: forms/fields.py:902
 msgid "Enter a valid IPv4 address."
 msgstr "Inserisci un indirizzo IPv4 valido."
 
-#: forms/fields.py:892
-msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+#: forms/fields.py:912
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
 msgstr ""
 "Inserisci uno 'slug' valido contenente lettere, cifre, sottolineati o "
 "trattini."
 
-#: forms/formsets.py:271 forms/formsets.py:273
+#: forms/formsets.py:274 forms/formsets.py:276
 msgid "Order"
 msgstr "Ordine"
 
-#: forms/models.py:367
+#: forms/models.py:375
 #, python-format
 msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
 msgstr "%(field_name)s deve essere unico per %(lookup)s %(date_field)s."
 
-#: forms/models.py:381 forms/models.py:389
+#: forms/models.py:389 forms/models.py:397
 #, python-format
 msgid "%(model_name)s with this %(field_label)s already exists."
 msgstr "%(model_name)s con questo %(field_label)s esiste già."
 
-#: forms/models.py:594
+#: forms/models.py:602
 #, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Correggi i dati duplicati di %(field)s."
 
-#: forms/models.py:598
+#: forms/models.py:606
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr "Correggi i dati duplicati di %(field)s, che deve essere unico."
 
-#: forms/models.py:604
+#: forms/models.py:612
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
@@ -4149,52 +4199,53 @@ msgstr ""
 "Correggi i dati duplicati di %(field_name)s che deve essere unico/a per %"
 "(lookup)s in %(date_field)s."
 
-#: forms/models.py:612
+#: forms/models.py:620
 msgid "Please correct the duplicate values below."
 msgstr "Correggi i dati duplicati qui sotto."
 
-#: forms/models.py:869
+#: forms/models.py:877
 msgid "The inline foreign key did not match the parent instance primary key."
-msgstr "La foreign key inline non concorda con la chiave primaria dell'istanza padre."
+msgstr ""
+"La foreign key inline non concorda con la chiave primaria dell'istanza padre."
 
-#: forms/models.py:932
+#: forms/models.py:940
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
 "Scegli un'opzione valida. La scelta effettuata non compare tra quelle "
 "disponibili."
 
-#: forms/models.py:1006
+#: forms/models.py:1020
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
 msgstr "Scegli un'opzione valida. %s non compare tra quelle disponibili."
 
-#: forms/models.py:1008
+#: forms/models.py:1022
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" non è un valore valido per una chiave primaria."
 
-#: template/defaultfilters.py:768
+#: template/defaultfilters.py:771
 msgid "yes,no,maybe"
 msgstr "sì,no,forse"
 
-#: template/defaultfilters.py:799
+#: template/defaultfilters.py:802
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d byte"
 
-#: template/defaultfilters.py:801
+#: template/defaultfilters.py:804
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: template/defaultfilters.py:803
+#: template/defaultfilters.py:806
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: template/defaultfilters.py:804
+#: template/defaultfilters.py:807
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
@@ -4457,19 +4508,19 @@ 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:406
 msgid "DATE_FORMAT"
 msgstr "j F Y"
 
-#: utils/translation/trans_real.py:401
+#: utils/translation/trans_real.py:408
 msgid "TIME_FORMAT"
 msgstr "H:i"
 
-#: utils/translation/trans_real.py:417
+#: utils/translation/trans_real.py:424
 msgid "YEAR_MONTH_FORMAT"
 msgstr "Y F"
 
-#: utils/translation/trans_real.py:418
+#: utils/translation/trans_real.py:425
 msgid "MONTH_DAY_FORMAT"
 msgstr "F j"
 
@@ -4488,3 +4539,8 @@ msgstr "%(verbose_name)s aggiornato/a correttamente."
 msgid "The %(verbose_name)s was deleted."
 msgstr "%(verbose_name)s cancellato/a."
 
+#~ msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#~ msgstr "Uno o più %(fieldname)s in %(name)s: %(obj)s"
+
+#~ msgid "One or more %(fieldname)s in %(name)s:"
+#~ msgstr "Uno o più %(fieldname)s in %(name)s:"