Index: django/conf/locale/ca/LC_MESSAGES/django.po
===================================================================
--- django/conf/locale/ca/LC_MESSAGES/django.po	(revision 13317)
+++ django/conf/locale/ca/LC_MESSAGES/django.po	(working copy)
@@ -1,11 +1,11 @@
-# translation of django.po to
+# translation of django.po to Catalan
 # This file is distributed under the same license as the Django package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-30 11:19+0100\n"
+"POT-Creation-Date: 2010-06-03 20:18+0200\n"
 "PO-Revision-Date: 2009-03-24 13:28+0100\n"
 "Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -14,225 +14,265 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: conf/global_settings.py:44
+#: .\conf\global_settings.py:44
 msgid "Arabic"
-msgstr "aràbic"
+msgstr "àrab"
 
-#: conf/global_settings.py:45
+#: .\conf\global_settings.py:45
+msgid "Bulgarian"
+msgstr "búlgar"
+
+#: .\conf\global_settings.py:46
 msgid "Bengali"
 msgstr "bengalí"
 
-#: conf/global_settings.py:46
-msgid "Bulgarian"
-msgstr "búlgar"
+#: .\conf\global_settings.py:47
+msgid "Bosnian"
+msgstr "bosnià"
 
-#: conf/global_settings.py:47
+#: .\conf\global_settings.py:48
 msgid "Catalan"
 msgstr "català"
 
-#: conf/global_settings.py:48
+#: .\conf\global_settings.py:49
 msgid "Czech"
 msgstr "txec"
 
-#: conf/global_settings.py:49
+#: .\conf\global_settings.py:50
 msgid "Welsh"
-msgstr "galès"
+msgstr "gal·lès"
 
-#: conf/global_settings.py:50
+#: .\conf\global_settings.py:51
 msgid "Danish"
 msgstr "danès"
 
-#: conf/global_settings.py:51
+#: .\conf\global_settings.py:52
 msgid "German"
 msgstr "alemany"
 
-#: conf/global_settings.py:52
+#: .\conf\global_settings.py:53
 msgid "Greek"
 msgstr "grec"
 
-#: conf/global_settings.py:53
+#: .\conf\global_settings.py:54
 msgid "English"
 msgstr "anglès"
 
-#: conf/global_settings.py:54
+#: .\conf\global_settings.py:55
+msgid "British English"
+msgstr "anglès britànic"
+
+#: .\conf\global_settings.py:56
 msgid "Spanish"
 msgstr "espanyol"
 
-#: conf/global_settings.py:55
+#: .\conf\global_settings.py:57
+msgid "Argentinean Spanish"
+msgstr "castellà argentí"
+
+#: .\conf\global_settings.py:58
 msgid "Estonian"
 msgstr "estonià"
 
-#: conf/global_settings.py:56
-msgid "Argentinean Spanish"
-msgstr "castellà argentí"
-
-#: conf/global_settings.py:57
+#: .\conf\global_settings.py:59
 msgid "Basque"
 msgstr "euskera"
 
-#: conf/global_settings.py:58
+#: .\conf\global_settings.py:60
 msgid "Persian"
 msgstr "persa"
 
-#: conf/global_settings.py:59
+#: .\conf\global_settings.py:61
 msgid "Finnish"
 msgstr "finlandès"
 
-#: conf/global_settings.py:60
+#: .\conf\global_settings.py:62
 msgid "French"
 msgstr "francès"
 
-#: conf/global_settings.py:61
+#: .\conf\global_settings.py:63
+msgid "Frisian"
+msgstr "frisi"
+
+#: .\conf\global_settings.py:64
 msgid "Irish"
 msgstr "irlandès"
 
-#: conf/global_settings.py:62
+#: .\conf\global_settings.py:65
 msgid "Galician"
 msgstr "gallec"
 
-#: conf/global_settings.py:63
-msgid "Hungarian"
-msgstr "húngar"
-
-#: conf/global_settings.py:64
+#: .\conf\global_settings.py:66
 msgid "Hebrew"
 msgstr "hebreu"
 
-#: conf/global_settings.py:65
+#: .\conf\global_settings.py:67
 msgid "Hindi"
 msgstr "hindi"
 
-#: conf/global_settings.py:66
+#: .\conf\global_settings.py:68
 msgid "Croatian"
 msgstr "croat"
 
-#: conf/global_settings.py:67
+#: .\conf\global_settings.py:69
+msgid "Hungarian"
+msgstr "hongarès"
+
+#: .\conf\global_settings.py:70
+msgid "Indonesian"
+msgstr "indonesi"
+
+#: .\conf\global_settings.py:71
 msgid "Icelandic"
 msgstr "islandès"
 
-#: conf/global_settings.py:68
+#: .\conf\global_settings.py:72
 msgid "Italian"
 msgstr "italià"
 
-#: conf/global_settings.py:69
+#: .\conf\global_settings.py:73
 msgid "Japanese"
 msgstr "japonès"
 
-#: conf/global_settings.py:70
+#: .\conf\global_settings.py:74
 msgid "Georgian"
 msgstr "georgià"
 
-#: conf/global_settings.py:71
-msgid "Korean"
-msgstr "coreà"
-
-#: conf/global_settings.py:72
+#: .\conf\global_settings.py:75
 msgid "Khmer"
 msgstr "khmer"
 
-#: conf/global_settings.py:73
+#: .\conf\global_settings.py:76
 msgid "Kannada"
-msgstr "canès"
+msgstr "kannarès"
 
-#: conf/global_settings.py:74
-msgid "Latvian"
-msgstr "letó"
+#: .\conf\global_settings.py:77
+msgid "Korean"
+msgstr "coreà"
 
-#: conf/global_settings.py:75
+#: .\conf\global_settings.py:78
 msgid "Lithuanian"
 msgstr "lituà"
 
-#: conf/global_settings.py:76
+#: .\conf\global_settings.py:79
+msgid "Latvian"
+msgstr "letó"
+
+#: .\conf\global_settings.py:80
 msgid "Macedonian"
 msgstr "macedoni"
 
-#: conf/global_settings.py:77
+#: .\conf\global_settings.py:81
+msgid "Mongolian"
+msgstr "mongol"
+
+#: .\conf\global_settings.py:82
 msgid "Dutch"
 msgstr "holandès"
 
-#: conf/global_settings.py:78
+#: .\conf\global_settings.py:83
 msgid "Norwegian"
-msgstr "norueg"
+msgstr "noruec"
 
-#: conf/global_settings.py:79
+#: .\conf\global_settings.py:84
+msgid "Norwegian Bokmal"
+msgstr "noruec bokmal"
+
+#: .\conf\global_settings.py:85
+msgid "Norwegian Nynorsk"
+msgstr "noruec nynorsk"
+
+#: .\conf\global_settings.py:86
 msgid "Polish"
-msgstr "polac"
+msgstr "polonès"
 
-#: conf/global_settings.py:80
+#: .\conf\global_settings.py:87
 msgid "Portuguese"
 msgstr "portuguès"
 
-#: conf/global_settings.py:81
+#: .\conf\global_settings.py:88
 msgid "Brazilian Portuguese"
 msgstr "portuguès de brasil"
 
-#: conf/global_settings.py:82
+#: .\conf\global_settings.py:89
 msgid "Romanian"
-msgstr "rumanès"
+msgstr "romanès"
 
-#: conf/global_settings.py:83
+#: .\conf\global_settings.py:90
 msgid "Russian"
-msgstr "rús"
+msgstr "rus"
 
-#: conf/global_settings.py:84
+#: .\conf\global_settings.py:91
 msgid "Slovak"
 msgstr "eslovac"
 
-#: conf/global_settings.py:85
+#: .\conf\global_settings.py:92
 msgid "Slovenian"
-msgstr "esloveni"
+msgstr "eslovè"
 
-#: conf/global_settings.py:86
+#: .\conf\global_settings.py:93
+msgid "Albanian"
+msgstr "albanès"
+
+#: .\conf\global_settings.py:94
 msgid "Serbian"
 msgstr "serbi"
 
-#: conf/global_settings.py:87
+#: .\conf\global_settings.py:95
+msgid "Serbian Latin"
+msgstr "serbi llatí"
+
+#: .\conf\global_settings.py:96
 msgid "Swedish"
 msgstr "suec"
 
-#: conf/global_settings.py:88
+#: .\conf\global_settings.py:97
 msgid "Tamil"
 msgstr "tàmil"
 
-#: conf/global_settings.py:89
+#: .\conf\global_settings.py:98
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:90
+#: .\conf\global_settings.py:99
 msgid "Thai"
 msgstr "tailandès"
 
-#: conf/global_settings.py:91
+#: .\conf\global_settings.py:100
 msgid "Turkish"
 msgstr "turc"
 
-#: conf/global_settings.py:92
+#: .\conf\global_settings.py:101
 msgid "Ukrainian"
-msgstr "ucranià"
+msgstr "ucraïnès"
 
-#: conf/global_settings.py:93
+#: .\conf\global_settings.py:102
+msgid "Vietnamese"
+msgstr "vietnamita"
+
+#: .\conf\global_settings.py:103
 msgid "Simplified Chinese"
 msgstr "xinès simplificat"
 
-#: conf/global_settings.py:94
+#: .\conf\global_settings.py:104
 msgid "Traditional Chinese"
 msgstr "xinès tradicional"
 
-#: contrib/admin/actions.py:60
+#: .\contrib\admin\actions.py:48
 #, python-format
 msgid "Successfully deleted %(count)d %(items)s."
 msgstr "Eliminat/s %(count)d %(items)s satisfactòriament."
 
-#: contrib/admin/actions.py:67 contrib/admin/options.py:1033
+#: .\contrib\admin\actions.py:55 .\contrib\admin\options.py:1125
 msgid "Are you sure?"
-msgstr "Esteu segurs?"
+msgstr "N'esteu segur?"
 
-#: contrib/admin/actions.py:85
+#: .\contrib\admin\actions.py:73
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Eliminar els %(verbose_name_plural)s seleccionats"
 
-#: contrib/admin/filterspecs.py:44
+#: .\contrib\admin\filterspecs.py:44
 #, python-format
 msgid ""
 "<h3>By %s:</h3>\n"
@@ -241,175 +281,197 @@
 "<h3>Per %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+#: .\contrib\admin\filterspecs.py:75 .\contrib\admin\filterspecs.py:92
+#: .\contrib\admin\filterspecs.py:147 .\contrib\admin\filterspecs.py:173
 msgid "All"
 msgstr "Tots"
 
-#: contrib/admin/filterspecs.py:113
+#: .\contrib\admin\filterspecs.py:113
 msgid "Any date"
 msgstr "Qualsevol data"
 
-#: contrib/admin/filterspecs.py:114
+#: .\contrib\admin\filterspecs.py:114
 msgid "Today"
 msgstr "Avui"
 
-#: contrib/admin/filterspecs.py:117
+#: .\contrib\admin\filterspecs.py:117
 msgid "Past 7 days"
 msgstr "Últims 7 dies"
 
-#: contrib/admin/filterspecs.py:119
+#: .\contrib\admin\filterspecs.py:119
 msgid "This month"
 msgstr "Aquest mes"
 
-#: contrib/admin/filterspecs.py:121
+#: .\contrib\admin\filterspecs.py:121
 msgid "This year"
 msgstr "Aquest any"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
+#: .\contrib\admin\filterspecs.py:147 .\forms\widgets.py:466
 msgid "Yes"
-msgstr "Si"
+msgstr "Sí"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
+#: .\contrib\admin\filterspecs.py:147 .\forms\widgets.py:466
 msgid "No"
 msgstr "No"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:435
+#: .\contrib\admin\filterspecs.py:154 .\forms\widgets.py:466
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: contrib/admin/helpers.py:14
+#: .\contrib\admin\helpers.py:20
 msgid "Action:"
 msgstr "Acció:"
 
-#: contrib/admin/models.py:19
+#: .\contrib\admin\models.py:19
 msgid "action time"
 msgstr "moment de l'acció"
 
-#: contrib/admin/models.py:22
+#: .\contrib\admin\models.py:22
 msgid "object id"
-msgstr "id del objecte"
+msgstr "id de l'objecte"
 
-#: contrib/admin/models.py:23
+#: .\contrib\admin\models.py:23
 msgid "object repr"
 msgstr "'repr' de l'objecte"
 
-#: contrib/admin/models.py:24
+#: .\contrib\admin\models.py:24
 msgid "action flag"
-msgstr "marca de l'acció"
+msgstr "indicador de l'acció"
 
-#: contrib/admin/models.py:25
+#: .\contrib\admin\models.py:25
 msgid "change message"
 msgstr "missatge del canvi"
 
-#: contrib/admin/models.py:28
+#: .\contrib\admin\models.py:28
 msgid "log entry"
 msgstr "entrada del registre"
 
-#: contrib/admin/models.py:29
+#: .\contrib\admin\models.py:29
 msgid "log entries"
 msgstr "entrades del registre"
 
-#: contrib/admin/options.py:134 contrib/admin/options.py:148
+#: .\contrib\admin\options.py:138 .\contrib\admin\options.py:153
 msgid "None"
 msgstr "cap"
 
-#: contrib/admin/options.py:521
+#: .\contrib\admin\options.py:559
 #, python-format
 msgid "Changed %s."
 msgstr "Modificat %s."
 
-#: contrib/admin/options.py:521 contrib/admin/options.py:531
-#: contrib/comments/templates/comments/preview.html:16 forms/models.py:384
-#: forms/models.py:596
+#: .\contrib\admin\options.py:559 .\contrib\admin\options.py:569
+#: .\contrib\comments\templates\comments\preview.html.py:16
+#: .\db\models\base.py:845 .\forms\models.py:568
 msgid "and"
 msgstr "i"
 
-#: contrib/admin/options.py:526
+#: .\contrib\admin\options.py:564
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Afegit %(name)s \"%(object)s\""
 
-#: contrib/admin/options.py:530
+#: .\contrib\admin\options.py:568
 #, python-format
 msgid "Changed %(list)s for %(name)s \"%(object)s\"."
 msgstr "Modificat %(list)s per a %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:535
+#: .\contrib\admin\options.py:573
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Eliminat %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:539
+#: .\contrib\admin\options.py:577
 msgid "No fields changed."
-msgstr "Cap camp canviat."
+msgstr "Cap camp modificat."
 
-#: contrib/admin/options.py:601 contrib/auth/admin.py:67
+#: .\contrib\admin\options.py:643
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "El/la %(name)s \"%(obj)s\".ha estat afegit/da amb èxit."
+msgstr "El/la %(name)s \"%(obj)s\" ha estat afegit/da amb èxit."
 
-#: contrib/admin/options.py:605 contrib/admin/options.py:638
-#: contrib/auth/admin.py:75
+#: .\contrib\admin\options.py:647 .\contrib\admin\options.py:680
 msgid "You may edit it again below."
-msgstr "Podeu editar-lo de nou a baix."
+msgstr "Podeu editar-lo de nou a sota."
 
-#: contrib/admin/options.py:615 contrib/admin/options.py:648
+#: .\contrib\admin\options.py:657 .\contrib\admin\options.py:690
 #, python-format
 msgid "You may add another %s below."
-msgstr "Podeu afegir un altre %s a baix."
+msgstr "Podeu afegir un altre %s a sota."
 
-#: contrib/admin/options.py:636
+#: .\contrib\admin\options.py:678
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was changed successfully."
 msgstr "S'ha modificat amb èxit el/la %(name)s \"%(obj)s."
 
-#: contrib/admin/options.py:644
+#: .\contrib\admin\options.py:686
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
-"S'ha afegit exitosament el/la %(name)s \"%(obj)s\". Pot editar-lo de nou "
-"abaix."
+"S'ha afegit amb èxit el/la %(name)s \"%(obj)s\". Pot editar-lo de nou a sota."
 
-#: contrib/admin/options.py:777
+#: .\contrib\admin\options.py:740 .\contrib\admin\options.py:997
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+"Heu de seleccionar els elements per poder realitzar-hi accions. "
+"No heu seleccionat cap element."
+
+#: .\contrib\admin\options.py:759
+msgid "No action selected."
+msgstr "no heu seleccionat cap acció"
+
+#: .\contrib\admin\options.py:840
 #, python-format
 msgid "Add %s"
 msgstr "Afegir %s"
 
-#: contrib/admin/options.py:809 contrib/admin/options.py:1011
+#: .\contrib\admin\options.py:866 .\contrib\admin\options.py:1105
 #, python-format
 msgid "%(name)s object with primary key %(key)r does not exist."
-msgstr "No existèix cap objecte %(name)s amb la clau primària %(key)r."
+msgstr "No existeix cap objecte %(name)s amb la clau primària %(key)r."
 
-#: contrib/admin/options.py:866
+#: .\contrib\admin\options.py:931
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: contrib/admin/options.py:910
+#: .\contrib\admin\options.py:977
 msgid "Database error"
 msgstr "Error de base de dades"
 
-#: contrib/admin/options.py:946
+#: .\contrib\admin\options.py:1039
 #, python-format
 msgid "%(count)s %(name)s was changed successfully."
 msgid_plural "%(count)s %(name)s were changed successfully."
 msgstr[0] "%(count)s %(name)s s'ha modificat amb èxit."
 msgstr[1] "%(count)s %(name)s s'han modificat amb èxit."
 
-#: contrib/admin/options.py:1026
+#: .\contrib\admin\options.py:1066
 #, python-format
+msgid "%(total_count)s selected"
+msgid_plural "All %(total_count)s selected"
+msgstr[0] "%(total_count)s seleccionat(s)"
+msgstr[1] "Tots %(total_count)s seleccionat(s)"
+
+#: .\contrib\admin\options.py:1071
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr "0 de %(cnt)s seleccionats"
+
+#: .\contrib\admin\options.py:1118
+#, python-format
 msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "El/la %(name)s \"%(obj)s\" ha estat eliminat amb èxit."
+msgstr "El/la %(name)s \"%(obj)s\" s'ha eliminat amb èxit."
 
-#: contrib/admin/options.py:1063
+#: .\contrib\admin\options.py:1155
 #, python-format
 msgid "Change history: %s"
 msgstr "Modificar històric: %s"
 
-#: contrib/admin/sites.py:22 contrib/admin/views/decorators.py:14
-#: contrib/auth/forms.py:80
+#: .\contrib\admin\sites.py:18 .\contrib\admin\views\decorators.py:14
+#: .\contrib\auth\forms.py:81
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
@@ -417,216 +479,223 @@
 "Si us plau, introduïu un nom d'usuari i contrasenya vàlids. Tingueu en "
 "compte que tots dos camps son sensibles a majúscules i minúscules."
 
-#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:40
+#: .\contrib\admin\sites.py:307 .\contrib\admin\views\decorators.py:40
 msgid "Please log in again, because your session has expired."
-msgstr "Si us plau, identifiqueu-vos de nou doncs la vostra sessió ha expirat."
+msgstr "Si us plau, entreu de nou perquè la vostra sessió ha caducat."
 
-#: contrib/admin/sites.py:299 contrib/admin/views/decorators.py:47
+#: .\contrib\admin\sites.py:314 .\contrib\admin\views\decorators.py:47
 msgid ""
 "Looks like your browser isn't configured to accept cookies. Please enable "
 "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. "
+"Sembla ser que el vostre navegador no està configurat per acceptar galetes "
+"('cookies'). Si us plau, habiliteu les galetes, recarregueu aquesta pàgina i "
+"proveu-ho de nou. "
 
-#: contrib/admin/sites.py:315 contrib/admin/sites.py:321
-#: contrib/admin/views/decorators.py:66
+#: .\contrib\admin\sites.py:330 .\contrib\admin\sites.py:336
+#: .\contrib\admin\views\decorators.py:66
 msgid "Usernames cannot contain the '@' character."
-msgstr "Els noms d'usuari no poden contenir el caracter '@'."
+msgstr "Els noms d'usuari no poden contenir el caràcter '@'."
 
-#: contrib/admin/sites.py:318 contrib/admin/views/decorators.py:62
+#: .\contrib\admin\sites.py:333 .\contrib\admin\views\decorators.py:62
 #, 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 el "
+"seu lloc."
 
-#: contrib/admin/sites.py:374
+#: .\contrib\admin\sites.py:389
 msgid "Site administration"
-msgstr "Lloc administratiu"
+msgstr "Administració del lloc"
 
-#: contrib/admin/sites.py:388 contrib/admin/templates/admin/login.html:26
-#: contrib/admin/templates/registration/password_reset_complete.html:14
-#: contrib/admin/views/decorators.py:20
+#: .\contrib\admin\sites.py:403
+#: .\contrib\admin\templates\admin\login.html.py:26
+#: .\contrib\admin\templates\registration\password_reset_complete.html.py:14
+#: .\contrib\admin\views\decorators.py:20
 msgid "Log in"
 msgstr "Iniciar sessió"
 
-#: contrib/admin/sites.py:433
+#: .\contrib\admin\sites.py:448
 #, python-format
 msgid "%s administration"
 msgstr "Administració de %s"
 
-#: contrib/admin/util.py:168
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Un o més %(fieldname)s en %(name)s: %(obj)s"
-
-#: contrib/admin/util.py:173
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Un o més %(fieldname)s en %(name)s:"
-
-#: contrib/admin/widgets.py:72
+#: .\contrib\admin\widgets.py:75
 msgid "Date:"
 msgstr "Data:"
 
-#: contrib/admin/widgets.py:72
+#: .\contrib\admin\widgets.py:75
 msgid "Time:"
 msgstr "Hora:"
 
-#: contrib/admin/widgets.py:96
+#: .\contrib\admin\widgets.py:99
 msgid "Currently:"
 msgstr "Actualment:"
 
-#: contrib/admin/widgets.py:96
+#: .\contrib\admin\widgets.py:99
 msgid "Change:"
 msgstr "Modificar:"
 
-#: contrib/admin/widgets.py:125
+#: .\contrib\admin\widgets.py:129
 msgid "Lookup"
 msgstr "Cercar"
 
-#: contrib/admin/widgets.py:237
+#: .\contrib\admin\widgets.py:244
 msgid "Add Another"
-msgstr "Afegir un altre"
+msgstr "Afegir-ne un altre"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
+#: .\contrib\admin\templates\admin\404.html.py:4
+#: .\contrib\admin\templates\admin\404.html.py:8
 msgid "Page not found"
 msgstr "No s'ha pogut trobar la pàgina"
 
-#: contrib/admin/templates/admin/404.html:10
+#: .\contrib\admin\templates\admin\404.html.py:10
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Ho sentim, però no s'ha pogut trobar la pàgina sol·licitada"
 
-#: 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/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/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_complete.html:4
-#: contrib/admin/templates/registration/password_reset_confirm.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
+#: .\contrib\admin\templates\admin\500.html.py:4
+#: .\contrib\admin\templates\admin\app_index.html.py:8
+#: .\contrib\admin\templates\admin\base.html.py:55
+#: .\contrib\admin\templates\admin\change_form.html.py:18
+#: .\contrib\admin\templates\admin\change_list.html.py:42
+#: .\contrib\admin\templates\admin\delete_confirmation.html.py:6
+#: .\contrib\admin\templates\admin\delete_selected_confirmation.html.py:6
+#: .\contrib\admin\templates\admin\invalid_setup.html.py:4
+#: .\contrib\admin\templates\admin\object_history.html.py:6
+#: .\contrib\admin\templates\admin\auth\user\change_password.html.py:11
+#: .\contrib\admin\templates\registration\logged_out.html.py:4
+#: .\contrib\admin\templates\registration\password_change_done.html.py:4
+#: .\contrib\admin\templates\registration\password_change_form.html.py:5
+#: .\contrib\admin\templates\registration\password_reset_complete.html.py:4
+#: .\contrib\admin\templates\registration\password_reset_confirm.html.py:4
+#: .\contrib\admin\templates\registration\password_reset_done.html.py:4
+#: .\contrib\admin\templates\registration\password_reset_form.html.py:4
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:3
 msgid "Home"
 msgstr "Inici"
 
-#: contrib/admin/templates/admin/500.html:4
+#: .\contrib\admin\templates\admin\500.html.py:4
 msgid "Server error"
 msgstr "Error del servidor"
 
-#: contrib/admin/templates/admin/500.html:6
+#: .\contrib\admin\templates\admin\500.html.py:6
 msgid "Server error (500)"
 msgstr "Error del servidor (500)"
 
-#: contrib/admin/templates/admin/500.html:9
+#: .\contrib\admin\templates\admin\500.html.py:9
 msgid "Server Error <em>(500)</em>"
 msgstr "Error del servidor <em>(500)</em>"
 
-#: contrib/admin/templates/admin/500.html:10
+#: .\contrib\admin\templates\admin\500.html.py:10
 msgid ""
 "There's been an error. It's been reported to the site administrators via e-"
 "mail and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Ha ocorregut un error. S'ha informat als administradors del lloc per correu "
-"electrònic y hauria d'arreglar-se en breu. Gràcies per la vostra paciència."
+"S'ha produït un error. Se n'ha informat els administradors del lloc per "
+"correu electrònic, i hauria d'arreglar-se en breu. Gràcies per la vostra "
+"paciència."
 
-#: contrib/admin/templates/admin/actions.html:4
+#: .\contrib\admin\templates\admin\actions.html.py:4
 msgid "Run the selected action"
-msgstr "Executar la acció seleccionada"
+msgstr "Executar l'acció seleccionada"
 
-#: contrib/admin/templates/admin/actions.html:4
+#: .\contrib\admin\templates\admin\actions.html.py:4
 msgid "Go"
 msgstr "Anar"
 
-#: contrib/admin/templates/admin/app_index.html:10
-#: contrib/admin/templates/admin/index.html:19
+#: .\contrib\admin\templates\admin\actions.html.py:11
+msgid "Click here to select the objects across all pages"
+msgstr "Feu clic aquí per seleccionar els objectes a totes les pàgines"
+
+#: .\contrib\admin\templates\admin\actions.html.py:11
 #, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr "Seleccioneu tots %(total_count)s %(module_name)s"
+
+#: .\contrib\admin\templates\admin\actions.html.py:13
+msgid "Clear selection"
+msgstr "Netejar la selecció"
+
+#: .\contrib\admin\templates\admin\app_index.html.py:10
+#: .\contrib\admin\templates\admin\index.html.py:19
+#, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
 
-#: contrib/admin/templates/admin/base.html:27
+#: .\contrib\admin\templates\admin\base.html.py:28
 msgid "Welcome,"
 msgstr "Benvingut/da,"
 
-#: contrib/admin/templates/admin/base.html:32
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
+#: .\contrib\admin\templates\admin\base.html.py:33
+#: .\contrib\admin\templates\registration\password_change_done.html.py:3
+#: .\contrib\admin\templates\registration\password_change_form.html.py:4
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:3
 msgid "Documentation"
 msgstr "Documentació"
 
-#: 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/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: .\contrib\admin\templates\admin\base.html.py:41
+#: .\contrib\admin\templates\admin\auth\user\change_password.html.py:15
+#: .\contrib\admin\templates\admin\auth\user\change_password.html.py:48
+#: .\contrib\admin\templates\registration\password_change_done.html.py:3
+#: .\contrib\admin\templates\registration\password_change_form.html.py:4
 msgid "Change password"
 msgstr "Canviar contrasenya"
 
-#: contrib/admin/templates/admin/base.html:47
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: .\contrib\admin\templates\admin\base.html.py:48
+#: .\contrib\admin\templates\registration\password_change_done.html.py:3
+#: .\contrib\admin\templates\registration\password_change_form.html.py:4
 msgid "Log out"
 msgstr "Finalitzar sessió"
 
-#: contrib/admin/templates/admin/base_site.html:4
+#: .\contrib\admin\templates\admin\base_site.html.py:4
 msgid "Django site admin"
 msgstr "Lloc administratiu de Django"
 
-#: contrib/admin/templates/admin/base_site.html:7
+#: .\contrib\admin\templates\admin\base_site.html.py:7
 msgid "Django administration"
 msgstr "Administració de Django"
 
-#: contrib/admin/templates/admin/change_form.html:20
-#: contrib/admin/templates/admin/index.html:29
+#: .\contrib\admin\templates\admin\change_form.html.py:21
+#: .\contrib\admin\templates\admin\index.html.py:29
 msgid "Add"
 msgstr "Afegir"
 
-#: contrib/admin/templates/admin/change_form.html:27
-#: contrib/admin/templates/admin/object_history.html:10
+#: .\contrib\admin\templates\admin\change_form.html.py:28
+#: .\contrib\admin\templates\admin\object_history.html.py:10
 msgid "History"
 msgstr "Històric"
 
-#: contrib/admin/templates/admin/change_form.html:28
-#: contrib/admin/templates/admin/edit_inline/stacked.html:13
-#: contrib/admin/templates/admin/edit_inline/tabular.html:28
+#: .\contrib\admin\templates\admin\change_form.html.py:29
+#: .\contrib\admin\templates\admin\edit_inline\stacked.html.py:9
+#: .\contrib\admin\templates\admin\edit_inline\tabular.html.py:28
 msgid "View on site"
 msgstr "Veure al lloc"
 
-#: 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.py:39
+#: .\contrib\admin\templates\admin\change_list.html.py:71
+#: .\contrib\admin\templates\admin\auth\user\change_password.html.py:24
+#: .\contrib\admin\templates\registration\password_change_form.html.py:15
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
-msgstr[0] "Si us plau, corregiu l'error mostrat a baix."
-msgstr[1] "Si us plau, corregiu els errors mostrats a baix."
+msgstr[0] "Si us plau, corregiu l'error mostrat a sota."
+msgstr[1] "Si us plau, corregiu els errors mostrats a sota."
 
-#: contrib/admin/templates/admin/change_list.html:46
+#: .\contrib\admin\templates\admin\change_list.html.py:63
 #, python-format
 msgid "Add %(name)s"
 msgstr "Afegir %(name)s"
 
-#: contrib/admin/templates/admin/change_list.html:65
+#: .\contrib\admin\templates\admin\change_list.html.py:82
 msgid "Filter"
 msgstr "Filtre"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:10
-#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275
+#: .\contrib\admin\templates\admin\delete_confirmation.html.py:10
+#: .\contrib\admin\templates\admin\submit_line.html.py:4
+#: .\forms\formsets.py:302
 msgid "Delete"
 msgstr "Eliminar"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:16
+#: .\contrib\admin\templates\admin\delete_confirmation.html.py:16
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
@@ -634,10 +703,10 @@
 "following types of objects:"
 msgstr ""
 "Eliminar el/la %(object_name)s '%(escaped_object)s' provocaria l'eliminació "
-"d'objectes relacionats, però el vostre compte no te permissos per a esborrar "
+"d'objectes relacionats, però el vostre compte no te permisos per esborrar "
 "els tipus d'objecte següents:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:23
+#: .\contrib\admin\templates\admin\delete_confirmation.html.py:23
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
@@ -646,16 +715,16 @@
 "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:28
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:33
+#: .\contrib\admin\templates\admin\delete_confirmation.html.py:28
+#: .\contrib\admin\templates\admin\delete_selected_confirmation.html.py:33
 msgid "Yes, I'm sure"
-msgstr "Si, estic segur"
+msgstr "Sí, n'estic segur"
 
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:9
+#: .\contrib\admin\templates\admin\delete_selected_confirmation.html.py:9
 msgid "Delete multiple objects"
-msgstr "Eliminar multiples objectes"
+msgstr "Eliminar múltiples objectes"
 
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:15
+#: .\contrib\admin\templates\admin\delete_selected_confirmation.html.py:15
 #, python-format
 msgid ""
 "Deleting the %(object_name)s would result in deleting related objects, but "
@@ -663,500 +732,426 @@
 "objects:"
 msgstr ""
 "Eliminar el/la %(object_name)s provocaria l'eliminació d'objectes "
-"relacionats, però el vostre compte no te permissos per a esborrar els tipus "
+"relacionats, però el vostre compte no te permisos per esborrar els tipus "
 "d'objecte següents:"
 
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:22
+#: .\contrib\admin\templates\admin\delete_selected_confirmation.html.py:22
 #, python-format
 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 ""
-"Esteu segurs de voler esborrar els/les %(object_name)s seleccionats? Tots "
+"Esteu segur de voler esborrar els/les %(object_name)s seleccionats? Tots "
 "aquests objectes i els seus elements relacionats s'esborraran:"
 
-#: contrib/admin/templates/admin/filter.html:2
+#: .\contrib\admin\templates\admin\filter.html.py:2
 #, python-format
 msgid " By %(filter_title)s "
 msgstr "Per %(filter_title)s "
 
-#: contrib/admin/templates/admin/index.html:18
+#: .\contrib\admin\templates\admin\index.html.py:18
 #, python-format
 msgid "Models available in the %(name)s application."
 msgstr "Models disponibles a l'aplicació %(name)s."
 
-#: contrib/admin/templates/admin/index.html:35
+#: .\contrib\admin\templates\admin\index.html.py:35
 msgid "Change"
 msgstr "Modificar"
 
-#: contrib/admin/templates/admin/index.html:45
+#: .\contrib\admin\templates\admin\index.html.py:45
 msgid "You don't have permission to edit anything."
 msgstr "No teniu permís per editar res."
 
-#: contrib/admin/templates/admin/index.html:53
+#: .\contrib\admin\templates\admin\index.html.py:53
 msgid "Recent Actions"
 msgstr "Accions recents"
 
-#: contrib/admin/templates/admin/index.html:54
+#: .\contrib\admin\templates\admin\index.html.py:54
 msgid "My Actions"
 msgstr "Les meves accions"
 
-#: contrib/admin/templates/admin/index.html:58
+#: .\contrib\admin\templates\admin\index.html.py:58
 msgid "None available"
 msgstr "Cap disponible"
 
-#: contrib/admin/templates/admin/index.html:72
+#: .\contrib\admin\templates\admin\index.html.py:72
 msgid "Unknown content"
 msgstr "Contingut desconegut"
 
-#: contrib/admin/templates/admin/invalid_setup.html:7
+#: .\contrib\admin\templates\admin\invalid_setup.html.py:7
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
 "the appropriate user."
 msgstr ""
-"Alguna cosa està malament en la instal·lació de la vostra base de dades. "
-"Assegureu-vos de que s'han creat les taules, i de que la base de dades és "
-"llegible per l'usuari apropiat."
+"Hi ha algun problema a la instal·lació de la vostra base de dades. Assegureu-"
+"vos que s'han creat les taules adients, i que la base de dades és llegible "
+"per l'usuari apropiat."
 
-#: contrib/admin/templates/admin/login.html:19
+#: .\contrib\admin\templates\admin\login.html.py:19
 msgid "Username:"
-msgstr "Usuari:"
+msgstr "Nom d'usuari:"
 
-#: contrib/admin/templates/admin/login.html:22
+#: .\contrib\admin\templates\admin\login.html.py:22
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: contrib/admin/templates/admin/object_history.html:22
+#: .\contrib\admin\templates\admin\object_history.html.py:22
 msgid "Date/time"
 msgstr "Data/hora"
 
-#: contrib/admin/templates/admin/object_history.html:23
+#: .\contrib\admin\templates\admin\object_history.html.py:23
 msgid "User"
 msgstr "Usuari"
 
-#: contrib/admin/templates/admin/object_history.html:24
+#: .\contrib\admin\templates\admin\object_history.html.py:24
 msgid "Action"
 msgstr "Acció"
 
-#: contrib/admin/templates/admin/object_history.html:30
-#: utils/translation/trans_real.py:400
-msgid "DATETIME_FORMAT"
-msgstr "j \\de F \\de Y, H:i"
-
-#: contrib/admin/templates/admin/object_history.html:38
+#: .\contrib\admin\templates\admin\object_history.html.py:38
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
 msgstr ""
-"Aquest objecte no té historial de canvis. Probablement no va ser afegit "
+"Aquest objecte no té historial de canvis. Probablement no es va afegir "
 "utilitzant aquest lloc administratiu."
 
-#: contrib/admin/templates/admin/pagination.html:10
+#: .\contrib\admin\templates\admin\pagination.html.py:10
 msgid "Show all"
 msgstr "Mostrar tots"
 
-#: contrib/admin/templates/admin/pagination.html:11
-#: contrib/admin/templates/admin/submit_line.html:3
+#: .\contrib\admin\templates\admin\pagination.html.py:11
+#: .\contrib\admin\templates\admin\submit_line.html.py:3
 msgid "Save"
 msgstr "Desar"
 
-#: contrib/admin/templates/admin/search_form.html:8
+#: .\contrib\admin\templates\admin\search_form.html.py:8
 msgid "Search"
 msgstr "Cerca"
 
-#: contrib/admin/templates/admin/search_form.html:10
+#: .\contrib\admin\templates\admin\search_form.html.py:10
 #, python-format
 msgid "1 result"
 msgid_plural "%(counter)s results"
 msgstr[0] "1 resultat"
 msgstr[1] "%(counter)s resultats"
 
-#: contrib/admin/templates/admin/search_form.html:10
+#: .\contrib\admin\templates\admin\search_form.html.py:10
 #, python-format
 msgid "%(full_result_count)s total"
 msgstr "%(full_result_count)s en total"
 
-#: contrib/admin/templates/admin/submit_line.html:5
+#: .\contrib\admin\templates\admin\submit_line.html.py:5
 msgid "Save as new"
 msgstr "Desar com a nou"
 
-#: contrib/admin/templates/admin/submit_line.html:6
+#: .\contrib\admin\templates\admin\submit_line.html.py:6
 msgid "Save and add another"
 msgstr "Desar i afegir-ne un de nou"
 
-#: contrib/admin/templates/admin/submit_line.html:7
+#: .\contrib\admin\templates\admin\submit_line.html.py:7
 msgid "Save and continue editing"
 msgstr "Desar i continuar editant"
 
-#: contrib/admin/templates/admin/auth/user/add_form.html:6
+#: .\contrib\admin\templates\admin\auth\user\add_form.html.py:5
 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 "
+"Primer, entreu un nom d'usuari i una contrasenya. Després podreu editar més "
 "opcions de l'usuari."
 
-#: contrib/admin/templates/admin/auth/user/add_form.html:13
-#: contrib/auth/forms.py:14 contrib/auth/forms.py:47 contrib/auth/forms.py:59
-msgid "Username"
-msgstr "Usuari"
+#: .\contrib\admin\templates\admin\auth\user\change_password.html.py:28
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr "Introduïu una contrasenya per l'usuari <strong>%(username)s</strong>"
 
-#: contrib/admin/templates/admin/auth/user/add_form.html:20
-#: contrib/admin/templates/admin/auth/user/change_password.html:34
-#: contrib/auth/forms.py:17 contrib/auth/forms.py:60 contrib/auth/forms.py:185
+#: .\contrib\admin\templates\admin\auth\user\change_password.html.py:35
+#: .\contrib\auth\forms.py:17 .\contrib\auth\forms.py:61
+#: .\contrib\auth\forms.py:186
 msgid "Password"
 msgstr "Contrasenya"
 
-#: contrib/admin/templates/admin/auth/user/add_form.html:26
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
-#: contrib/auth/forms.py:186
+#: .\contrib\admin\templates\admin\auth\user\change_password.html.py:41
+#: .\contrib\admin\templates\registration\password_change_form.html.py:37
+#: .\contrib\auth\forms.py:187
 msgid "Password (again)"
 msgstr "Contrasenya (de nou)"
 
-#: 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.py:42
+#: .\contrib\auth\forms.py:19
 msgid "Enter the same password as above, for verification."
 msgstr "Introduïu la mateixa contrasenya de dalt, per fer-ne la verificació."
 
-#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#: .\contrib\admin\templates\admin\edit_inline\stacked.html.py:64
+#: .\contrib\admin\templates\admin\edit_inline\tabular.html.py:110
 #, python-format
-msgid "Enter a new password for the user <strong>%(username)s</strong>."
-msgstr "Introduïu una contrasenya per l'usuari <strong>%(username)s</strong>"
+msgid "Add another %(verbose_name)s"
+msgstr "Afegir un/a altre/a %(verbose_name)s."
 
-#: contrib/admin/templates/admin/edit_inline/tabular.html:15
+#: .\contrib\admin\templates\admin\edit_inline\stacked.html.py:67
+#: .\contrib\admin\templates\admin\edit_inline\tabular.html.py:113
+#: .\contrib\comments\templates\comments\delete.html.py:12
+msgid "Remove"
+msgstr "Eliminar"
+
+#: .\contrib\admin\templates\admin\edit_inline\tabular.html.py:15
 msgid "Delete?"
 msgstr "Eliminar?"
 
-#: contrib/admin/templates/registration/logged_out.html:8
+#: .\contrib\admin\templates\registration\logged_out.html.py:8
 msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Gràcies per destinar el vostre temps en el web durant el dia d'avui."
+msgstr "Gràcies per passar una estona de qualitat al web durant el dia d'avui."
 
-#: contrib/admin/templates/registration/logged_out.html:10
+#: .\contrib\admin\templates\registration\logged_out.html.py:10
 msgid "Log in again"
 msgstr "Iniciar sessió de nou"
 
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_form.html:6
-#: contrib/admin/templates/registration/password_change_form.html:10
+#: .\contrib\admin\templates\registration\password_change_done.html.py:4
+#: .\contrib\admin\templates\registration\password_change_form.html.py:5
+#: .\contrib\admin\templates\registration\password_change_form.html.py:7
+#: .\contrib\admin\templates\registration\password_change_form.html.py:19
 msgid "Password change"
 msgstr "Canvi de contrasenya"
 
-#: contrib/admin/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/registration/password_change_done.html:10
+#: .\contrib\admin\templates\registration\password_change_done.html.py:6
+#: .\contrib\admin\templates\registration\password_change_done.html.py:10
 msgid "Password change successful"
 msgstr "Contrasenya canviada amb èxit"
 
-#: contrib/admin/templates/registration/password_change_done.html:12
+#: .\contrib\admin\templates\registration\password_change_done.html.py:12
 msgid "Your password was changed."
 msgstr "La seva contrasenya ha estat canviada."
 
-#: contrib/admin/templates/registration/password_change_form.html:12
+#: .\contrib\admin\templates\registration\password_change_form.html.py:21
 msgid ""
 "Please enter your old password, for security's sake, and then enter your new "
 "password twice so we can verify you typed it in correctly."
 msgstr ""
 "Si us plau, introduïu la vostra contrasenya antiga, per seguretat, i tot "
 "seguit introduïu la vostra contrasenya nova dues vegades per verificar que "
-"l'heu escrit correctament."
+"l'heu escrita correctament."
 
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
-msgstr "Contrasenya antiga:"
+#: .\contrib\admin\templates\registration\password_change_form.html.py:27
+#: .\contrib\auth\forms.py:170
+msgid "Old password"
+msgstr "Contrasenya antiga"
 
-#: contrib/admin/templates/registration/password_change_form.html:19
-#: contrib/admin/templates/registration/password_reset_confirm.html:18
-msgid "New password:"
-msgstr "Contrasenya nova:"
+#: .\contrib\admin\templates\registration\password_change_form.html.py:32
+#: .\contrib\auth\forms.py:144
+msgid "New password"
+msgstr "Contrasenya nova"
 
-#: contrib/admin/templates/registration/password_change_form.html:21
-#: contrib/admin/templates/registration/password_reset_confirm.html:20
-msgid "Confirm password:"
-msgstr "Confirmar contrasenya:"
-
-#: contrib/admin/templates/registration/password_change_form.html:23
-#: contrib/admin/templates/registration/password_reset_confirm.html:21
+#: .\contrib\admin\templates\registration\password_change_form.html.py:43
+#: .\contrib\admin\templates\registration\password_reset_confirm.html.py:21
 msgid "Change my password"
-msgstr "Canviar la meva clau:"
+msgstr "Canviar la meva contrasenya:"
 
-#: contrib/admin/templates/registration/password_reset_complete.html:4
-#: contrib/admin/templates/registration/password_reset_confirm.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-#: contrib/admin/templates/registration/password_reset_form.html:10
+#: .\contrib\admin\templates\registration\password_reset_complete.html.py:4
+#: .\contrib\admin\templates\registration\password_reset_confirm.html.py:6
+#: .\contrib\admin\templates\registration\password_reset_done.html.py:4
+#: .\contrib\admin\templates\registration\password_reset_form.html.py:4
+#: .\contrib\admin\templates\registration\password_reset_form.html.py:6
+#: .\contrib\admin\templates\registration\password_reset_form.html.py:10
 msgid "Password reset"
 msgstr "Restablir contrasenya"
 
-#: contrib/admin/templates/registration/password_reset_complete.html:6
-#: contrib/admin/templates/registration/password_reset_complete.html:10
+#: .\contrib\admin\templates\registration\password_reset_complete.html.py:6
+#: .\contrib\admin\templates\registration\password_reset_complete.html.py:10
 msgid "Password reset complete"
 msgstr "Contrasenya restablerta"
 
-#: contrib/admin/templates/registration/password_reset_complete.html:12
+#: .\contrib\admin\templates\registration\password_reset_complete.html.py:12
 msgid "Your password has been set.  You may go ahead and log in now."
 msgstr ""
-"La seva contrasenya ha estat canviada. Ara pot continuar i iniciar sessió."
+"S'ha canviat la vostra contrasenya. Ara podeu continuar i iniciar sessió."
 
-#: contrib/admin/templates/registration/password_reset_confirm.html:4
+#: .\contrib\admin\templates\registration\password_reset_confirm.html.py:4
 msgid "Password reset confirmation"
-msgstr "Confirmació de reestabliment de contrasenya"
+msgstr "Confirmació de restabliment de contrasenya"
 
-#: contrib/admin/templates/registration/password_reset_confirm.html:12
+#: .\contrib\admin\templates\registration\password_reset_confirm.html.py:12
 msgid "Enter new password"
-msgstr "Introdueixi la nova contrasenya"
+msgstr "Introduïu la nova contrasenya"
 
-#: contrib/admin/templates/registration/password_reset_confirm.html:14
+#: .\contrib\admin\templates\registration\password_reset_confirm.html.py:14
 msgid ""
 "Please enter your new password twice so we can verify you typed it in "
 "correctly."
 msgstr ""
 "Si us plau, introduïu la vostra nova contrasenya dues vegades, per verificar "
-"que l'heu escrit correctament."
+"que l'heu escrita correctament."
 
-#: contrib/admin/templates/registration/password_reset_confirm.html:26
+#: .\contrib\admin\templates\registration\password_reset_confirm.html.py:18
+msgid "New password:"
+msgstr "Contrasenya nova:"
+
+#: .\contrib\admin\templates\registration\password_reset_confirm.html.py:20
+msgid "Confirm password:"
+msgstr "Confirmar contrasenya:"
+
+#: .\contrib\admin\templates\registration\password_reset_confirm.html.py:26
 msgid "Password reset unsuccessful"
-msgstr "Restabliment de contrasenya fallit"
+msgstr "Restabliment de contrasenya fallat"
 
-#: contrib/admin/templates/registration/password_reset_confirm.html:28
+#: .\contrib\admin\templates\registration\password_reset_confirm.html.py:28
 msgid ""
 "The password reset link was invalid, possibly because it has already been "
 "used.  Please request a new password reset."
 msgstr ""
-"L'enllaç de restabliment de contrasenya era invàlid, segurament ja deu haver "
-"estat utilitzat. Per favor, soliciti un nou reestabliment de contrasenya."
+"L'enllaç de restabliment de contrasenya era invàlid, potser perquè ja s'ha "
+"utilitzat. Si us plau, sol·liciteu un nou reestabliment de contrasenya."
 
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
+#: .\contrib\admin\templates\registration\password_reset_done.html.py:6
+#: .\contrib\admin\templates\registration\password_reset_done.html.py:10
 msgid "Password reset successful"
-msgstr "Restabliment de contrasenya exitós"
+msgstr "Restabliment de contrasenya amb èxit"
 
-#: contrib/admin/templates/registration/password_reset_done.html:12
+#: .\contrib\admin\templates\registration\password_reset_done.html.py:12
 msgid ""
 "We've e-mailed you instructions for setting your password to the e-mail "
 "address you submitted. You should be receiving it shortly."
 msgstr ""
 "Us hem enviat les instruccions per canviar la vostra contrasenya a l'adreça "
-"de correu electrònic que ens heu indicat. L'haurieu de rebre en breu."
+"de correu electrònic que ens heu indicat. L'hauríeu de rebre en breu."
 
-#: contrib/admin/templates/registration/password_reset_email.html:2
+#: .\contrib\admin\templates\registration\password_reset_email.html.py:2
 msgid "You're receiving this e-mail because you requested a password reset"
 msgstr ""
-"Esteu rebent aquest missatge degut a que veu solicitar un restabliment de "
+"Esteu rebent aquest missatge perquè vau sol·licitar un restabliment de "
 "contrasenya."
 
-#: contrib/admin/templates/registration/password_reset_email.html:3
+#: .\contrib\admin\templates\registration\password_reset_email.html.py:3
 #, python-format
 msgid "for your user account at %(site_name)s"
 msgstr "del vostre compte d'usuari a %(site_name)s."
 
-#: contrib/admin/templates/registration/password_reset_email.html:5
+#: .\contrib\admin\templates\registration\password_reset_email.html.py:5
 msgid "Please go to the following page and choose a new password:"
-msgstr "Si us plau, adrecis a la pàgina següen i esculli una nova contrasenya:"
+msgstr ""
+"Si us plau, aneu a la pàgina següent i escolliu una nova contrasenya:"
 
-#: contrib/admin/templates/registration/password_reset_email.html:9
+#: .\contrib\admin\templates\registration\password_reset_email.html.py:9
 msgid "Your username, in case you've forgotten:"
-msgstr "El vostre nom d'usuari, en cas d'haver-lo oblidat:"
+msgstr "El vostre nom d'usuari, en cas que l'hagueu oblidat:"
 
-#: contrib/admin/templates/registration/password_reset_email.html:11
+#: .\contrib\admin\templates\registration\password_reset_email.html.py:11
 msgid "Thanks for using our site!"
-msgstr "Gràcies per fer us del nostre lloc!"
+msgstr "Gràcies per fer ús del nostre lloc!"
 
-#: contrib/admin/templates/registration/password_reset_email.html:13
+#: .\contrib\admin\templates\registration\password_reset_email.html.py:13
 #, python-format
 msgid "The %(site_name)s team"
 msgstr "L'equip de %(site_name)s"
 
-#: contrib/admin/templates/registration/password_reset_form.html:12
+#: .\contrib\admin\templates\registration\password_reset_form.html.py:12
 msgid ""
 "Forgotten your password? Enter your e-mail address below, and we'll e-mail "
 "instructions for setting a new one."
 msgstr ""
 "Heu oblidat la vostra contrasenya? Introduïu la vostra adreça de correu "
-"electrònic i li enviarem instruccions per canviar-la."
+"electrònic a sota, i us enviarem instruccions per canviar-la."
 
-#: contrib/admin/templates/registration/password_reset_form.html:16
+#: .\contrib\admin\templates\registration\password_reset_form.html.py:16
 msgid "E-mail address:"
 msgstr "Adreça de correu electrònic:"
 
-#: contrib/admin/templates/registration/password_reset_form.html:16
+#: .\contrib\admin\templates\registration\password_reset_form.html.py:16
 msgid "Reset my password"
 msgstr "Restablir la meva contrasenya"
 
-#: contrib/admin/templatetags/admin_list.py:304
+#: .\contrib\admin\templatetags\admin_list.py:257
 msgid "All dates"
 msgstr "Totes les dates"
 
-#: contrib/admin/views/main.py:70
+#: .\contrib\admin\views\main.py:65
 #, python-format
 msgid "Select %s"
 msgstr "Seleccioneu %s"
 
-#: contrib/admin/views/main.py:70
+#: .\contrib\admin\views\main.py:65
 #, python-format
 msgid "Select %s to change"
 msgstr "Seleccioneu %s per modificar"
 
-#: contrib/admin/views/template.py:37 contrib/sites/models.py:38
+#: .\contrib\admin\views\template.py:38 .\contrib\sites\models.py:38
 msgid "site"
 msgstr "lloc"
 
-#: contrib/admin/views/template.py:39
+#: .\contrib\admin\views\template.py:40
 msgid "template"
 msgstr "plantilla"
 
-#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
-#: contrib/admindocs/views.py:65
+#: .\contrib\admindocs\views.py:61 .\contrib\admindocs\views.py:63
+#: .\contrib\admindocs\views.py:65
 msgid "tag:"
 msgstr "etiqueta:"
 
-#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
-#: contrib/admindocs/views.py:98
+#: .\contrib\admindocs\views.py:94 .\contrib\admindocs\views.py:96
+#: .\contrib\admindocs\views.py:98
 msgid "filter:"
 msgstr "filtre:"
 
-#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
-#: contrib/admindocs/views.py:162
+#: .\contrib\admindocs\views.py:158 .\contrib\admindocs\views.py:160
+#: .\contrib\admindocs\views.py:162
 msgid "view:"
 msgstr "vista:"
 
-#: contrib/admindocs/views.py:190
+#: .\contrib\admindocs\views.py:190
 #, python-format
 msgid "App %r not found"
 msgstr "No s'ha pogut trobar l'aplicació %r"
 
-#: contrib/admindocs/views.py:197
+#: .\contrib\admindocs\views.py:197
 #, python-format
 msgid "Model %(model_name)r not found in app %(app_label)r"
-msgstr "El model %(model_name)r no s'ha trobat en l'aplicació %(app_label)r"
+msgstr "El model %(model_name)r no s'ha trobat a l'aplicació %(app_label)r"
 
-#: contrib/admindocs/views.py:209
+#: .\contrib\admindocs\views.py:209
 #, python-format
 msgid "the related `%(app_label)s.%(data_type)s` object"
 msgstr "l'objecte relacionat `%(app_label)s.%(data_type)s`"
 
-#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
-#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
-#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
+#: .\contrib\admindocs\views.py:209 .\contrib\admindocs\views.py:228
+#: .\contrib\admindocs\views.py:233 .\contrib\admindocs\views.py:247
+#: .\contrib\admindocs\views.py:261 .\contrib\admindocs\views.py:266
 msgid "model:"
 msgstr "model:"
 
-#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
+#: .\contrib\admindocs\views.py:224 .\contrib\admindocs\views.py:256
 #, python-format
 msgid "related `%(app_label)s.%(object_name)s` objects"
 msgstr "objectes relacionats `%(app_label)s.%(object_name)s`"
 
-#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
+#: .\contrib\admindocs\views.py:228 .\contrib\admindocs\views.py:261
 #, python-format
 msgid "all %s"
 msgstr "tots %s"
 
-#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
+#: .\contrib\admindocs\views.py:233 .\contrib\admindocs\views.py:266
 #, python-format
 msgid "number of %s"
 msgstr "nombre de %s"
 
-#: contrib/admindocs/views.py:271
+#: .\contrib\admindocs\views.py:271
 #, python-format
 msgid "Fields on %s objects"
 msgstr "Camps en objectes %s"
 
-#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
-#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
-#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
-msgid "Integer"
-msgstr "Enter"
-
-#: contrib/admindocs/views.py:335
-msgid "Boolean (Either True or False)"
-msgstr "Booleà (Verdader o Fals)"
-
-#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
+#: .\contrib\admindocs\views.py:361
 #, python-format
-msgid "String (up to %(max_length)s)"
-msgstr "Cadena (de fins a %(max_length)s)"
-
-#: contrib/admindocs/views.py:337
-msgid "Comma-separated integers"
-msgstr "Enters separats per comes"
-
-#: contrib/admindocs/views.py:338
-msgid "Date (without time)"
-msgstr "Data (sense hora)"
-
-#: contrib/admindocs/views.py:339
-msgid "Date (with time)"
-msgstr "Data (amb hora)"
-
-#: contrib/admindocs/views.py:340
-msgid "Decimal number"
-msgstr "Número decimal"
-
-#: contrib/admindocs/views.py:341
-msgid "E-mail address"
-msgstr "Adreça de correu electrònic"
-
-#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
-#: contrib/admindocs/views.py:346
-msgid "File path"
-msgstr "Ruta del fitxer"
-
-#: contrib/admindocs/views.py:344
-msgid "Floating point number"
-msgstr "Número amb punt de coma flotant"
-
-#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
-msgid "IP address"
-msgstr "Adreça IP"
-
-#: contrib/admindocs/views.py:350
-msgid "Boolean (Either True, False or None)"
-msgstr "Booleà (Verdader, Fals o 'None' (cap))"
-
-#: contrib/admindocs/views.py:351
-msgid "Relation to parent model"
-msgstr "Relació amb el model pare"
-
-#: contrib/admindocs/views.py:352
-msgid "Phone number"
-msgstr "Número de telèfon"
-
-#: contrib/admindocs/views.py:357
-msgid "Text"
-msgstr "Text"
-
-#: contrib/admindocs/views.py:358
-msgid "Time"
-msgstr "Hora"
-
-#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
-#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
-msgid "URL"
-msgstr "URL"
-
-#: contrib/admindocs/views.py:360
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estat dels E.U.A. (dues lletres majúscules)"
-
-#: contrib/admindocs/views.py:361
-msgid "XML text"
-msgstr "Text XML"
-
-#: contrib/admindocs/views.py:387
-#, python-format
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s no sembla ser un objecte 'urlpattern'"
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:3
 msgid "Bookmarklets"
 msgstr "'Bookmarklets'"
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:4
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:4
 msgid "Documentation bookmarklets"
 msgstr "'Bookmarklets' de documentació"
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:8
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:8
 msgid ""
 "\n"
 "<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
@@ -1167,203 +1162,197 @@
 "your computer is \"internal\").</p>\n"
 msgstr ""
 "\n"
-"<p class=\"help\">Per a instal·lar 'bookmarklets', arrosegueu l'enllaç a la "
-"seva barra de\n"
-"marcadors, o feu click amb el botó dret en l'enllaç i afegeixi'l als "
-"marcadors.\n"
+"<p class=\"help\">Per tal d'instal·lar 'bookmarklets', arrosegueu l'enllaç\n"
+"a la vostra barra de marcadors, o feu click amb el botó dret a l'enllaç i\n"
+"afegiu-lo als marcadors.\n"
 "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).</p>\n"
+"Observeu que per a alguns d'aquests 'bookmarklets' cal que estigueu veient\n"
+"el lloc des d'un ordinador designat com a \"intern\" (parleu\n"
+"amb el vostre administrador de sistemes si no esteu segurs si el vostre "
+"ordinador és \"intern\").</p>\n"
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:18
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:18
 msgid "Documentation for this page"
 msgstr "Documentació d'aquesta pàgina"
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:19
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:19
 msgid ""
 "Jumps you from any page to the documentation for the view that generates "
 "that page."
 msgstr ""
-"Us porta des de qualsevol pàgina de la documentació a la vista que la genera."
+"Us porta des de qualsevol pàgina a la documentació de la vista que la genera."
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:21
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:21
 msgid "Show object ID"
-msgstr "Mostra el ID de l'objecte"
+msgstr "Mostra l'ID de l'objecte"
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:22
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:22
 msgid ""
 "Shows the content-type and unique ID for pages that represent a single "
 "object."
 msgstr ""
-"Mostra el 'content-type' (tipus de contingut) i el ID inequívoc de les "
+"Mostra el 'content-type' (tipus de contingut) i l'ID inequívoc de les "
 "pàgines que representen un únic objecte."
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:24
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:24
 msgid "Edit this object (current window)"
 msgstr "Editar aquest objecte (finestra actual)"
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:25
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:25
 msgid "Jumps to the admin page for pages that represent a single object."
 msgstr ""
 "El porta a la pàgina d'administració de pàgines que representen un únic "
 "objecte."
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:27
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:27
 msgid "Edit this object (new window)"
 msgstr "Editar aquest objecte (nova finestra)"
 
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:28
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:28
 msgid "As above, but opens the admin page in a new window."
 msgstr "Com abans, però obre la pàgina d'administració en una nova finestra."
 
-#: contrib/auth/admin.py:21
+#: .\contrib\auth\admin.py:29
 msgid "Personal info"
 msgstr "Informació personal"
 
-#: contrib/auth/admin.py:22
+#: .\contrib\auth\admin.py:30
 msgid "Permissions"
-msgstr "permisos"
+msgstr "Permisos"
 
-#: contrib/auth/admin.py:23
+#: .\contrib\auth\admin.py:31
 msgid "Important dates"
 msgstr "Dates importants"
 
-#: contrib/auth/admin.py:24
+#: .\contrib\auth\admin.py:32
 msgid "Groups"
 msgstr "Grups"
 
-#: contrib/auth/admin.py:80
-msgid "Add user"
-msgstr "Afegir usuari"
-
-#: contrib/auth/admin.py:106
+#: .\contrib\auth\admin.py:114
 msgid "Password changed successfully."
-msgstr "Contrasenya cambiada amb èxit"
+msgstr "Contrasenya canviada amb èxit"
 
-#: contrib/auth/admin.py:112
+#: .\contrib\auth\admin.py:124
 #, python-format
 msgid "Change password: %s"
 msgstr "Canviar contrasenya: %s"
 
-#: contrib/auth/forms.py:15 contrib/auth/forms.py:48
-#: contrib/auth/models.py:128
-msgid ""
-"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
-"digits and underscores)."
+#: .\contrib\auth\forms.py:14 .\contrib\auth\forms.py:48
+#: .\contrib\auth\forms.py:60
+msgid "Username"
+msgstr "Nom d'usuari"
+
+#: .\contrib\auth\forms.py:15 .\contrib\auth\forms.py:49
+msgid "Required. 30 characters or fewer. Letters, digits and @/./+/-/_ only."
 msgstr ""
-"Obligatori. 30 o menys caràcters. Només caràcters alfanumèrics (lletres, "
-"dígits i el guió baix)."
+"Obligatori. 30 o menys caràcters. Només lletres, dígits i @/./+/-/_."
 
-#: contrib/auth/forms.py:16 contrib/auth/forms.py:49
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Aquest valor ha de contenir només lletres, números i guions baixos."
+#: .\contrib\auth\forms.py:16 .\contrib\auth\forms.py:50
+msgid "This value may contain only letters, numbers and @/./+/-/_ characters."
+msgstr "Aquest valor ha de contenir només lletres, números i @/./+/-/_."
 
-#: contrib/auth/forms.py:18
+#: .\contrib\auth\forms.py:18
 msgid "Password confirmation"
 msgstr "Confirmació de contrasenya"
 
-#: contrib/auth/forms.py:30
+#: .\contrib\auth\forms.py:31
 msgid "A user with that username already exists."
 msgstr "Ja existeix un usuari amb aquest nom."
 
-#: contrib/auth/forms.py:36 contrib/auth/forms.py:155
-#: contrib/auth/forms.py:197
+#: .\contrib\auth\forms.py:37 .\contrib\auth\forms.py:156
+#: .\contrib\auth\forms.py:198
 msgid "The two password fields didn't match."
 msgstr "Els dos camps de contrasenya no coincideixen."
 
-#: contrib/auth/forms.py:82
+#: .\contrib\auth\forms.py:83
 msgid "This account is inactive."
 msgstr "Aquest compte està inactiu"
 
-#: contrib/auth/forms.py:87
+#: .\contrib\auth\forms.py:88
 msgid ""
 "Your Web browser doesn't appear to have cookies enabled. Cookies are "
 "required for logging in."
 msgstr ""
-"El seu navegador no sembla tenir les 'cookies' (galetes) activades. Aquestes "
-"són necessàries per iniciar la sessió."
+"El vostre navegador no sembla tenir les galetes ('cookies') activades. "
+"Aquestes són necessàries per iniciar la sessió."
 
-#: contrib/auth/forms.py:100
+#: .\contrib\auth\forms.py:101
 msgid "E-mail"
 msgstr "Correu electrònic"
 
-#: contrib/auth/forms.py:109
+#: .\contrib\auth\forms.py:110
 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é associat cap compte d'usuari. Esteu segurs "
+"que s'ha registrat?"
 
-#: contrib/auth/forms.py:135
+#: .\contrib\auth\forms.py:136
 #, python-format
 msgid "Password reset on %s"
 msgstr "Restablir contrasenya en %s"
 
-#: contrib/auth/forms.py:143
-msgid "New password"
-msgstr "Contrasenya nova"
-
-#: contrib/auth/forms.py:144
+#: .\contrib\auth\forms.py:145
 msgid "New password confirmation"
 msgstr "Contrasenya nova confirmada"
 
-#: contrib/auth/forms.py:169
-msgid "Old password"
-msgstr "Contrasenya antiga"
-
-#: contrib/auth/forms.py:177
+#: .\contrib\auth\forms.py:178
 msgid "Your old password was entered incorrectly. Please enter it again."
 msgstr ""
-"La seva antiga contrasenya no és correcte. Si el plau, introduïu-la de nou."
+"La vostra antiga contrasenya no és correcta. Si us plau, introduïu-la de nou."
 
-#: contrib/auth/models.py:63 contrib/auth/models.py:86
+#: .\contrib\auth\models.py:66 .\contrib\auth\models.py:94
 msgid "name"
 msgstr "nom"
 
-#: contrib/auth/models.py:65
+#: .\contrib\auth\models.py:68
 msgid "codename"
 msgstr "nom en clau"
 
-#: contrib/auth/models.py:68
+#: .\contrib\auth\models.py:72
 msgid "permission"
 msgstr "permís"
 
-#: contrib/auth/models.py:69 contrib/auth/models.py:87
+#: .\contrib\auth\models.py:73 .\contrib\auth\models.py:95
 msgid "permissions"
 msgstr "permisos"
 
-#: contrib/auth/models.py:90
+#: .\contrib\auth\models.py:98
 msgid "group"
 msgstr "grup"
 
-#: contrib/auth/models.py:91 contrib/auth/models.py:138
+#: .\contrib\auth\models.py:99 .\contrib\auth\models.py:206
 msgid "groups"
 msgstr "grups"
 
-#: contrib/auth/models.py:128
+#: .\contrib\auth\models.py:196
 msgid "username"
 msgstr "nom d'usuari"
 
-#: contrib/auth/models.py:129
+#: .\contrib\auth\models.py:196
+msgid ""
+"Required. 30 characters or fewer. Letters, numbers and @/./+/-/_ characters"
+msgstr ""
+"Obligatori. 30 o menys caràcters. Només lletres, números i @/./+/-/_"
+
+#: .\contrib\auth\models.py:197
 msgid "first name"
 msgstr "nom propi"
 
-#: contrib/auth/models.py:130
+#: .\contrib\auth\models.py:198
 msgid "last name"
 msgstr "cognoms"
 
-#: contrib/auth/models.py:131
+#: .\contrib\auth\models.py:199
 msgid "e-mail address"
 msgstr "adreça de correu electrònic"
 
-#: contrib/auth/models.py:132
+#: .\contrib\auth\models.py:200
 msgid "password"
 msgstr "contrasenya"
 
-#: contrib/auth/models.py:132
+#: .\contrib\auth\models.py:200
 msgid ""
 "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change "
 "password form</a>."
@@ -1371,19 +1360,19 @@
 "Utilitzeu '[algo]$[salt]$[hexdigest]' o el <a href=\"password/\">formulari "
 "de canvi de contrasenya</a>."
 
-#: contrib/auth/models.py:133
+#: .\contrib\auth\models.py:201
 msgid "staff status"
 msgstr "membre del personal"
 
-#: contrib/auth/models.py:133
+#: .\contrib\auth\models.py:201
 msgid "Designates whether the user can log into this admin site."
-msgstr "Indica si l'usuari pot entrar en el lloc administratiu."
+msgstr "Designa si l'usuari pot entrar al lloc administratiu."
 
-#: contrib/auth/models.py:134
+#: .\contrib\auth\models.py:202
 msgid "active"
 msgstr "actiu"
 
-#: contrib/auth/models.py:134
+#: .\contrib\auth\models.py:202
 msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
@@ -1391,122 +1380,134 @@
 "Designa si aquest usuari ha de ser tractat com a actiu. Deseleccioneu-ho "
 "enlloc d'esborrar comptes d'usuari."
 
-#: contrib/auth/models.py:135
+#: .\contrib\auth\models.py:203
 msgid "superuser status"
 msgstr "estat de superusuari"
 
-#: contrib/auth/models.py:135
+#: .\contrib\auth\models.py:203
 msgid ""
 "Designates that this user has all permissions without explicitly assigning "
 "them."
 msgstr ""
-"Designa que aquest usuari té tots els permissos sense assignar-los "
+"Designa que aquest usuari té tots els permisos sense assignar-los "
 "explícitament."
 
-#: contrib/auth/models.py:136
+#: .\contrib\auth\models.py:204
 msgid "last login"
 msgstr "últim inici de sessió"
 
-#: contrib/auth/models.py:137
+#: .\contrib\auth\models.py:205
 msgid "date joined"
-msgstr "data de creació"
+msgstr "data d'incorporació"
 
-#: contrib/auth/models.py:139
+#: .\contrib\auth\models.py:207
 msgid ""
 "In addition to the permissions manually assigned, this user will also get "
 "all permissions granted to each group he/she is in."
 msgstr ""
-"Junt amb els permissos asignats manualment, aquest usuari tindrà, també, els "
-"permissos dels grups dels que sigui membre."
+"A més dels permisos assignats manualment, aquest usuari tindrà també els "
+"permisos dels grups dels que sigui membre."
 
-#: contrib/auth/models.py:140
+#: .\contrib\auth\models.py:208
 msgid "user permissions"
-msgstr "permissos de l'usuari"
+msgstr "permisos de l'usuari"
 
-#: contrib/auth/models.py:144 contrib/comments/models.py:50
-#: contrib/comments/models.py:168
+#: .\contrib\auth\models.py:212 .\contrib\comments\models.py:50
+#: .\contrib\comments\models.py:168
 msgid "user"
 msgstr "usuari"
 
-#: contrib/auth/models.py:145
+#: .\contrib\auth\models.py:213
 msgid "users"
 msgstr "usuaris"
 
-#: contrib/auth/models.py:301
+#: .\contrib\auth\models.py:394
 msgid "message"
 msgstr "missatge"
 
-#: contrib/auth/views.py:60
+#: .\contrib\auth\views.py:79
 msgid "Logged out"
 msgstr "Sessió finalitzada"
 
-#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428
+#: .\contrib\auth\management\commands\createsuperuser.py:24
+#: .\core\validators.py:120 .\forms\fields.py:427
 msgid "Enter a valid e-mail address."
 msgstr "Introduïu una adreça de correu vàlida."
 
-#: contrib/comments/admin.py:12
+#: .\contrib\comments\admin.py:12
 msgid "Content"
-msgstr "contingut"
+msgstr "Contingut"
 
-#: contrib/comments/admin.py:15
+#: .\contrib\comments\admin.py:15
 msgid "Metadata"
-msgstr "metadades"
+msgstr "Metadades"
 
 # Context problem... waitting for comments from django-i18n
-#: contrib/comments/admin.py:39
+#: .\contrib\comments\admin.py:40
 msgid "flagged"
-msgstr "marcat"
+msgid_plural "flagged"
+msgstr[0] "marcat"
+msgstr[1] "marcats"
 
-#: contrib/comments/admin.py:40
+#: .\contrib\comments\admin.py:41
 msgid "Flag selected comments"
 msgstr "Marcar els comentaris seleccionats"
 
-#: contrib/comments/admin.py:43
+#: .\contrib\comments\admin.py:45
 msgid "approved"
-msgstr "aprovat"
+msgid_plural "approved"
+msgstr[0] "aprovat"
+msgstr[1] "aprovats"
 
-#: contrib/comments/admin.py:44
+#: .\contrib\comments\admin.py:46
 msgid "Approve selected comments"
 msgstr "Aprovar els comentaris seleccionats"
 
-#: contrib/comments/admin.py:47
+#: .\contrib\comments\admin.py:50
 msgid "removed"
-msgstr "eliminat"
+msgid_plural "removed"
+msgstr[0] "eliminat"
+msgstr[1] "eliminats"
 
-#: contrib/comments/admin.py:48
+#: .\contrib\comments\admin.py:51
 msgid "Remove selected comments"
 msgstr "Eliminar els comentaris seleccionats"
 
-#: contrib/comments/admin.py:60
+#: .\contrib\comments\admin.py:63
 #, python-format
 msgid "1 comment was successfully %(action)s."
 msgid_plural "%(count)s comments were successfully %(action)s."
 msgstr[0] "1 comentari ha estat %(action)s satisfactòriament."
 msgstr[1] "%(count)s comentaris han estat %(action)s satisfactòriament."
 
-#: contrib/comments/feeds.py:13
+#: .\contrib\comments\feeds.py:13
 #, python-format
 msgid "%(site_name)s comments"
 msgstr "comentaris de %(site_name)s"
 
-#: contrib/comments/feeds.py:23
+#: .\contrib\comments\feeds.py:23
 #, python-format
 msgid "Latest comments on %(site_name)s"
 msgstr "Últims comentaris a %(site_name)s."
 
-#: contrib/comments/forms.py:93
+#: .\contrib\comments\forms.py:93
 msgid "Name"
-msgstr "nom"
+msgstr "Nom"
 
-#: contrib/comments/forms.py:94
+#: .\contrib\comments\forms.py:94
 msgid "Email address"
 msgstr "Adreça de correu electrònic"
 
-#: contrib/comments/forms.py:96
+#: .\contrib\comments\forms.py:95 .\contrib\flatpages\admin.py:8
+#: .\contrib\flatpages\models.py:7 .\db\models\fields\__init__.py:1101
+msgid "URL"
+msgstr "URL"
+
+#: .\contrib\comments\forms.py:96
 msgid "Comment"
 msgstr "Comentari"
 
-#: contrib/comments/forms.py:173
+#: .\contrib\comments\forms.py:175
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
@@ -1514,78 +1515,82 @@
 msgstr[1] ""
 "Vigileu amb el vostre llenguatge! Aquí no s'admeten les paraules: %s."
 
-#: contrib/comments/forms.py:180
+#: .\contrib\comments\forms.py:182
 msgid ""
 "If you enter anything in this field your comment will be treated as spam"
 msgstr ""
-"Si entreu cualsevol cosa en aquest camp el vostre comentari es tractarà com "
+"Si entreu qualsevol cosa en aquest camp el vostre comentari es tractarà com "
 "a spam"
 
-#: contrib/comments/models.py:22 contrib/contenttypes/models.py:74
+#: .\contrib\comments\models.py:22 .\contrib\contenttypes\models.py:81
 msgid "content type"
 msgstr "tipus de contingut"
 
-#: contrib/comments/models.py:24
+#: .\contrib\comments\models.py:24
 msgid "object ID"
 msgstr "ID de l'objecte"
 
-#: contrib/comments/models.py:52
+#: .\contrib\comments\models.py:52
 msgid "user's name"
-msgstr "nom d'usuari"
+msgstr "nom de l'usuari"
 
-#: contrib/comments/models.py:53
+#: .\contrib\comments\models.py:53
 msgid "user's email address"
-msgstr "adreça de correu electrònic del usuari"
+msgstr "adreça de correu electrònic de l'usuari"
 
-#: contrib/comments/models.py:54
+#: .\contrib\comments\models.py:54
 msgid "user's URL"
-msgstr "URL del usuari"
+msgstr "URL de l'usuari"
 
-#: contrib/comments/models.py:56 contrib/comments/models.py:76
-#: contrib/comments/models.py:169
+#: .\contrib\comments\models.py:56 .\contrib\comments\models.py:76
+#: .\contrib\comments\models.py:169
 msgid "comment"
 msgstr "comentari"
 
-#: contrib/comments/models.py:59
+#: .\contrib\comments\models.py:59
 msgid "date/time submitted"
 msgstr "data/hora d'enviament"
 
-#: contrib/comments/models.py:61
+#: .\contrib\comments\models.py:60 .\db\models\fields\__init__.py:896
+msgid "IP address"
+msgstr "Adreça IP"
+
+#: .\contrib\comments\models.py:61
 msgid "is public"
 msgstr "és públic"
 
-#: contrib/comments/models.py:62
+#: .\contrib\comments\models.py:62
 msgid ""
 "Uncheck this box to make the comment effectively disappear from the site."
 msgstr ""
-"Desmarqui aquesta casella per fer desaparèixar aquest comentari del lloc web "
-"de forma efectiva."
+"Desmarqueu aquesta casella per fer desaparèixer aquest comentari del lloc "
+"web de forma efectiva."
 
-#: contrib/comments/models.py:64
+#: .\contrib\comments\models.py:64
 msgid "is removed"
 msgstr "està eliminat"
 
-#: contrib/comments/models.py:65
+#: .\contrib\comments\models.py:65
 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 "
+"Marqueu aquesta casella si el comentari no és apropiat. En lloc seu es "
 "mostrarà \"Aquest comentari ha estat eliminat\" "
 
-#: contrib/comments/models.py:77
+#: .\contrib\comments\models.py:77
 msgid "comments"
 msgstr "comentaris"
 
-#: contrib/comments/models.py:119
+#: .\contrib\comments\models.py:119
 msgid ""
 "This comment was posted by an authenticated user and thus the name is read-"
 "only."
 msgstr ""
 "Aquest comentari va ser publicat per un usuari autentificat, per això el seu "
-"nom no es modificable."
+"nom no es pot modificar."
 
-#: contrib/comments/models.py:128
+#: .\contrib\comments\models.py:128
 msgid ""
 "This comment was posted by an authenticated user and thus the email is read-"
 "only."
@@ -1593,7 +1598,7 @@
 "Aquest comentari va ser publicat per un usuari autentificat, per això la "
 "seva adreça de correu electrònic no es pot modificar."
 
-#: contrib/comments/models.py:153
+#: .\contrib\comments\models.py:153
 #, python-format
 msgid ""
 "Posted by %(user)s at %(date)s\n"
@@ -1609,379 +1614,410 @@
 "http://%(domain)s%(url)s"
 
 # Context problem... waitting for comments from django-i18n
-#: contrib/comments/models.py:170
+#: .\contrib\comments\models.py:170
 msgid "flag"
 msgstr "marcar"
 
-#: contrib/comments/models.py:171
+#: .\contrib\comments\models.py:171
 msgid "date"
 msgstr "data"
 
-#: contrib/comments/models.py:181
+#: .\contrib\comments\models.py:181
 msgid "comment flag"
 msgstr "marca del comentari"
 
-#: contrib/comments/models.py:182
+#: .\contrib\comments\models.py:182
 msgid "comment flags"
-msgstr "marques de comentari"
+msgstr "marques del comentari"
 
-#: contrib/comments/templates/comments/approve.html:4
+#: .\contrib\comments\templates\comments\approve.html.py:4
 msgid "Approve a comment"
 msgstr "Aprovar un comentari"
 
-#: contrib/comments/templates/comments/approve.html:7
+#: .\contrib\comments\templates\comments\approve.html.py:7
 msgid "Really make this comment public?"
-msgstr "Realment vol fer aquest comentari públic?"
+msgstr "Voleu realment fer públic aquest comentari?"
 
-#: contrib/comments/templates/comments/approve.html:12
+#: .\contrib\comments\templates\comments\approve.html.py:12
 msgid "Approve"
 msgstr "Aprovar"
 
-#: contrib/comments/templates/comments/approved.html:4
+#: .\contrib\comments\templates\comments\approved.html.py:4
 msgid "Thanks for approving"
 msgstr "Gràcies per aprovar"
 
-#: contrib/comments/templates/comments/approved.html:7
-#: contrib/comments/templates/comments/deleted.html:7
-#: contrib/comments/templates/comments/flagged.html:7
+#: .\contrib\comments\templates\comments\approved.html.py:7
+#: .\contrib\comments\templates\comments\deleted.html.py:7
+#: .\contrib\comments\templates\comments\flagged.html.py:7
 msgid ""
 "Thanks for taking the time to improve the quality of discussion on our site"
 msgstr ""
 "Gràcies per dedicar el temps a millorar la qualitat del debat al nostre lloc"
 
-#: contrib/comments/templates/comments/delete.html:4
+#: .\contrib\comments\templates\comments\delete.html.py:4
 msgid "Remove a comment"
-msgstr "Eliminar un comentaris"
+msgstr "Eliminar un comentari"
 
-#: contrib/comments/templates/comments/delete.html:7
+#: .\contrib\comments\templates\comments\delete.html.py:7
 msgid "Really remove this comment?"
-msgstr "Realment vol eliminar aquest comentari?"
+msgstr "Realment voleu eliminar aquest comentari?"
 
-#: contrib/comments/templates/comments/delete.html:12
-msgid "Remove"
-msgstr "Eliminar"
-
-#: contrib/comments/templates/comments/deleted.html:4
+#: .\contrib\comments\templates\comments\deleted.html.py:4
 msgid "Thanks for removing"
 msgstr "Gràcies per eliminar"
 
-#: contrib/comments/templates/comments/flag.html:4
+#: .\contrib\comments\templates\comments\flag.html.py:4
 msgid "Flag this comment"
 msgstr "Marcar aquest comentari"
 
-#: contrib/comments/templates/comments/flag.html:7
+#: .\contrib\comments\templates\comments\flag.html.py:7
 msgid "Really flag this comment?"
-msgstr "Realment vol marcar aquest comentari?"
+msgstr "Realment voleu marcar aquest comentari?"
 
 # Context problem... waitting for comments from django-i18n
-#: contrib/comments/templates/comments/flag.html:12
+#: .\contrib\comments\templates\comments\flag.html.py:12
 msgid "Flag"
 msgstr "Marcar"
 
-#: contrib/comments/templates/comments/flagged.html:4
+#: .\contrib\comments\templates\comments\flagged.html.py:4
 msgid "Thanks for flagging"
 msgstr "Gràcies per marcar"
 
-#: contrib/comments/templates/comments/form.html:17
-#: contrib/comments/templates/comments/preview.html:32
+#: .\contrib\comments\templates\comments\form.html.py:17
+#: .\contrib\comments\templates\comments\preview.html.py:32
 msgid "Post"
 msgstr "Publicar"
 
-#: contrib/comments/templates/comments/form.html:18
-#: contrib/comments/templates/comments/preview.html:33
+#: .\contrib\comments\templates\comments\form.html.py:18
+#: .\contrib\comments\templates\comments\preview.html.py:33
 msgid "Preview"
 msgstr "Vista prèvia"
 
-#: contrib/comments/templates/comments/posted.html:4
+#: .\contrib\comments\templates\comments\posted.html.py:4
 msgid "Thanks for commenting"
 msgstr "Gràcies per comentar"
 
-#: contrib/comments/templates/comments/posted.html:7
+#: .\contrib\comments\templates\comments\posted.html.py:7
 msgid "Thank you for your comment"
-msgstr "Gràcies pel seu comentari"
+msgstr "Gràcies pel vostre comentari"
 
-#: contrib/comments/templates/comments/preview.html:4
-#: contrib/comments/templates/comments/preview.html:13
+#: .\contrib\comments\templates\comments\preview.html.py:4
+#: .\contrib\comments\templates\comments\preview.html.py:13
 msgid "Preview your comment"
-msgstr "Previsualitzar el seu comentari"
+msgstr "Previsualitzar el vostre comentari"
 
-#: contrib/comments/templates/comments/preview.html:11
+#: .\contrib\comments\templates\comments\preview.html.py:11
 msgid "Please correct the error below"
 msgid_plural "Please correct the errors below"
-msgstr[0] "Si us plau, corregiu l'error mostrat a baix."
-msgstr[1] "Si us plau, corregiu els errors mostrats a baix."
+msgstr[0] "Si us plau, corregiu l'error mostrat a sota."
+msgstr[1] "Si us plau, corregiu els errors mostrats a sota."
 
-#: contrib/comments/templates/comments/preview.html:16
+#: .\contrib\comments\templates\comments\preview.html.py:16
 msgid "Post your comment"
 msgstr "Enviar el seu comentari"
 
-#: contrib/comments/templates/comments/preview.html:16
+#: .\contrib\comments\templates\comments\preview.html.py:16
 msgid "or make changes"
-msgstr "o faci canvis."
+msgstr "o feu canvis."
 
-#: contrib/contenttypes/models.py:70
+#: .\contrib\contenttypes\models.py:77
 msgid "python model class name"
 msgstr "nom de la classe del model en python"
 
-#: contrib/contenttypes/models.py:75
+#: .\contrib\contenttypes\models.py:82
 msgid "content types"
 msgstr "tipus de continguts"
 
-#: contrib/flatpages/admin.py:9
+#: .\contrib\flatpages\admin.py:9
 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."
 
-#: contrib/flatpages/admin.py:11
+#: .\contrib\flatpages\admin.py:11
 msgid ""
 "This value must contain only letters, numbers, underscores, dashes or "
 "slashes."
 msgstr ""
-"Aquest valor ha de contenir només lletres, números, guions baixos, guions i "
+"Aquest valor ha de contenir només lletres, números, guions baixos, guions o "
 "barres (/)."
 
-#: contrib/flatpages/admin.py:22
+#: .\contrib\flatpages\admin.py:22
 msgid "Advanced options"
 msgstr "Opcions avançades"
 
-#: contrib/flatpages/models.py:8
+#: .\contrib\flatpages\models.py:8
 msgid "title"
 msgstr "títol"
 
-#: contrib/flatpages/models.py:9
+#: .\contrib\flatpages\models.py:9
 msgid "content"
 msgstr "contingut"
 
-#: contrib/flatpages/models.py:10
+#: .\contrib\flatpages\models.py:10
 msgid "enable comments"
 msgstr "habilitar comentaris"
 
-#: contrib/flatpages/models.py:11
+#: .\contrib\flatpages\models.py:11
 msgid "template name"
 msgstr "nom de la plantilla"
 
-#: contrib/flatpages/models.py:12
+#: .\contrib\flatpages\models.py:12
 msgid ""
 "Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
 "will use 'flatpages/default.html'."
 msgstr ""
 "Exemple: 'flatpages/contact_page.html'. Si no es proporciona, el sistema "
-"utilitzarà 'flatpages/default.htmlt'."
+"utilitzarà 'flatpages/default.html'."
 
-#: contrib/flatpages/models.py:13
+#: .\contrib\flatpages\models.py:13
 msgid "registration required"
 msgstr "cal estar registrat"
 
-#: contrib/flatpages/models.py:13
+#: .\contrib\flatpages\models.py:13
 msgid "If this is checked, only logged-in users will be able to view the page."
 msgstr "Si està marcat, només els usuaris registrats podran veure la pàgina."
 
-#: contrib/flatpages/models.py:18
+#: .\contrib\flatpages\models.py:18
 msgid "flat page"
 msgstr "pàgina estàtica"
 
-#: contrib/flatpages/models.py:19
+#: .\contrib\flatpages\models.py:19
 msgid "flat pages"
 msgstr "pàgines estàtiques"
 
-#: contrib/formtools/wizard.py:132
+#: .\contrib\formtools\wizard.py:140
 msgid ""
 "We apologize, but your form has expired. Please continue filling out the "
 "form from this page."
 msgstr ""
-"Ho sentim, pero el seu formulari ha expirat. Per favor, continui omplint el "
-"formulari en aquesta pàgina."
+"Ho sentim, pero el vostre formulari ha caducat. Si us plau, continueu "
+"omplint el formulari en aquesta pàgina."
 
-#: contrib/gis/forms/fields.py:17
+#: .\contrib\gis\db\models\fields.py:50
+msgid "The base GIS field -- maps to the OpenGIS Specification Geometry type."
+msgstr "El camp GIS base -- correspon al tipus 'Geometry' de l'especificació "
+"OpenGIS."
+
+#: .\contrib\gis\db\models\fields.py:270
+msgid "Point"
+msgstr "Punt"
+
+#: .\contrib\gis\db\models\fields.py:274
+msgid "Line string"
+msgstr "Cadena de línies"
+
+#: .\contrib\gis\db\models\fields.py:278
+msgid "Polygon"
+msgstr "Polígon"
+
+#: .\contrib\gis\db\models\fields.py:282
+msgid "Multi-point"
+msgstr "Multi-punt"
+
+#: .\contrib\gis\db\models\fields.py:286
+msgid "Multi-line string"
+msgstr "Cadena de multi-línies"
+
+#: .\contrib\gis\db\models\fields.py:290
+msgid "Multi polygon"
+msgstr "Multi polígon"
+
+#: .\contrib\gis\db\models\fields.py:294
+msgid "Geometry collection"
+msgstr "Col·leció de geometria"
+
+#: .\contrib\gis\forms\fields.py:17
 msgid "No geometry value provided."
 msgstr "No s'ha indicat cap valor de geometria."
 
-#: contrib/gis/forms/fields.py:18
+#: .\contrib\gis\forms\fields.py:18
 msgid "Invalid geometry value."
 msgstr "Valor de geometria invàlid."
 
-#: contrib/gis/forms/fields.py:19
+#: .\contrib\gis\forms\fields.py:19
 msgid "Invalid geometry type."
 msgstr "Tipus de geometria invàlid."
 
-#: contrib/gis/forms/fields.py:20
+#: .\contrib\gis\forms\fields.py:20
 msgid ""
 "An error occurred when transforming the geometry to the SRID of the geometry "
 "form field."
 msgstr ""
-"Ha ocurregut un error al transformar la geometria al SRID de la geometria "
-"del camp de formulari."
+"S'ha produït un error en transformar la geometria al SRID del camp de "
+"geometria del formulari."
 
-#: contrib/humanize/templatetags/humanize.py:19
+#: .\contrib\humanize\templatetags\humanize.py:19
 msgid "th"
-msgstr "rt"
+msgstr "è"
 
-#: contrib/humanize/templatetags/humanize.py:19
+# problema: 4t, 5è, 6è...
+# o posem t o posem è, i t només aplica a 4t.
+#: .\contrib\humanize\templatetags\humanize.py:19
 msgid "st"
 msgstr "r"
 
-#: contrib/humanize/templatetags/humanize.py:19
+#: .\contrib\humanize\templatetags\humanize.py:19
 msgid "nd"
 msgstr "n"
 
-#: contrib/humanize/templatetags/humanize.py:19
+#: .\contrib\humanize\templatetags\humanize.py:19
 msgid "rd"
 msgstr "r"
 
-#: contrib/humanize/templatetags/humanize.py:51
+#: .\contrib\humanize\templatetags\humanize.py:51
 #, python-format
 msgid "%(value).1f million"
 msgid_plural "%(value).1f million"
 msgstr[0] "%(value).1f milió"
 msgstr[1] "%(value).1f  milions"
 
-#: contrib/humanize/templatetags/humanize.py:54
+#: .\contrib\humanize\templatetags\humanize.py:54
 #, python-format
 msgid "%(value).1f billion"
 msgid_plural "%(value).1f billion"
 msgstr[0] "%(value).1f bilió"
 msgstr[1] "%(value).1f bilions"
 
-#: contrib/humanize/templatetags/humanize.py:57
+#: .\contrib\humanize\templatetags\humanize.py:57
 #, python-format
 msgid "%(value).1f trillion"
 msgid_plural "%(value).1f trillion"
 msgstr[0] "%(value).1f trilió"
 msgstr[1] "%(value).1f trilions"
 
-#: contrib/humanize/templatetags/humanize.py:73
+#: .\contrib\humanize\templatetags\humanize.py:73
 msgid "one"
 msgstr "un"
 
-#: contrib/humanize/templatetags/humanize.py:73
+#: .\contrib\humanize\templatetags\humanize.py:73
 msgid "two"
 msgstr "dos"
 
-#: contrib/humanize/templatetags/humanize.py:73
+#: .\contrib\humanize\templatetags\humanize.py:73
 msgid "three"
 msgstr "tres"
 
-#: contrib/humanize/templatetags/humanize.py:73
+#: .\contrib\humanize\templatetags\humanize.py:73
 msgid "four"
 msgstr "quatre"
 
-#: contrib/humanize/templatetags/humanize.py:73
+#: .\contrib\humanize\templatetags\humanize.py:73
 msgid "five"
 msgstr "cinc"
 
-#: contrib/humanize/templatetags/humanize.py:73
+#: .\contrib\humanize\templatetags\humanize.py:73
 msgid "six"
 msgstr "sis"
 
-#: contrib/humanize/templatetags/humanize.py:73
+#: .\contrib\humanize\templatetags\humanize.py:73
 msgid "seven"
 msgstr "set"
 
-#: contrib/humanize/templatetags/humanize.py:73
+#: .\contrib\humanize\templatetags\humanize.py:73
 msgid "eight"
 msgstr "vuit"
 
-#: contrib/humanize/templatetags/humanize.py:73
+#: .\contrib\humanize\templatetags\humanize.py:73
 msgid "nine"
 msgstr "nou"
 
-#: contrib/humanize/templatetags/humanize.py:93
+#: .\contrib\humanize\templatetags\humanize.py:93
 msgid "today"
 msgstr "avui"
 
-#: contrib/humanize/templatetags/humanize.py:95
+#: .\contrib\humanize\templatetags\humanize.py:95
 msgid "tomorrow"
 msgstr "demà"
 
-#: contrib/humanize/templatetags/humanize.py:97
+#: .\contrib\humanize\templatetags\humanize.py:97
 msgid "yesterday"
 msgstr "ahir"
 
-#: contrib/localflavor/ar/forms.py:27
+#: .\contrib\localflavor\ar\forms.py:28
 msgid "Enter a postal code in the format NNNN or ANNNNAAA."
 msgstr "Introduïu un codi postal en el format NNNN o ANNNNAAA."
 
-#: 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
+#: .\contrib\localflavor\ar\forms.py:50 .\contrib\localflavor\br\forms.py:92
+#: .\contrib\localflavor\br\forms.py:131 .\contrib\localflavor\pe\forms.py:24
+#: .\contrib\localflavor\pe\forms.py:52
 msgid "This field requires only numbers."
 msgstr "Aquest camp precisa només números."
 
-#: contrib/localflavor/ar/forms.py:50
+#: .\contrib\localflavor\ar\forms.py:51
 msgid "This field requires 7 or 8 digits."
 msgstr "Aquest camp precisa 7 o 8 dígits."
 
-#: contrib/localflavor/ar/forms.py:79
+#: .\contrib\localflavor\ar\forms.py:80
 msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
 msgstr ""
 "Introduïu un número CUIT vàlid en el format XX-XXXXXXXX-X o XXXXXXXXXXXX."
 
-#: contrib/localflavor/ar/forms.py:80
+#: .\contrib\localflavor\ar\forms.py:81
 msgid "Invalid CUIT."
-msgstr "Invàlid CUIT."
+msgstr "CUIT invàlid."
 
-#: contrib/localflavor/at/at_states.py:5
+#: .\contrib\localflavor\at\at_states.py:5
 msgid "Burgenland"
 msgstr "Burgenland"
 
-#: contrib/localflavor/at/at_states.py:6
+#: .\contrib\localflavor\at\at_states.py:6
 msgid "Carinthia"
 msgstr "Carinthia"
 
-#: contrib/localflavor/at/at_states.py:7
+#: .\contrib\localflavor\at\at_states.py:7
 msgid "Lower Austria"
-msgstr "Lower Austria"
+msgstr "Àustria Inferior"
 
-#: contrib/localflavor/at/at_states.py:8
+#: .\contrib\localflavor\at\at_states.py:8
 msgid "Upper Austria"
-msgstr "Upper Austria"
+msgstr "Àustria Superior"
 
-#: contrib/localflavor/at/at_states.py:9
+#: .\contrib\localflavor\at\at_states.py:9
 msgid "Salzburg"
 msgstr "Salzburg"
 
-#: contrib/localflavor/at/at_states.py:10
+#: .\contrib\localflavor\at\at_states.py:10
 msgid "Styria"
 msgstr "Styria"
 
-#: contrib/localflavor/at/at_states.py:11
+#: .\contrib\localflavor\at\at_states.py:11
 msgid "Tyrol"
-msgstr "Tyrol"
+msgstr "Tirol"
 
-#: contrib/localflavor/at/at_states.py:12
+#: .\contrib\localflavor\at\at_states.py:12
 msgid "Vorarlberg"
 msgstr "Vorarlberg"
 
-#: contrib/localflavor/at/at_states.py:13
+#: .\contrib\localflavor\at\at_states.py:13
 msgid "Vienna"
 msgstr "Viena"
 
-#: contrib/localflavor/at/forms.py:20 contrib/localflavor/ch/forms.py:16
-#: contrib/localflavor/no/forms.py:12
+#: .\contrib\localflavor\at\forms.py:20 .\contrib\localflavor\ch\forms.py:17
+#: .\contrib\localflavor\no\forms.py:13
 msgid "Enter a zip code in the format XXXX."
 msgstr "Introduïu un codi zip en el format XXXX."
 
-#: contrib/localflavor/at/forms.py:48
+#: .\contrib\localflavor\at\forms.py:48
 msgid "Enter a valid Austrian Social Security Number in XXXX XXXXXX format."
 msgstr ""
-"Introduïu un número vàlid de la Seguretat Social Austriaca en el format XXXX "
+"Introduïu un número vàlid de la Seguretat Social Austríaca en el format XXXX "
 "XXXXXX."
 
-#: contrib/localflavor/au/forms.py:16
+#: .\contrib\localflavor\au\forms.py:17
 msgid "Enter a 4 digit post code."
 msgstr "Introduïu un codi postal de 4 dígits."
 
-#: contrib/localflavor/br/forms.py:21
+#: .\contrib\localflavor\br\forms.py:17
 msgid "Enter a zip code in the format XXXXX-XXX."
 msgstr "Introduïu un codi zip en el format XXXXX-XXX."
 
-#: contrib/localflavor/br/forms.py:30
+#: .\contrib\localflavor\br\forms.py:26
 msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "El número de telèfon ha de estar en el format XX-XXXX-XXXX."
+msgstr "El número de telèfon ha d'estar en el format XX-XXXX-XXXX."
 
-#: contrib/localflavor/br/forms.py:58
+#: .\contrib\localflavor\br\forms.py:54
 msgid ""
 "Select a valid brazilian state. That state is not one of the available "
 "states."
@@ -1989,137 +2025,137 @@
 "Seleccioneu un estat brasiler vàlid. Aquest estat no és un dels estats "
 "disponibles."
 
-#: contrib/localflavor/br/forms.py:94
+#: .\contrib\localflavor\br\forms.py:90
 msgid "Invalid CPF number."
 msgstr "Número CPF invàlid."
 
-#: contrib/localflavor/br/forms.py:95
+#: .\contrib\localflavor\br\forms.py:91
 msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Aquest camp precisa com a màxim 11 dígits o 14 caracters."
+msgstr "Aquest camp precisa com a màxim 11 dígits o 14 caràcters."
 
-#: contrib/localflavor/br/forms.py:134
+#: .\contrib\localflavor\br\forms.py:130
 msgid "Invalid CNPJ number."
 msgstr "Número CNPJ invàlid."
 
-#: contrib/localflavor/br/forms.py:136
+#: .\contrib\localflavor\br\forms.py:132
 msgid "This field requires at least 14 digits"
 msgstr "Aquest camp precisa almenys 14 dígits."
 
-#: contrib/localflavor/ca/forms.py:17
+#: .\contrib\localflavor\ca\forms.py:25
 msgid "Enter a postal code in the format XXX XXX."
 msgstr "Introduïu un codi postal en el format XXX XXX."
 
-#: contrib/localflavor/ca/forms.py:88
+#: .\contrib\localflavor\ca\forms.py:96
 msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
 msgstr ""
-"Introduïu un número vàlid de la Assegurança Social de Canadà en el format "
-"XXX-XXX-XXX."
+"Introduïu un número vàlid de la Seguretat Social de Canadà en el format XXX-"
+"XXX-XXX."
 
-#: contrib/localflavor/ch/ch_states.py:5
+#: .\contrib\localflavor\ch\ch_states.py:5
 msgid "Aargau"
 msgstr "Argau"
 
-#: contrib/localflavor/ch/ch_states.py:6
+#: .\contrib\localflavor\ch\ch_states.py:6
 msgid "Appenzell Innerrhoden"
 msgstr "Appenzell Inner-Rhoden"
 
-#: contrib/localflavor/ch/ch_states.py:7
+#: .\contrib\localflavor\ch\ch_states.py:7
 msgid "Appenzell Ausserrhoden"
 msgstr "Appenzell Ausser-Rhoden"
 
-#: contrib/localflavor/ch/ch_states.py:8
+#: .\contrib\localflavor\ch\ch_states.py:8
 msgid "Basel-Stadt"
-msgstr "Basel-Ciutat"
+msgstr "Basilea-Ciutat"
 
-#: contrib/localflavor/ch/ch_states.py:9
+#: .\contrib\localflavor\ch\ch_states.py:9
 msgid "Basel-Land"
-msgstr "Basel-Camp"
+msgstr "Basilea-Land"
 
-#: contrib/localflavor/ch/ch_states.py:10
+#: .\contrib\localflavor\ch\ch_states.py:10
 msgid "Berne"
 msgstr "Berna"
 
-#: contrib/localflavor/ch/ch_states.py:11
+#: .\contrib\localflavor\ch\ch_states.py:11
 msgid "Fribourg"
 msgstr "Friburg"
 
-#: contrib/localflavor/ch/ch_states.py:12
+#: .\contrib\localflavor\ch\ch_states.py:12
 msgid "Geneva"
 msgstr "Ginebra"
 
-#: contrib/localflavor/ch/ch_states.py:13
+#: .\contrib\localflavor\ch\ch_states.py:13
 msgid "Glarus"
 msgstr "Glarus"
 
-#: contrib/localflavor/ch/ch_states.py:14
+#: .\contrib\localflavor\ch\ch_states.py:14
 msgid "Graubuenden"
 msgstr "Graubuenden"
 
-#: contrib/localflavor/ch/ch_states.py:15
+#: .\contrib\localflavor\ch\ch_states.py:15
 msgid "Jura"
 msgstr "Jura"
 
-#: contrib/localflavor/ch/ch_states.py:16
+#: .\contrib\localflavor\ch\ch_states.py:16
 msgid "Lucerne"
 msgstr "Lucerna"
 
-#: contrib/localflavor/ch/ch_states.py:17
+#: .\contrib\localflavor\ch\ch_states.py:17
 msgid "Neuchatel"
 msgstr "Neuchatel"
 
-#: contrib/localflavor/ch/ch_states.py:18
+#: .\contrib\localflavor\ch\ch_states.py:18
 msgid "Nidwalden"
 msgstr "Nidwalden"
 
-#: contrib/localflavor/ch/ch_states.py:19
+#: .\contrib\localflavor\ch\ch_states.py:19
 msgid "Obwalden"
 msgstr "Obwalden"
 
-#: contrib/localflavor/ch/ch_states.py:20
+#: .\contrib\localflavor\ch\ch_states.py:20
 msgid "Schaffhausen"
 msgstr "Schaffhausen"
 
-#: contrib/localflavor/ch/ch_states.py:21
+#: .\contrib\localflavor\ch\ch_states.py:21
 msgid "Schwyz"
 msgstr "Schwyz"
 
-#: contrib/localflavor/ch/ch_states.py:22
+#: .\contrib\localflavor\ch\ch_states.py:22
 msgid "Solothurn"
 msgstr "Solothurn"
 
-#: contrib/localflavor/ch/ch_states.py:23
+#: .\contrib\localflavor\ch\ch_states.py:23
 msgid "St. Gallen"
 msgstr "St. Gallen"
 
-#: contrib/localflavor/ch/ch_states.py:24
+#: .\contrib\localflavor\ch\ch_states.py:24
 msgid "Thurgau"
 msgstr "Thurgau"
 
-#: contrib/localflavor/ch/ch_states.py:25
+#: .\contrib\localflavor\ch\ch_states.py:25
 msgid "Ticino"
 msgstr "Ticino"
 
-#: contrib/localflavor/ch/ch_states.py:26
+#: .\contrib\localflavor\ch\ch_states.py:26
 msgid "Uri"
 msgstr "Uri"
 
-#: contrib/localflavor/ch/ch_states.py:27
+#: .\contrib\localflavor\ch\ch_states.py:27
 msgid "Valais"
 msgstr "Valais"
 
-#: contrib/localflavor/ch/ch_states.py:28
+#: .\contrib\localflavor\ch\ch_states.py:28
 msgid "Vaud"
 msgstr "Vaud"
 
-#: contrib/localflavor/ch/ch_states.py:29
+#: .\contrib\localflavor\ch\ch_states.py:29
 msgid "Zug"
 msgstr "Zug"
 
-#: contrib/localflavor/ch/ch_states.py:30
+#: .\contrib\localflavor\ch\ch_states.py:30
 msgid "Zurich"
 msgstr "Zuric"
 
-#: contrib/localflavor/ch/forms.py:64
+#: .\contrib\localflavor\ch\forms.py:65
 msgid ""
 "Enter a valid Swiss identity or passport card number in X1234567<0 or "
 "1234567890 format."
@@ -2127,445 +2163,445 @@
 "Introduïu un número d'identificació o de passaport Suïssos en els formats "
 "1234567890 o X1234567<0."
 
-#: contrib/localflavor/cl/forms.py:29
+#: .\contrib\localflavor\cl\forms.py:30
 msgid "Enter a valid Chilean RUT."
 msgstr "Introduïu un RUT Xilè vàlid."
 
-#: contrib/localflavor/cl/forms.py:30
+#: .\contrib\localflavor\cl\forms.py:31
 msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X."
 msgstr "Introduïu un RUT Xilè vàlid. El format és XX.XXX.XXX-X"
 
-#: contrib/localflavor/cl/forms.py:31
+#: .\contrib\localflavor\cl\forms.py:32
 msgid "The Chilean RUT is not valid."
 msgstr "El RUT Xilè no és vàlid."
 
-#: contrib/localflavor/cz/cz_regions.py:8
+#: .\contrib\localflavor\cz\cz_regions.py:8
 msgid "Prague"
 msgstr "Praga"
 
-#: contrib/localflavor/cz/cz_regions.py:9
+#: .\contrib\localflavor\cz\cz_regions.py:9
 msgid "Central Bohemian Region"
 msgstr "Regió Bohèmia Central"
 
-#: contrib/localflavor/cz/cz_regions.py:10
+#: .\contrib\localflavor\cz\cz_regions.py:10
 msgid "South Bohemian Region"
 msgstr "Regió Bohèmia Sur"
 
-#: contrib/localflavor/cz/cz_regions.py:11
+#: .\contrib\localflavor\cz\cz_regions.py:11
 msgid "Pilsen Region"
 msgstr "Regió Pilsen"
 
-#: contrib/localflavor/cz/cz_regions.py:12
+#: .\contrib\localflavor\cz\cz_regions.py:12
 msgid "Carlsbad Region"
 msgstr "Regió Carlsbad"
 
-#: contrib/localflavor/cz/cz_regions.py:13
+#: .\contrib\localflavor\cz\cz_regions.py:13
 msgid "Usti Region"
 msgstr "Regió Usti"
 
-#: contrib/localflavor/cz/cz_regions.py:14
+#: .\contrib\localflavor\cz\cz_regions.py:14
 msgid "Liberec Region"
 msgstr "Regió Liberec"
 
-#: contrib/localflavor/cz/cz_regions.py:15
+#: .\contrib\localflavor\cz\cz_regions.py:15
 msgid "Hradec Region"
 msgstr "Regió Hradec"
 
-#: contrib/localflavor/cz/cz_regions.py:16
+#: .\contrib\localflavor\cz\cz_regions.py:16
 msgid "Pardubice Region"
 msgstr "Regió Pardubice"
 
-#: contrib/localflavor/cz/cz_regions.py:17
+#: .\contrib\localflavor\cz\cz_regions.py:17
 msgid "Vysocina Region"
 msgstr "Regió Vysocina"
 
-#: contrib/localflavor/cz/cz_regions.py:18
+#: .\contrib\localflavor\cz\cz_regions.py:18
 msgid "South Moravian Region"
 msgstr "Regió Moràvia Sur"
 
-#: contrib/localflavor/cz/cz_regions.py:19
+#: .\contrib\localflavor\cz\cz_regions.py:19
 msgid "Olomouc Region"
 msgstr "Regió Olomouc"
 
-#: contrib/localflavor/cz/cz_regions.py:20
+#: .\contrib\localflavor\cz\cz_regions.py:20
 msgid "Zlin Region"
 msgstr "Regió Zlin"
 
-#: contrib/localflavor/cz/cz_regions.py:21
+#: .\contrib\localflavor\cz\cz_regions.py:21
 msgid "Moravian-Silesian Region"
 msgstr "Regió Moràvia-Silesiana"
 
-#: contrib/localflavor/cz/forms.py:27 contrib/localflavor/sk/forms.py:30
+#: .\contrib\localflavor\cz\forms.py:28 .\contrib\localflavor\sk\forms.py:30
 msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Introduïu un codi postal en el format XXXXX or XXX XX."
+msgstr "Introduïu un codi postal en el format XXXXX o XXX XX."
 
-#: contrib/localflavor/cz/forms.py:47
+#: .\contrib\localflavor\cz\forms.py:48
 msgid "Enter a birth number in the format XXXXXX/XXXX or XXXXXXXXXX."
 msgstr ""
 "Introduïu un número de naixement en el format XXXXXX/XXXX o XXXXXXXXXX."
 
-#: contrib/localflavor/cz/forms.py:48
+#: .\contrib\localflavor\cz\forms.py:49
 msgid "Invalid optional parameter Gender, valid values are 'f' and 'm'"
 msgstr ""
 "El paràmetre opcional 'Gènere' és invàlid, els valors vàlids son 'f' i 'm'."
 
-#: contrib/localflavor/cz/forms.py:49
+#: .\contrib\localflavor\cz\forms.py:50
 msgid "Enter a valid birth number."
 msgstr "Introduïu un número de naixement vàlid."
 
-#: contrib/localflavor/cz/forms.py:106
+#: .\contrib\localflavor\cz\forms.py:107
 msgid "Enter a valid IC number."
-msgstr "Intrduïu un número de IC vàlid."
+msgstr "Introduïu un número de IC vàlid."
 
-#: contrib/localflavor/de/de_states.py:5
+#: .\contrib\localflavor\de\de_states.py:5
 msgid "Baden-Wuerttemberg"
 msgstr "Baden-Württemberg"
 
-#: contrib/localflavor/de/de_states.py:6
+#: .\contrib\localflavor\de\de_states.py:6
 msgid "Bavaria"
 msgstr "Baviera"
 
-#: contrib/localflavor/de/de_states.py:7
+#: .\contrib\localflavor\de\de_states.py:7
 msgid "Berlin"
 msgstr "Berlín"
 
-#: contrib/localflavor/de/de_states.py:8
+#: .\contrib\localflavor\de\de_states.py:8
 msgid "Brandenburg"
 msgstr "Brandenburg"
 
-#: contrib/localflavor/de/de_states.py:9
+#: .\contrib\localflavor\de\de_states.py:9
 msgid "Bremen"
 msgstr "Bremen"
 
-#: contrib/localflavor/de/de_states.py:10
+#: .\contrib\localflavor\de\de_states.py:10
 msgid "Hamburg"
 msgstr "Hamburg"
 
-#: contrib/localflavor/de/de_states.py:11
+#: .\contrib\localflavor\de\de_states.py:11
 msgid "Hessen"
 msgstr "Hessen"
 
-#: contrib/localflavor/de/de_states.py:12
+#: .\contrib\localflavor\de\de_states.py:12
 msgid "Mecklenburg-Western Pomerania"
 msgstr "Mecklenburg-Pomerània Occidental"
 
-#: contrib/localflavor/de/de_states.py:13
+#: .\contrib\localflavor\de\de_states.py:13
 msgid "Lower Saxony"
 msgstr "Baixa Saxònia"
 
-#: contrib/localflavor/de/de_states.py:14
+#: .\contrib\localflavor\de\de_states.py:14
 msgid "North Rhine-Westphalia"
 msgstr "Renània del Nord-Westfàlia"
 
-#: contrib/localflavor/de/de_states.py:15
+#: .\contrib\localflavor\de\de_states.py:15
 msgid "Rhineland-Palatinate"
 msgstr "Renània-Palatinat"
 
-#: contrib/localflavor/de/de_states.py:16
+#: .\contrib\localflavor\de\de_states.py:16
 msgid "Saarland"
 msgstr "Saarland"
 
-#: contrib/localflavor/de/de_states.py:17
+#: .\contrib\localflavor\de\de_states.py:17
 msgid "Saxony"
 msgstr "Saxònia"
 
-#: contrib/localflavor/de/de_states.py:18
+#: .\contrib\localflavor\de\de_states.py:18
 msgid "Saxony-Anhalt"
 msgstr "Saxònia-Anhalt"
 
-#: contrib/localflavor/de/de_states.py:19
+#: .\contrib\localflavor\de\de_states.py:19
 msgid "Schleswig-Holstein"
 msgstr "Slesvig-Holstein"
 
-#: contrib/localflavor/de/de_states.py:20
+#: .\contrib\localflavor\de\de_states.py:20
 msgid "Thuringia"
 msgstr "Turíngia"
 
-#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12
-#: contrib/localflavor/fr/forms.py:15
+#: .\contrib\localflavor\de\forms.py:15 .\contrib\localflavor\fi\forms.py:13
+#: .\contrib\localflavor\fr\forms.py:16
 msgid "Enter a zip code in the format XXXXX."
 msgstr "Introduïu un codi zip en el format XXXXX."
 
-#: contrib/localflavor/de/forms.py:41
+#: .\contrib\localflavor\de\forms.py:42
 msgid ""
 "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X "
 "format."
 msgstr ""
-"Introduïu un número de tarjeta d'identificació alemany vàlid en el format "
+"Introduïu un número vàlid de tarjeta d'identificació alemanya en el format "
 "XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
 
-#: contrib/localflavor/es/es_provinces.py:5
+#: .\contrib\localflavor\es\es_provinces.py:5
 msgid "Arava"
 msgstr "Àlaba"
 
-#: contrib/localflavor/es/es_provinces.py:6
+#: .\contrib\localflavor\es\es_provinces.py:6
 msgid "Albacete"
 msgstr "Albacete"
 
-#: contrib/localflavor/es/es_provinces.py:7
+#: .\contrib\localflavor\es\es_provinces.py:7
 msgid "Alacant"
 msgstr "Alacant"
 
-#: contrib/localflavor/es/es_provinces.py:8
+#: .\contrib\localflavor\es\es_provinces.py:8
 msgid "Almeria"
 msgstr "Almeria"
 
-#: contrib/localflavor/es/es_provinces.py:9
+#: .\contrib\localflavor\es\es_provinces.py:9
 msgid "Avila"
 msgstr "Àvila"
 
-#: contrib/localflavor/es/es_provinces.py:10
+#: .\contrib\localflavor\es\es_provinces.py:10
 msgid "Badajoz"
 msgstr "Badajoz"
 
-#: contrib/localflavor/es/es_provinces.py:11
+#: .\contrib\localflavor\es\es_provinces.py:11
 msgid "Illes Balears"
 msgstr "Illes Balears"
 
-#: contrib/localflavor/es/es_provinces.py:12
+#: .\contrib\localflavor\es\es_provinces.py:12
 msgid "Barcelona"
 msgstr "Barcelona"
 
-#: contrib/localflavor/es/es_provinces.py:13
+#: .\contrib\localflavor\es\es_provinces.py:13
 msgid "Burgos"
 msgstr "Burgos"
 
-#: contrib/localflavor/es/es_provinces.py:14
+#: .\contrib\localflavor\es\es_provinces.py:14
 msgid "Caceres"
 msgstr "Càceres"
 
-#: contrib/localflavor/es/es_provinces.py:15
+#: .\contrib\localflavor\es\es_provinces.py:15
 msgid "Cadiz"
 msgstr "Cadis"
 
-#: contrib/localflavor/es/es_provinces.py:16
+#: .\contrib\localflavor\es\es_provinces.py:16
 msgid "Castello"
 msgstr "Castelló"
 
-#: contrib/localflavor/es/es_provinces.py:17
+#: .\contrib\localflavor\es\es_provinces.py:17
 msgid "Ciudad Real"
 msgstr "Ciudad Real"
 
-#: contrib/localflavor/es/es_provinces.py:18
+#: .\contrib\localflavor\es\es_provinces.py:18
 msgid "Cordoba"
 msgstr "Còrdova"
 
-#: contrib/localflavor/es/es_provinces.py:19
+#: .\contrib\localflavor\es\es_provinces.py:19
 msgid "A Coruna"
 msgstr "La Corunya"
 
-#: contrib/localflavor/es/es_provinces.py:20
+#: .\contrib\localflavor\es\es_provinces.py:20
 msgid "Cuenca"
 msgstr "Conca"
 
-#: contrib/localflavor/es/es_provinces.py:21
+#: .\contrib\localflavor\es\es_provinces.py:21
 msgid "Girona"
 msgstr "Girona"
 
-#: contrib/localflavor/es/es_provinces.py:22
+#: .\contrib\localflavor\es\es_provinces.py:22
 msgid "Granada"
 msgstr "Granada"
 
-#: contrib/localflavor/es/es_provinces.py:23
+#: .\contrib\localflavor\es\es_provinces.py:23
 msgid "Guadalajara"
 msgstr "Guadalajara"
 
-#: contrib/localflavor/es/es_provinces.py:24
+#: .\contrib\localflavor\es\es_provinces.py:24
 msgid "Guipuzkoa"
 msgstr "Guipúscoa"
 
-#: contrib/localflavor/es/es_provinces.py:25
+#: .\contrib\localflavor\es\es_provinces.py:25
 msgid "Huelva"
 msgstr "Huelva"
 
-#: contrib/localflavor/es/es_provinces.py:26
+#: .\contrib\localflavor\es\es_provinces.py:26
 msgid "Huesca"
 msgstr "Osca"
 
-#: contrib/localflavor/es/es_provinces.py:27
+#: .\contrib\localflavor\es\es_provinces.py:27
 msgid "Jaen"
 msgstr "Jaén"
 
-#: contrib/localflavor/es/es_provinces.py:28
+#: .\contrib\localflavor\es\es_provinces.py:28
 msgid "Leon"
 msgstr "Lleó"
 
-#: contrib/localflavor/es/es_provinces.py:29
+#: .\contrib\localflavor\es\es_provinces.py:29
 msgid "Lleida"
 msgstr "Lleida"
 
-#: contrib/localflavor/es/es_provinces.py:30
-#: contrib/localflavor/es/es_regions.py:17
+#: .\contrib\localflavor\es\es_provinces.py:30
+#: .\contrib\localflavor\es\es_regions.py:17
 msgid "La Rioja"
 msgstr "La Rioja"
 
-#: contrib/localflavor/es/es_provinces.py:31
+#: .\contrib\localflavor\es\es_provinces.py:31
 msgid "Lugo"
 msgstr "Lugo"
 
-#: contrib/localflavor/es/es_provinces.py:32
-#: contrib/localflavor/es/es_regions.py:18
+#: .\contrib\localflavor\es\es_provinces.py:32
+#: .\contrib\localflavor\es\es_regions.py:18
 msgid "Madrid"
 msgstr "Madrid"
 
-#: contrib/localflavor/es/es_provinces.py:33
+#: .\contrib\localflavor\es\es_provinces.py:33
 msgid "Malaga"
 msgstr "Màlaga"
 
-#: contrib/localflavor/es/es_provinces.py:34
+#: .\contrib\localflavor\es\es_provinces.py:34
 msgid "Murcia"
 msgstr "Múrcia"
 
-#: contrib/localflavor/es/es_provinces.py:35
+#: .\contrib\localflavor\es\es_provinces.py:35
 msgid "Navarre"
 msgstr "Navarra"
 
-#: contrib/localflavor/es/es_provinces.py:36
+#: .\contrib\localflavor\es\es_provinces.py:36
 msgid "Ourense"
 msgstr "Ourense"
 
-#: contrib/localflavor/es/es_provinces.py:37
+#: .\contrib\localflavor\es\es_provinces.py:37
 msgid "Asturias"
 msgstr "Astúries"
 
-#: contrib/localflavor/es/es_provinces.py:38
+#: .\contrib\localflavor\es\es_provinces.py:38
 msgid "Palencia"
 msgstr "Palència"
 
-#: contrib/localflavor/es/es_provinces.py:39
+#: .\contrib\localflavor\es\es_provinces.py:39
 msgid "Las Palmas"
 msgstr "Las Palmas"
 
-#: contrib/localflavor/es/es_provinces.py:40
+#: .\contrib\localflavor\es\es_provinces.py:40
 msgid "Pontevedra"
 msgstr "Pontevedra"
 
-#: contrib/localflavor/es/es_provinces.py:41
+#: .\contrib\localflavor\es\es_provinces.py:41
 msgid "Salamanca"
 msgstr "Salamanca"
 
-#: contrib/localflavor/es/es_provinces.py:42
+#: .\contrib\localflavor\es\es_provinces.py:42
 msgid "Santa Cruz de Tenerife"
 msgstr "Santa Cruz de Tenerife"
 
-#: contrib/localflavor/es/es_provinces.py:43
-#: contrib/localflavor/es/es_regions.py:11
+#: .\contrib\localflavor\es\es_provinces.py:43
+#: .\contrib\localflavor\es\es_regions.py:11
 msgid "Cantabria"
 msgstr "Cantàbria"
 
-#: contrib/localflavor/es/es_provinces.py:44
+#: .\contrib\localflavor\es\es_provinces.py:44
 msgid "Segovia"
 msgstr "Segòvia"
 
-#: contrib/localflavor/es/es_provinces.py:45
+#: .\contrib\localflavor\es\es_provinces.py:45
 msgid "Seville"
 msgstr "Sevilla"
 
-#: contrib/localflavor/es/es_provinces.py:46
+#: .\contrib\localflavor\es\es_provinces.py:46
 msgid "Soria"
 msgstr "Sòria"
 
-#: contrib/localflavor/es/es_provinces.py:47
+#: .\contrib\localflavor\es\es_provinces.py:47
 msgid "Tarragona"
 msgstr "Tarragona"
 
-#: contrib/localflavor/es/es_provinces.py:48
+#: .\contrib\localflavor\es\es_provinces.py:48
 msgid "Teruel"
 msgstr "Terol"
 
-#: contrib/localflavor/es/es_provinces.py:49
+#: .\contrib\localflavor\es\es_provinces.py:49
 msgid "Toledo"
 msgstr "Toledo"
 
-#: contrib/localflavor/es/es_provinces.py:50
+#: .\contrib\localflavor\es\es_provinces.py:50
 msgid "Valencia"
 msgstr "València"
 
-#: contrib/localflavor/es/es_provinces.py:51
+#: .\contrib\localflavor\es\es_provinces.py:51
 msgid "Valladolid"
 msgstr "Valladolid"
 
-#: contrib/localflavor/es/es_provinces.py:52
+#: .\contrib\localflavor\es\es_provinces.py:52
 msgid "Bizkaia"
 msgstr "Biscaia"
 
-#: contrib/localflavor/es/es_provinces.py:53
+#: .\contrib\localflavor\es\es_provinces.py:53
 msgid "Zamora"
 msgstr "Zamora"
 
-#: contrib/localflavor/es/es_provinces.py:54
+#: .\contrib\localflavor\es\es_provinces.py:54
 msgid "Zaragoza"
 msgstr "Saragossa"
 
-#: contrib/localflavor/es/es_provinces.py:55
+#: .\contrib\localflavor\es\es_provinces.py:55
 msgid "Ceuta"
 msgstr "Ceuta"
 
-#: contrib/localflavor/es/es_provinces.py:56
+#: .\contrib\localflavor\es\es_provinces.py:56
 msgid "Melilla"
 msgstr "Melilla"
 
-#: contrib/localflavor/es/es_regions.py:5
+#: .\contrib\localflavor\es\es_regions.py:5
 msgid "Andalusia"
 msgstr "Andalusia"
 
-#: contrib/localflavor/es/es_regions.py:6
+#: .\contrib\localflavor\es\es_regions.py:6
 msgid "Aragon"
 msgstr "Aragó"
 
-#: contrib/localflavor/es/es_regions.py:7
+#: .\contrib\localflavor\es\es_regions.py:7
 msgid "Principality of Asturias"
 msgstr "Principat d'Astúries"
 
-#: contrib/localflavor/es/es_regions.py:8
+#: .\contrib\localflavor\es\es_regions.py:8
 msgid "Balearic Islands"
 msgstr "Illes Balears"
 
-#: contrib/localflavor/es/es_regions.py:9
+#: .\contrib\localflavor\es\es_regions.py:9
 msgid "Basque Country"
 msgstr "Euskadi"
 
-#: contrib/localflavor/es/es_regions.py:10
+#: .\contrib\localflavor\es\es_regions.py:10
 msgid "Canary Islands"
 msgstr "Canàries"
 
-#: contrib/localflavor/es/es_regions.py:12
+#: .\contrib\localflavor\es\es_regions.py:12
 msgid "Castile-La Mancha"
 msgstr "Castella-La Mancha"
 
-#: contrib/localflavor/es/es_regions.py:13
+#: .\contrib\localflavor\es\es_regions.py:13
 msgid "Castile and Leon"
 msgstr "Castella i Lleó"
 
-#: contrib/localflavor/es/es_regions.py:14
+#: .\contrib\localflavor\es\es_regions.py:14
 msgid "Catalonia"
 msgstr "Catalunya"
 
-#: contrib/localflavor/es/es_regions.py:15
+#: .\contrib\localflavor\es\es_regions.py:15
 msgid "Extremadura"
 msgstr "Extremadura"
 
-#: contrib/localflavor/es/es_regions.py:16
+#: .\contrib\localflavor\es\es_regions.py:16
 msgid "Galicia"
 msgstr "Galícia"
 
-#: contrib/localflavor/es/es_regions.py:19
+#: .\contrib\localflavor\es\es_regions.py:19
 msgid "Region of Murcia"
 msgstr "Regió de Múrcia"
 
-#: contrib/localflavor/es/es_regions.py:20
+#: .\contrib\localflavor\es\es_regions.py:20
 msgid "Foral Community of Navarre"
 msgstr "Comunitat Foral de Navarra"
 
-#: contrib/localflavor/es/es_regions.py:21
+#: .\contrib\localflavor\es\es_regions.py:21
 msgid "Valencian Community"
 msgstr "Comunitat Valenciana"
 
-#: contrib/localflavor/es/forms.py:19
+#: .\contrib\localflavor\es\forms.py:20
 msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
 msgstr "Introduïu un codi postal en rang i format 01XXX - 52XXX."
 
-#: contrib/localflavor/es/forms.py:39
+#: .\contrib\localflavor\es\forms.py:40
 msgid ""
 "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or "
 "9XXXXXXXX."
@@ -2573,1382 +2609,2112 @@
 "Introduïu un número de telèfon vàlid en un dels formats 6XXXXXXXX, 8XXXXXXXX "
 "o 9XXXXXXXX."
 
-#: contrib/localflavor/es/forms.py:66
+#: .\contrib\localflavor\es\forms.py:67
 msgid "Please enter a valid NIF, NIE, or CIF."
 msgstr "Si us plau, introduïu un NIF, NIE o CIF vàlid."
 
-#: contrib/localflavor/es/forms.py:67
+#: .\contrib\localflavor\es\forms.py:68
 msgid "Please enter a valid NIF or NIE."
 msgstr "Si us plau, introduïu un NIF o NIE vàlid."
 
-#: contrib/localflavor/es/forms.py:68
+#: .\contrib\localflavor\es\forms.py:69
 msgid "Invalid checksum for NIF."
-msgstr "Validació invàlida del NIF."
+msgstr "Verificació del NIF invàlida."
 
-#: contrib/localflavor/es/forms.py:69
+#: .\contrib\localflavor\es\forms.py:70
 msgid "Invalid checksum for NIE."
-msgstr "Validació invàlida del NIE."
+msgstr "Verificació del NIE invàlida."
 
-#: contrib/localflavor/es/forms.py:70
+#: .\contrib\localflavor\es\forms.py:71
 msgid "Invalid checksum for CIF."
-msgstr "Validació invàlida del CIF."
+msgstr "Verificació del CIF invàlida."
 
-#: contrib/localflavor/es/forms.py:142
+#: .\contrib\localflavor\es\forms.py:143
 msgid ""
 "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
 msgstr ""
 "Introduïu un número de compte bancari vàlid en el format XXXX-XXXX-XX-"
 "XXXXXXXXXX."
 
-#: contrib/localflavor/es/forms.py:143
+#: .\contrib\localflavor\es\forms.py:144
 msgid "Invalid checksum for bank account number."
-msgstr "Validació invàlida del número de compte bancari."
+msgstr "Verificació del número de compte bancari invàlida."
 
-#: contrib/localflavor/fi/forms.py:28
+#: .\contrib\localflavor\fi\forms.py:29
 msgid "Enter a valid Finnish social security number."
 msgstr "Introduïu un número vàlid de la seguretat social finlandesa."
 
-#: contrib/localflavor/fr/forms.py:30
+#: .\contrib\localflavor\fr\forms.py:31
 msgid "Phone numbers must be in 0X XX XX XX XX format."
 msgstr "Els números de telèfon han de estar en el format 0X XX XX XX XX."
 
-#: contrib/localflavor/in_/forms.py:14
+#: .\contrib\localflavor\id\forms.py:28
+msgid "Enter a valid post code"
+msgstr "Introduïu un codi postal vàlid."
+
+#: .\contrib\localflavor\id\forms.py:68 .\contrib\localflavor\nl\forms.py:53
+msgid "Enter a valid phone number"
+msgstr "Introduïu un número de telèfon vàlid."
+
+#: .\contrib\localflavor\id\forms.py:107
+msgid "Enter a valid vehicle license plate number"
+msgstr "Introduïu un número de matrícula vàlid."
+
+#: .\contrib\localflavor\id\forms.py:170
+msgid "Enter a valid NIK/KTP number"
+msgstr "Introduïu un número NIK/KTP vàlid."
+
+#: .\contrib\localflavor\id\id_choices.py:9
+#: .\contrib\localflavor\id\id_choices.py:73
+msgid "Bali"
+msgstr "Bali"
+
+#: .\contrib\localflavor\id\id_choices.py:10
+#: .\contrib\localflavor\id\id_choices.py:45
+msgid "Banten"
+msgstr "Banten"
+
+#: .\contrib\localflavor\id\id_choices.py:11
+#: .\contrib\localflavor\id\id_choices.py:54
+msgid "Bengkulu"
+msgstr "Bengkulu"
+
+#: .\contrib\localflavor\id\id_choices.py:12
+#: .\contrib\localflavor\id\id_choices.py:47
+msgid "Yogyakarta"
+msgstr "Yogyakarta"
+
+#: .\contrib\localflavor\id\id_choices.py:13
+#: .\contrib\localflavor\id\id_choices.py:51
+msgid "Jakarta"
+msgstr "Jakarta"
+
+#: .\contrib\localflavor\id\id_choices.py:14
+#: .\contrib\localflavor\id\id_choices.py:75
+msgid "Gorontalo"
+msgstr "Gorontalo"
+
+#: .\contrib\localflavor\id\id_choices.py:15
+#: .\contrib\localflavor\id\id_choices.py:57
+msgid "Jambi"
+msgstr "Jambi"
+
+#: .\contrib\localflavor\id\id_choices.py:16
+msgid "Jawa Barat"
+msgstr "Jawa Barat"
+
+#: .\contrib\localflavor\id\id_choices.py:17
+msgid "Jawa Tengah"
+msgstr "Jawa Tengah"
+
+#: .\contrib\localflavor\id\id_choices.py:18
+msgid "Jawa Timur"
+msgstr "Jawa Timur"
+
+#: .\contrib\localflavor\id\id_choices.py:19
+#: .\contrib\localflavor\id\id_choices.py:88
+msgid "Kalimantan Barat"
+msgstr "Kalimantan Barat"
+
+#: .\contrib\localflavor\id\id_choices.py:20
+#: .\contrib\localflavor\id\id_choices.py:66
+msgid "Kalimantan Selatan"
+msgstr "Kalimantan Selatan"
+
+#: .\contrib\localflavor\id\id_choices.py:21
+#: .\contrib\localflavor\id\id_choices.py:89
+msgid "Kalimantan Tengah"
+msgstr "Kalimantan Tengah"
+
+#: .\contrib\localflavor\id\id_choices.py:22
+#: .\contrib\localflavor\id\id_choices.py:90
+msgid "Kalimantan Timur"
+msgstr "Kalimantan Timur"
+
+#: .\contrib\localflavor\id\id_choices.py:23
+msgid "Kepulauan Bangka-Belitung"
+msgstr "Kepulauan Bangka-Belitung"
+
+#: .\contrib\localflavor\id\id_choices.py:24
+#: .\contrib\localflavor\id\id_choices.py:62
+msgid "Kepulauan Riau"
+msgstr "Kepulauan Riau"
+
+#: .\contrib\localflavor\id\id_choices.py:25
+#: .\contrib\localflavor\id\id_choices.py:55
+msgid "Lampung"
+msgstr "Lampung"
+
+#: .\contrib\localflavor\id\id_choices.py:26
+#: .\contrib\localflavor\id\id_choices.py:70
+msgid "Maluku"
+msgstr "Maluku"
+
+#: .\contrib\localflavor\id\id_choices.py:27
+#: .\contrib\localflavor\id\id_choices.py:71
+msgid "Maluku Utara"
+msgstr "Maluku Utara"
+
+#: .\contrib\localflavor\id\id_choices.py:28
+#: .\contrib\localflavor\id\id_choices.py:59
+msgid "Nanggroe Aceh Darussalam"
+msgstr "Nanggroe Aceh Darussalam"
+
+#: .\contrib\localflavor\id\id_choices.py:29
+msgid "Nusa Tenggara Barat"
+msgstr "Nusa Tenggara Barat"
+
+#: .\contrib\localflavor\id\id_choices.py:30
+msgid "Nusa Tenggara Timur"
+msgstr "Nusa Tenggara Timur"
+
+#: .\contrib\localflavor\id\id_choices.py:31
+msgid "Papua"
+msgstr "Papua"
+
+#: .\contrib\localflavor\id\id_choices.py:32
+msgid "Papua Barat"
+msgstr "Papua Barat"
+
+#: .\contrib\localflavor\id\id_choices.py:33
+#: .\contrib\localflavor\id\id_choices.py:60
+msgid "Riau"
+msgstr "Riau"
+
+#: .\contrib\localflavor\id\id_choices.py:34
+#: .\contrib\localflavor\id\id_choices.py:68
+msgid "Sulawesi Barat"
+msgstr "Sulawesi Barat"
+
+#: .\contrib\localflavor\id\id_choices.py:35
+#: .\contrib\localflavor\id\id_choices.py:69
+msgid "Sulawesi Selatan"
+msgstr "Sulawesi Selatan"
+
+#: .\contrib\localflavor\id\id_choices.py:36
+#: .\contrib\localflavor\id\id_choices.py:76
+msgid "Sulawesi Tengah"
+msgstr "Sulawesi Tengah"
+
+#: .\contrib\localflavor\id\id_choices.py:37
+#: .\contrib\localflavor\id\id_choices.py:79
+msgid "Sulawesi Tenggara"
+msgstr "Sulawesi Tenggara"
+
+#: .\contrib\localflavor\id\id_choices.py:38
+msgid "Sulawesi Utara"
+msgstr "Sulawesi Utara"
+
+#: .\contrib\localflavor\id\id_choices.py:39
+#: .\contrib\localflavor\id\id_choices.py:52
+msgid "Sumatera Barat"
+msgstr "Sumatera Barat"
+
+#: .\contrib\localflavor\id\id_choices.py:40
+#: .\contrib\localflavor\id\id_choices.py:56
+msgid "Sumatera Selatan"
+msgstr "Sumatera Selatan"
+
+#: .\contrib\localflavor\id\id_choices.py:41
+#: .\contrib\localflavor\id\id_choices.py:58
+msgid "Sumatera Utara"
+msgstr "Sumatera Utara"
+
+#: .\contrib\localflavor\id\id_choices.py:46
+msgid "Magelang"
+msgstr "Magelang"
+
+#: .\contrib\localflavor\id\id_choices.py:48
+msgid "Surakarta - Solo"
+msgstr "Surakarta - Solo"
+
+#: .\contrib\localflavor\id\id_choices.py:49
+msgid "Madiun"
+msgstr "Madiun"
+
+#: .\contrib\localflavor\id\id_choices.py:50
+msgid "Kediri"
+msgstr "Kediri"
+
+#: .\contrib\localflavor\id\id_choices.py:53
+msgid "Tapanuli"
+msgstr "Tapanuli"
+
+#: .\contrib\localflavor\id\id_choices.py:61
+msgid "Kepulauan Bangka Belitung"
+msgstr "Kepulauan Bangka Belitung"
+
+#: .\contrib\localflavor\id\id_choices.py:63
+msgid "Corps Consulate"
+msgstr "Corps Consulate"
+
+#: .\contrib\localflavor\id\id_choices.py:64
+msgid "Corps Diplomatic"
+msgstr "Corps Diplomatic"
+
+#: .\contrib\localflavor\id\id_choices.py:65
+msgid "Bandung"
+msgstr "Bandung"
+
+#: .\contrib\localflavor\id\id_choices.py:67
+msgid "Sulawesi Utara Daratan"
+msgstr "Sulawesi Utara Daratan"
+
+#: .\contrib\localflavor\id\id_choices.py:72
+msgid "NTT - Timor"
+msgstr "NTT - Timor"
+
+#: .\contrib\localflavor\id\id_choices.py:74
+msgid "Sulawesi Utara Kepulauan"
+msgstr "Sulawesi Utara Kepulauan"
+
+#: .\contrib\localflavor\id\id_choices.py:77
+msgid "NTB - Lombok"
+msgstr "NTB - Lombok"
+
+#: .\contrib\localflavor\id\id_choices.py:78
+msgid "Papua dan Papua Barat"
+msgstr "Papua dan Papua Barat"
+
+#: .\contrib\localflavor\id\id_choices.py:80
+msgid "Cirebon"
+msgstr "Cirebon"
+
+#: .\contrib\localflavor\id\id_choices.py:81
+msgid "NTB - Sumbawa"
+msgstr "NTB - Sumbawa"
+
+#: .\contrib\localflavor\id\id_choices.py:82
+msgid "NTT - Flores"
+msgstr "NTT - Flores"
+
+#: .\contrib\localflavor\id\id_choices.py:83
+msgid "NTT - Sumba"
+msgstr "NTT - Sumba"
+
+#: .\contrib\localflavor\id\id_choices.py:84
+msgid "Bogor"
+msgstr "Bogor"
+
+#: .\contrib\localflavor\id\id_choices.py:85
+msgid "Pekalongan"
+msgstr "Pekalongan"
+
+#: .\contrib\localflavor\id\id_choices.py:86
+msgid "Semarang"
+msgstr "Semarang"
+
+#: .\contrib\localflavor\id\id_choices.py:87
+msgid "Pati"
+msgstr "Pati"
+
+#: .\contrib\localflavor\id\id_choices.py:91
+msgid "Surabaya"
+msgstr "Surabaya"
+
+#: .\contrib\localflavor\id\id_choices.py:92
+msgid "Madura"
+msgstr "Madura"
+
+#: .\contrib\localflavor\id\id_choices.py:93
+msgid "Malang"
+msgstr "Malang"
+
+#: .\contrib\localflavor\id\id_choices.py:94
+msgid "Jember"
+msgstr "Jember"
+
+#: .\contrib\localflavor\id\id_choices.py:95
+msgid "Banyumas"
+msgstr "Banyumas"
+
+#: .\contrib\localflavor\id\id_choices.py:96
+msgid "Federal Government"
+msgstr "Govern Federal"
+
+#: .\contrib\localflavor\id\id_choices.py:97
+msgid "Bojonegoro"
+msgstr "Bojonegoro"
+
+#: .\contrib\localflavor\id\id_choices.py:98
+msgid "Purwakarta"
+msgstr "Purwakarta"
+
+#: .\contrib\localflavor\id\id_choices.py:99
+msgid "Sidoarjo"
+msgstr "Sidoarjo"
+
+#: .\contrib\localflavor\id\id_choices.py:100
+msgid "Garut"
+msgstr "Garut"
+
+#: .\contrib\localflavor\ie\ie_counties.py:8
+msgid "Antrim"
+msgstr "Antrim"
+
+#: .\contrib\localflavor\ie\ie_counties.py:9
+msgid "Armagh"
+msgstr "Armagh"
+
+#: .\contrib\localflavor\ie\ie_counties.py:10
+msgid "Carlow"
+msgstr "Carlow"
+
+#: .\contrib\localflavor\ie\ie_counties.py:11
+msgid "Cavan"
+msgstr "Cavan"
+
+#: .\contrib\localflavor\ie\ie_counties.py:12
+msgid "Clare"
+msgstr "Clare"
+
+#: .\contrib\localflavor\ie\ie_counties.py:13
+msgid "Cork"
+msgstr "Cork"
+
+#: .\contrib\localflavor\ie\ie_counties.py:14
+msgid "Derry"
+msgstr "Derry"
+
+#: .\contrib\localflavor\ie\ie_counties.py:15
+msgid "Donegal"
+msgstr "Donegal"
+
+#: .\contrib\localflavor\ie\ie_counties.py:16
+msgid "Down"
+msgstr "Down"
+
+#: .\contrib\localflavor\ie\ie_counties.py:17
+msgid "Dublin"
+msgstr "Dublin"
+
+#: .\contrib\localflavor\ie\ie_counties.py:18
+msgid "Fermanagh"
+msgstr "Fermanagh"
+
+#: .\contrib\localflavor\ie\ie_counties.py:19
+msgid "Galway"
+msgstr "Galway"
+
+#: .\contrib\localflavor\ie\ie_counties.py:20
+msgid "Kerry"
+msgstr "Kerry"
+
+#: .\contrib\localflavor\ie\ie_counties.py:21
+msgid "Kildare"
+msgstr "Kildare"
+
+#: .\contrib\localflavor\ie\ie_counties.py:22
+msgid "Kilkenny"
+msgstr "Kilkenny"
+
+#: .\contrib\localflavor\ie\ie_counties.py:23
+msgid "Laois"
+msgstr "Laois"
+
+#: .\contrib\localflavor\ie\ie_counties.py:24
+msgid "Leitrim"
+msgstr "Leitrim"
+
+#: .\contrib\localflavor\ie\ie_counties.py:25
+msgid "Limerick"
+msgstr "Limerick"
+
+#: .\contrib\localflavor\ie\ie_counties.py:26
+msgid "Longford"
+msgstr "Longford"
+
+#: .\contrib\localflavor\ie\ie_counties.py:27
+msgid "Louth"
+msgstr "Louth"
+
+#: .\contrib\localflavor\ie\ie_counties.py:28
+msgid "Mayo"
+msgstr "Mayo"
+
+#: .\contrib\localflavor\ie\ie_counties.py:29
+msgid "Meath"
+msgstr "Meath"
+
+#: .\contrib\localflavor\ie\ie_counties.py:30
+msgid "Monaghan"
+msgstr "Monaghan"
+
+#: .\contrib\localflavor\ie\ie_counties.py:31
+msgid "Offaly"
+msgstr "Offaly"
+
+#: .\contrib\localflavor\ie\ie_counties.py:32
+msgid "Roscommon"
+msgstr "Roscommon"
+
+#: .\contrib\localflavor\ie\ie_counties.py:33
+msgid "Sligo"
+msgstr "Sligo"
+
+#: .\contrib\localflavor\ie\ie_counties.py:34
+msgid "Tipperary"
+msgstr "Tipperary"
+
+#: .\contrib\localflavor\ie\ie_counties.py:35
+msgid "Tyrone"
+msgstr "Tyrone"
+
+#: .\contrib\localflavor\ie\ie_counties.py:36
+msgid "Waterford"
+msgstr "Waterford"
+
+#: .\contrib\localflavor\ie\ie_counties.py:37
+msgid "Westmeath"
+msgstr "Westmeath"
+
+#: .\contrib\localflavor\ie\ie_counties.py:38
+msgid "Wexford"
+msgstr "Wexford"
+
+#: .\contrib\localflavor\ie\ie_counties.py:39
+msgid "Wicklow"
+msgstr "Wicklow"
+
+#: .\contrib\localflavor\in_\forms.py:15
 msgid "Enter a zip code in the format XXXXXXX."
-msgstr "Introduïu un codi zip en el format XXXXXXX."
+msgstr "Introduïu un codi postal en el format XXXXXXX."
 
-#: contrib/localflavor/is_/forms.py:17
+#: .\contrib\localflavor\is_\forms.py:18
 msgid ""
 "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
 msgstr ""
-"Introduïu un número de identificació d'Islàndia. El format és XXXXXX-XXXX."
+"Introduïu un número vàlid d'identificació d'Islàndia. El format és XXXXXX-"
+"XXXX."
 
-#: contrib/localflavor/is_/forms.py:18
+#: .\contrib\localflavor\is_\forms.py:19
 msgid "The Icelandic identification number is not valid."
-msgstr "El número de identificació d'Islàndia no és vàlid."
+msgstr "El número d'identificació d'Islàndia no és vàlid."
 
-#: contrib/localflavor/it/forms.py:14
+#: .\contrib\localflavor\it\forms.py:15
 msgid "Enter a valid zip code."
 msgstr "Introduïu un codi zip vàlid."
 
-#: contrib/localflavor/it/forms.py:43
+#: .\contrib\localflavor\it\forms.py:44
 msgid "Enter a valid Social Security number."
 msgstr "Introduïu un número valid de la Seguretat Social."
 
-#: contrib/localflavor/it/forms.py:68
+#: .\contrib\localflavor\it\forms.py:69
 msgid "Enter a valid VAT number."
-msgstr "Introduïu un número de IVA (VAT) vàlid."
+msgstr "Introduïu un número d'IVA (VAT) vàlid."
 
-#: contrib/localflavor/jp/forms.py:16
+#: .\contrib\localflavor\jp\forms.py:16
 msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
 msgstr "Introduïu un codi postal en el format XXXXXXX o XX-XXXX."
 
-#: contrib/localflavor/jp/jp_prefectures.py:4
+#: .\contrib\localflavor\jp\jp_prefectures.py:4
 msgid "Hokkaido"
 msgstr "Hokkaido"
 
-#: contrib/localflavor/jp/jp_prefectures.py:5
+#: .\contrib\localflavor\jp\jp_prefectures.py:5
 msgid "Aomori"
 msgstr "Aomori"
 
-#: contrib/localflavor/jp/jp_prefectures.py:6
+#: .\contrib\localflavor\jp\jp_prefectures.py:6
 msgid "Iwate"
 msgstr "Iwate"
 
-#: contrib/localflavor/jp/jp_prefectures.py:7
+#: .\contrib\localflavor\jp\jp_prefectures.py:7
 msgid "Miyagi"
 msgstr "Miyagi"
 
-#: contrib/localflavor/jp/jp_prefectures.py:8
+#: .\contrib\localflavor\jp\jp_prefectures.py:8
 msgid "Akita"
 msgstr "Akita"
 
-#: contrib/localflavor/jp/jp_prefectures.py:9
+#: .\contrib\localflavor\jp\jp_prefectures.py:9
 msgid "Yamagata"
 msgstr "Yamagata"
 
-#: contrib/localflavor/jp/jp_prefectures.py:10
+#: .\contrib\localflavor\jp\jp_prefectures.py:10
 msgid "Fukushima"
 msgstr "Fukushima"
 
-#: contrib/localflavor/jp/jp_prefectures.py:11
+#: .\contrib\localflavor\jp\jp_prefectures.py:11
 msgid "Ibaraki"
 msgstr "Ibaraki"
 
-#: contrib/localflavor/jp/jp_prefectures.py:12
+#: .\contrib\localflavor\jp\jp_prefectures.py:12
 msgid "Tochigi"
 msgstr "Tochigi"
 
-#: contrib/localflavor/jp/jp_prefectures.py:13
+#: .\contrib\localflavor\jp\jp_prefectures.py:13
 msgid "Gunma"
 msgstr "Gunma"
 
-#: contrib/localflavor/jp/jp_prefectures.py:14
+#: .\contrib\localflavor\jp\jp_prefectures.py:14
 msgid "Saitama"
 msgstr "Saitama"
 
-#: contrib/localflavor/jp/jp_prefectures.py:15
+#: .\contrib\localflavor\jp\jp_prefectures.py:15
 msgid "Chiba"
 msgstr "Chiba"
 
-#: contrib/localflavor/jp/jp_prefectures.py:16
+#: .\contrib\localflavor\jp\jp_prefectures.py:16
 msgid "Tokyo"
 msgstr "Tokyo"
 
-#: contrib/localflavor/jp/jp_prefectures.py:17
+#: .\contrib\localflavor\jp\jp_prefectures.py:17
 msgid "Kanagawa"
 msgstr "Kanagawa"
 
-#: contrib/localflavor/jp/jp_prefectures.py:18
+#: .\contrib\localflavor\jp\jp_prefectures.py:18
 msgid "Yamanashi"
 msgstr "Yamanashi"
 
-#: contrib/localflavor/jp/jp_prefectures.py:19
+#: .\contrib\localflavor\jp\jp_prefectures.py:19
 msgid "Nagano"
 msgstr "Nagano"
 
-#: contrib/localflavor/jp/jp_prefectures.py:20
+#: .\contrib\localflavor\jp\jp_prefectures.py:20
 msgid "Niigata"
 msgstr "Niigata"
 
-#: contrib/localflavor/jp/jp_prefectures.py:21
+#: .\contrib\localflavor\jp\jp_prefectures.py:21
 msgid "Toyama"
 msgstr "Toyama"
 
-#: contrib/localflavor/jp/jp_prefectures.py:22
+#: .\contrib\localflavor\jp\jp_prefectures.py:22
 msgid "Ishikawa"
 msgstr "Ishikawa"
 
-#: contrib/localflavor/jp/jp_prefectures.py:23
+#: .\contrib\localflavor\jp\jp_prefectures.py:23
 msgid "Fukui"
 msgstr "Fukui"
 
-#: contrib/localflavor/jp/jp_prefectures.py:24
+#: .\contrib\localflavor\jp\jp_prefectures.py:24
 msgid "Gifu"
 msgstr "Gifu"
 
-#: contrib/localflavor/jp/jp_prefectures.py:25
+#: .\contrib\localflavor\jp\jp_prefectures.py:25
 msgid "Shizuoka"
 msgstr "Shizuoka"
 
-#: contrib/localflavor/jp/jp_prefectures.py:26
+#: .\contrib\localflavor\jp\jp_prefectures.py:26
 msgid "Aichi"
 msgstr "Aichi"
 
-#: contrib/localflavor/jp/jp_prefectures.py:27
+#: .\contrib\localflavor\jp\jp_prefectures.py:27
 msgid "Mie"
 msgstr "Mie"
 
-#: contrib/localflavor/jp/jp_prefectures.py:28
+#: .\contrib\localflavor\jp\jp_prefectures.py:28
 msgid "Shiga"
 msgstr "Shiga"
 
-#: contrib/localflavor/jp/jp_prefectures.py:29
+#: .\contrib\localflavor\jp\jp_prefectures.py:29
 msgid "Kyoto"
 msgstr "Kyoto"
 
-#: contrib/localflavor/jp/jp_prefectures.py:30
+#: .\contrib\localflavor\jp\jp_prefectures.py:30
 msgid "Osaka"
 msgstr "Osaka"
 
-#: contrib/localflavor/jp/jp_prefectures.py:31
+#: .\contrib\localflavor\jp\jp_prefectures.py:31
 msgid "Hyogo"
 msgstr "Hyogo"
 
-#: contrib/localflavor/jp/jp_prefectures.py:32
+#: .\contrib\localflavor\jp\jp_prefectures.py:32
 msgid "Nara"
 msgstr "Nara"
 
-#: contrib/localflavor/jp/jp_prefectures.py:33
+#: .\contrib\localflavor\jp\jp_prefectures.py:33
 msgid "Wakayama"
 msgstr "Wakayama"
 
-#: contrib/localflavor/jp/jp_prefectures.py:34
+#: .\contrib\localflavor\jp\jp_prefectures.py:34
 msgid "Tottori"
 msgstr "Tottori"
 
-#: contrib/localflavor/jp/jp_prefectures.py:35
+#: .\contrib\localflavor\jp\jp_prefectures.py:35
 msgid "Shimane"
 msgstr "Shimane"
 
-#: contrib/localflavor/jp/jp_prefectures.py:36
+#: .\contrib\localflavor\jp\jp_prefectures.py:36
 msgid "Okayama"
 msgstr "Okayama"
 
-#: contrib/localflavor/jp/jp_prefectures.py:37
+#: .\contrib\localflavor\jp\jp_prefectures.py:37
 msgid "Hiroshima"
 msgstr "Hiroshima"
 
-#: contrib/localflavor/jp/jp_prefectures.py:38
+#: .\contrib\localflavor\jp\jp_prefectures.py:38
 msgid "Yamaguchi"
 msgstr "Yamaguchi"
 
-#: contrib/localflavor/jp/jp_prefectures.py:39
+#: .\contrib\localflavor\jp\jp_prefectures.py:39
 msgid "Tokushima"
 msgstr "Tokushima"
 
-#: contrib/localflavor/jp/jp_prefectures.py:40
+#: .\contrib\localflavor\jp\jp_prefectures.py:40
 msgid "Kagawa"
 msgstr "Kagawa"
 
-#: contrib/localflavor/jp/jp_prefectures.py:41
+#: .\contrib\localflavor\jp\jp_prefectures.py:41
 msgid "Ehime"
 msgstr "Ehime"
 
-#: contrib/localflavor/jp/jp_prefectures.py:42
+#: .\contrib\localflavor\jp\jp_prefectures.py:42
 msgid "Kochi"
 msgstr "Kochi"
 
-#: contrib/localflavor/jp/jp_prefectures.py:43
+#: .\contrib\localflavor\jp\jp_prefectures.py:43
 msgid "Fukuoka"
 msgstr "Fukuoka"
 
-#: contrib/localflavor/jp/jp_prefectures.py:44
+#: .\contrib\localflavor\jp\jp_prefectures.py:44
 msgid "Saga"
 msgstr "Saga"
 
-#: contrib/localflavor/jp/jp_prefectures.py:45
+#: .\contrib\localflavor\jp\jp_prefectures.py:45
 msgid "Nagasaki"
 msgstr "Nagasaki"
 
-#: contrib/localflavor/jp/jp_prefectures.py:46
+#: .\contrib\localflavor\jp\jp_prefectures.py:46
 msgid "Kumamoto"
 msgstr "Kumamoto"
 
-#: contrib/localflavor/jp/jp_prefectures.py:47
+#: .\contrib\localflavor\jp\jp_prefectures.py:47
 msgid "Oita"
 msgstr "Oita"
 
-#: contrib/localflavor/jp/jp_prefectures.py:48
+#: .\contrib\localflavor\jp\jp_prefectures.py:48
 msgid "Miyazaki"
 msgstr "Miyazaki"
 
-#: contrib/localflavor/jp/jp_prefectures.py:49
+#: .\contrib\localflavor\jp\jp_prefectures.py:49
 msgid "Kagoshima"
 msgstr "Kagoshima"
 
-#: contrib/localflavor/jp/jp_prefectures.py:50
+#: .\contrib\localflavor\jp\jp_prefectures.py:50
 msgid "Okinawa"
 msgstr "Okinawa"
 
-#: contrib/localflavor/mx/mx_states.py:12
+#: .\contrib\localflavor\kw\forms.py:25
+msgid "Enter a valid Kuwaiti Civil ID number"
+msgstr "Introduïu un número d'Identitat Kuwaitià vàlid"
+
+#: .\contrib\localflavor\mx\mx_states.py:12
 msgid "Aguascalientes"
 msgstr "Aguascalientes"
 
-#: contrib/localflavor/mx/mx_states.py:13
+#: .\contrib\localflavor\mx\mx_states.py:13
 msgid "Baja California"
-msgstr "Baixa California"
+msgstr "Baixa Califòrnia"
 
-#: contrib/localflavor/mx/mx_states.py:14
+#: .\contrib\localflavor\mx\mx_states.py:14
 msgid "Baja California Sur"
-msgstr "Baixa California Sud"
+msgstr "Baixa Califòrnia Sud"
 
-#: contrib/localflavor/mx/mx_states.py:15
+#: .\contrib\localflavor\mx\mx_states.py:15
 msgid "Campeche"
 msgstr "Campeche"
 
-#: contrib/localflavor/mx/mx_states.py:16
+#: .\contrib\localflavor\mx\mx_states.py:16
 msgid "Chihuahua"
 msgstr "Chihuahua"
 
-#: contrib/localflavor/mx/mx_states.py:17
+#: .\contrib\localflavor\mx\mx_states.py:17
 msgid "Chiapas"
 msgstr "Chiapas"
 
-#: contrib/localflavor/mx/mx_states.py:18
+#: .\contrib\localflavor\mx\mx_states.py:18
 msgid "Coahuila"
 msgstr "Coahuila"
 
-#: contrib/localflavor/mx/mx_states.py:19
+#: .\contrib\localflavor\mx\mx_states.py:19
 msgid "Colima"
 msgstr "Colima"
 
-#: contrib/localflavor/mx/mx_states.py:20
+#: .\contrib\localflavor\mx\mx_states.py:20
 msgid "Distrito Federal"
 msgstr "Districte Federal"
 
-#: contrib/localflavor/mx/mx_states.py:21
+#: .\contrib\localflavor\mx\mx_states.py:21
 msgid "Durango"
 msgstr "Durango"
 
-#: contrib/localflavor/mx/mx_states.py:22
+#: .\contrib\localflavor\mx\mx_states.py:22
 msgid "Guerrero"
 msgstr "Guerrero"
 
-#: contrib/localflavor/mx/mx_states.py:23
+#: .\contrib\localflavor\mx\mx_states.py:23
 msgid "Guanajuato"
 msgstr "Guanajuato"
 
-#: contrib/localflavor/mx/mx_states.py:24
+#: .\contrib\localflavor\mx\mx_states.py:24
 msgid "Hidalgo"
 msgstr "Hidalgo"
 
-#: contrib/localflavor/mx/mx_states.py:25
+#: .\contrib\localflavor\mx\mx_states.py:25
 msgid "Jalisco"
 msgstr "Jalisco"
 
-#: contrib/localflavor/mx/mx_states.py:26
+#: .\contrib\localflavor\mx\mx_states.py:26
 msgid "Estado de México"
 msgstr "Estat de Mèxic"
 
-#: contrib/localflavor/mx/mx_states.py:27
+#: .\contrib\localflavor\mx\mx_states.py:27
 msgid "Michoacán"
 msgstr "Michoacán"
 
-#: contrib/localflavor/mx/mx_states.py:28
+#: .\contrib\localflavor\mx\mx_states.py:28
 msgid "Morelos"
 msgstr "Morelos"
 
-#: contrib/localflavor/mx/mx_states.py:29
+#: .\contrib\localflavor\mx\mx_states.py:29
 msgid "Nayarit"
 msgstr "Nayarit"
 
-#: contrib/localflavor/mx/mx_states.py:30
+#: .\contrib\localflavor\mx\mx_states.py:30
 msgid "Nuevo León"
 msgstr "Nuevo León"
 
-#: contrib/localflavor/mx/mx_states.py:31
+#: .\contrib\localflavor\mx\mx_states.py:31
 msgid "Oaxaca"
 msgstr "Oaxaca"
 
-#: contrib/localflavor/mx/mx_states.py:32
+#: .\contrib\localflavor\mx\mx_states.py:32
 msgid "Puebla"
 msgstr "Puebla"
 
-#: contrib/localflavor/mx/mx_states.py:33
+#: .\contrib\localflavor\mx\mx_states.py:33
 msgid "Querétaro"
 msgstr "Querétaro"
 
-#: contrib/localflavor/mx/mx_states.py:34
+#: .\contrib\localflavor\mx\mx_states.py:34
 msgid "Quintana Roo"
 msgstr "Quintana Roo"
 
-#: contrib/localflavor/mx/mx_states.py:35
+#: .\contrib\localflavor\mx\mx_states.py:35
 msgid "Sinaloa"
 msgstr "Sinaloa"
 
-#: contrib/localflavor/mx/mx_states.py:36
+#: .\contrib\localflavor\mx\mx_states.py:36
 msgid "San Luis Potosí"
 msgstr "San Luis Potosí"
 
-#: contrib/localflavor/mx/mx_states.py:37
+#: .\contrib\localflavor\mx\mx_states.py:37
 msgid "Sonora"
 msgstr "Sonora"
 
-#: contrib/localflavor/mx/mx_states.py:38
+#: .\contrib\localflavor\mx\mx_states.py:38
 msgid "Tabasco"
 msgstr "Tabasco"
 
-#: contrib/localflavor/mx/mx_states.py:39
+#: .\contrib\localflavor\mx\mx_states.py:39
 msgid "Tamaulipas"
 msgstr "Tamaulipas"
 
-#: contrib/localflavor/mx/mx_states.py:40
+#: .\contrib\localflavor\mx\mx_states.py:40
 msgid "Tlaxcala"
 msgstr "Tlaxcala"
 
-#: contrib/localflavor/mx/mx_states.py:41
+#: .\contrib\localflavor\mx\mx_states.py:41
 msgid "Veracruz"
 msgstr "Veracruz"
 
-#: contrib/localflavor/mx/mx_states.py:42
+#: .\contrib\localflavor\mx\mx_states.py:42
 msgid "Yucatán"
 msgstr "Yucatán"
 
-#: contrib/localflavor/mx/mx_states.py:43
+#: .\contrib\localflavor\mx\mx_states.py:43
 msgid "Zacatecas"
 msgstr "Zacatecas"
 
-#: contrib/localflavor/nl/forms.py:21
+#: .\contrib\localflavor\nl\forms.py:22
 msgid "Enter a valid postal code"
 msgstr "Introduïu un codi postal vàlid."
 
-#: contrib/localflavor/nl/forms.py:52
-msgid "Enter a valid phone number"
-msgstr "Introduïu un número de telèfon vàlid."
-
-#: contrib/localflavor/nl/forms.py:78
+#: .\contrib\localflavor\nl\forms.py:79
 msgid "Enter a valid SoFi number"
 msgstr "Introduïu un número SoFi vàlid."
 
-#: contrib/localflavor/nl/nl_provinces.py:4
+#: .\contrib\localflavor\nl\nl_provinces.py:4
 msgid "Drenthe"
 msgstr "Drenthe"
 
-#: contrib/localflavor/nl/nl_provinces.py:5
+#: .\contrib\localflavor\nl\nl_provinces.py:5
 msgid "Flevoland"
 msgstr "Flevoland"
 
-#: contrib/localflavor/nl/nl_provinces.py:6
+#: .\contrib\localflavor\nl\nl_provinces.py:6
 msgid "Friesland"
 msgstr "Friesland"
 
-#: contrib/localflavor/nl/nl_provinces.py:7
+#: .\contrib\localflavor\nl\nl_provinces.py:7
 msgid "Gelderland"
 msgstr "Gelderland"
 
-#: contrib/localflavor/nl/nl_provinces.py:8
+#: .\contrib\localflavor\nl\nl_provinces.py:8
 msgid "Groningen"
 msgstr "Groningen"
 
-#: contrib/localflavor/nl/nl_provinces.py:9
+#: .\contrib\localflavor\nl\nl_provinces.py:9
 msgid "Limburg"
 msgstr "Limburg"
 
-#: contrib/localflavor/nl/nl_provinces.py:10
+#: .\contrib\localflavor\nl\nl_provinces.py:10
 msgid "Noord-Brabant"
 msgstr "Noord-Brabant"
 
-#: contrib/localflavor/nl/nl_provinces.py:11
+#: .\contrib\localflavor\nl\nl_provinces.py:11
 msgid "Noord-Holland"
 msgstr "Noord-Holland"
 
-#: contrib/localflavor/nl/nl_provinces.py:12
+#: .\contrib\localflavor\nl\nl_provinces.py:12
 msgid "Overijssel"
 msgstr "Overijssel"
 
-#: contrib/localflavor/nl/nl_provinces.py:13
+#: .\contrib\localflavor\nl\nl_provinces.py:13
 msgid "Utrecht"
 msgstr "Utrecht"
 
-#: contrib/localflavor/nl/nl_provinces.py:14
+#: .\contrib\localflavor\nl\nl_provinces.py:14
 msgid "Zeeland"
 msgstr "Zeeland"
 
-#: contrib/localflavor/nl/nl_provinces.py:15
+#: .\contrib\localflavor\nl\nl_provinces.py:15
 msgid "Zuid-Holland"
 msgstr "Zuid-Holland"
 
-#: contrib/localflavor/no/forms.py:33
+#: .\contrib\localflavor\no\forms.py:34
 msgid "Enter a valid Norwegian social security number."
 msgstr "Introduïu un número de la seguretat social Noruega vàlid."
 
-#: contrib/localflavor/pe/forms.py:24
+#: .\contrib\localflavor\pe\forms.py:25
 msgid "This field requires 8 digits."
 msgstr "Aquest camp precisa 8 dígits."
 
-#: contrib/localflavor/pe/forms.py:52
+#: .\contrib\localflavor\pe\forms.py:53
 msgid "This field requires 11 digits."
 msgstr "Aquest camp precisa 11 dígits."
 
-#: contrib/localflavor/pl/forms.py:38
+#: .\contrib\localflavor\pl\forms.py:38
 msgid "National Identification Number consists of 11 digits."
 msgstr "El número d'identidicació nacional està compost de 11 digits."
 
-#: contrib/localflavor/pl/forms.py:39
+#: .\contrib\localflavor\pl\forms.py:39
 msgid "Wrong checksum for the National Identification Number."
-msgstr "Validació invàlida del número d'identificació nacional."
+msgstr "Verificació del número d'identificació nacional invàlida."
 
-#: contrib/localflavor/pl/forms.py:71
+#: .\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."
 msgstr "Introduïu un número NIP en el format XXX-XXX-XX-XX o XX-XX-XXX-XXX."
 
-#: contrib/localflavor/pl/forms.py:72
+#: .\contrib\localflavor\pl\forms.py:72
 msgid "Wrong checksum for the Tax Number (NIP)."
-msgstr "Validació invàlida del número tributari (NIP)."
+msgstr "Verificació del número tributari (NIP) invàlida."
 
-#: contrib/localflavor/pl/forms.py:109
+#: .\contrib\localflavor\pl\forms.py:109
 msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
 msgstr ""
-"El número nacional de registre de negocis (REGON) consisteix en 9 o 14 "
+"El número nacional de registre de negocis (REGON) està compost de 9 o 14 "
 "dígits."
 
-#: contrib/localflavor/pl/forms.py:110
+#: .\contrib\localflavor\pl\forms.py:110
 msgid "Wrong checksum for the National Business Register Number (REGON)."
-msgstr "Validació invàlida del número nacional de registre de negocis."
+msgstr "Verificació del número nacional de registre de negocis invàlida."
 
-#: contrib/localflavor/pl/forms.py:148
+#: .\contrib\localflavor\pl\forms.py:148
 msgid "Enter a postal code in the format XX-XXX."
 msgstr "Introduïu un codi postal en el format XX-XXX."
 
-#: contrib/localflavor/pl/pl_voivodeships.py:8
+#: .\contrib\localflavor\pl\pl_voivodeships.py:8
 msgid "Lower Silesia"
-msgstr "Lower Silesia"
+msgstr "Baixa Silèsia"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:9
+#: .\contrib\localflavor\pl\pl_voivodeships.py:9
 msgid "Kuyavia-Pomerania"
 msgstr "Kuyavia-Pomerania"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:10
+#: .\contrib\localflavor\pl\pl_voivodeships.py:10
 msgid "Lublin"
 msgstr "Lublin"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:11
+#: .\contrib\localflavor\pl\pl_voivodeships.py:11
 msgid "Lubusz"
 msgstr "Lubusz"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:12
+#: .\contrib\localflavor\pl\pl_voivodeships.py:12
 msgid "Lodz"
 msgstr "Lodz"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:13
+#: .\contrib\localflavor\pl\pl_voivodeships.py:13
 msgid "Lesser Poland"
-msgstr "Lesser Poland"
+msgstr "Polònia Menor"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:14
+#: .\contrib\localflavor\pl\pl_voivodeships.py:14
 msgid "Masovia"
 msgstr "Masovia"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:15
+#: .\contrib\localflavor\pl\pl_voivodeships.py:15
 msgid "Opole"
 msgstr "Opole"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:16
+#: .\contrib\localflavor\pl\pl_voivodeships.py:16
 msgid "Subcarpatia"
 msgstr "Subcarpatia"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:17
+#: .\contrib\localflavor\pl\pl_voivodeships.py:17
 msgid "Podlasie"
 msgstr "Podlasie"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:18
+#: .\contrib\localflavor\pl\pl_voivodeships.py:18
 msgid "Pomerania"
-msgstr "Pomerania"
+msgstr "Pomerània"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:19
+#: .\contrib\localflavor\pl\pl_voivodeships.py:19
 msgid "Silesia"
-msgstr "Silesia"
+msgstr "Silèsia"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:20
+#: .\contrib\localflavor\pl\pl_voivodeships.py:20
 msgid "Swietokrzyskie"
 msgstr "Swietokrzyskie"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:21
+#: .\contrib\localflavor\pl\pl_voivodeships.py:21
 msgid "Warmia-Masuria"
 msgstr "Warmia-Masuria"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:22
+#: .\contrib\localflavor\pl\pl_voivodeships.py:22
 msgid "Greater Poland"
-msgstr "Greater Poland"
+msgstr "Polònia Major"
 
-#: contrib/localflavor/pl/pl_voivodeships.py:23
+#: .\contrib\localflavor\pl\pl_voivodeships.py:23
 msgid "West Pomerania"
-msgstr "West Pomerania"
+msgstr "Pomerània Oest"
 
-#: contrib/localflavor/ro/forms.py:19
+#: .\contrib\localflavor\pt\forms.py:17
+msgid "Enter a zip code in the format XXXX-XXX."
+msgstr "Introduïu un codi postal en el format XXXX-XXX."
+
+#: .\contrib\localflavor\pt\forms.py:37
+msgid "Phone numbers must have 9 digits, or start by + or 00."
+msgstr "Els números de telèfon han de tenir 9 dígits, o començar per "
+"+ o 00."
+
+#: .\contrib\localflavor\ro\forms.py:19
 msgid "Enter a valid CIF."
 msgstr "Introduïu un CIF vàlid."
 
-#: contrib/localflavor/ro/forms.py:56
+#: .\contrib\localflavor\ro\forms.py:56
 msgid "Enter a valid CNP."
 msgstr "Introduïu un CNP vàlid."
 
-#: contrib/localflavor/ro/forms.py:141
+#: .\contrib\localflavor\ro\forms.py:141
 msgid "Enter a valid IBAN in ROXX-XXXX-XXXX-XXXX-XXXX-XXXX format"
 msgstr "Introduïu un IBAN vàlid en el format ROXX-XXXX-XXXX-XXXX-XXXX-XXXX."
 
-#: contrib/localflavor/ro/forms.py:171
+#: .\contrib\localflavor\ro\forms.py:171
 msgid "Phone numbers must be in XXXX-XXXXXX format."
-msgstr "El número de telèfon ha de estar en el format XXXX-XXXXXX."
+msgstr "El número de telèfon ha d'estar en el format XXXX-XXXXXX."
 
-#: contrib/localflavor/ro/forms.py:194
+#: .\contrib\localflavor\ro\forms.py:194
 msgid "Enter a valid postal code in the format XXXXXX"
 msgstr "Introduïu un codi postal vàlid en el format XXXXXX."
 
-#: contrib/localflavor/sk/sk_districts.py:8
+#: .\contrib\localflavor\se\forms.py:50
+msgid "Enter a valid Swedish organisation number."
+msgstr "Introduïu un número d'organització Sueca vàlid."
+
+#: .\contrib\localflavor\se\forms.py:107
+msgid "Enter a valid Swedish personal identity number."
+msgstr "Introduïu un número d'identitat personal suec vàlid."
+
+#: .\contrib\localflavor\se\forms.py:108
+msgid "Co-ordination numbers are not allowed."
+msgstr "No es permeten números de coordinació."
+
+#: .\contrib\localflavor\se\forms.py:150
+msgid "Enter a Swedish postal code in the format XXXXX."
+msgstr "Introduïu un codi postal suec en el format XXXXX."
+
+#: .\contrib\localflavor\se\se_counties.py:15
+msgid "Stockholm"
+msgstr "Estocolm"
+
+#: .\contrib\localflavor\se\se_counties.py:16
+msgid "Västerbotten"
+msgstr "Västerbotten"
+
+#: .\contrib\localflavor\se\se_counties.py:17
+msgid "Norrbotten"
+msgstr "Norrbotten"
+
+#: .\contrib\localflavor\se\se_counties.py:18
+msgid "Uppsala"
+msgstr "Uppsala"
+
+#: .\contrib\localflavor\se\se_counties.py:19
+msgid "Södermanland"
+msgstr "Södermanland"
+
+#: .\contrib\localflavor\se\se_counties.py:20
+msgid "Östergötland"
+msgstr "Östergötland"
+
+#: .\contrib\localflavor\se\se_counties.py:21
+msgid "Jönköping"
+msgstr "Jönköping"
+
+#: .\contrib\localflavor\se\se_counties.py:22
+msgid "Kronoberg"
+msgstr "Kronoberg"
+
+#: .\contrib\localflavor\se\se_counties.py:23
+msgid "Kalmar"
+msgstr "Kalmar"
+
+#: .\contrib\localflavor\se\se_counties.py:24
+msgid "Gotland"
+msgstr "Gotland"
+
+#: .\contrib\localflavor\se\se_counties.py:25
+msgid "Blekinge"
+msgstr "Blekinge"
+
+#: .\contrib\localflavor\se\se_counties.py:26
+msgid "Skåne"
+msgstr "Skåne"
+
+#: .\contrib\localflavor\se\se_counties.py:27
+msgid "Halland"
+msgstr "Halland"
+
+#: .\contrib\localflavor\se\se_counties.py:28
+msgid "Västra Götaland"
+msgstr "Västra Götaland"
+
+#: .\contrib\localflavor\se\se_counties.py:29
+msgid "Värmland"
+msgstr "Värmland"
+
+#: .\contrib\localflavor\se\se_counties.py:30
+msgid "Örebro"
+msgstr "Örebro"
+
+#: .\contrib\localflavor\se\se_counties.py:31
+msgid "Västmanland"
+msgstr "Västmanland"
+
+#: .\contrib\localflavor\se\se_counties.py:32
+msgid "Dalarna"
+msgstr "Dalarna"
+
+#: .\contrib\localflavor\se\se_counties.py:33
+msgid "Gävleborg"
+msgstr "Gävleborg"
+
+#: .\contrib\localflavor\se\se_counties.py:34
+msgid "Västernorrland"
+msgstr "Västernorrland"
+
+#: .\contrib\localflavor\se\se_counties.py:35
+msgid "Jämtland"
+msgstr "Jämtland"
+
+#: .\contrib\localflavor\sk\sk_districts.py:8
 msgid "Banska Bystrica"
 msgstr "Banska Bystrica"
 
-#: contrib/localflavor/sk/sk_districts.py:9
+#: .\contrib\localflavor\sk\sk_districts.py:9
 msgid "Banska Stiavnica"
 msgstr "Banska Stiavnica"
 
-#: contrib/localflavor/sk/sk_districts.py:10
+#: .\contrib\localflavor\sk\sk_districts.py:10
 msgid "Bardejov"
 msgstr "Bardejov"
 
-#: contrib/localflavor/sk/sk_districts.py:11
+#: .\contrib\localflavor\sk\sk_districts.py:11
 msgid "Banovce nad Bebravou"
 msgstr "Banovce nad Bebravou"
 
-#: contrib/localflavor/sk/sk_districts.py:12
+#: .\contrib\localflavor\sk\sk_districts.py:12
 msgid "Brezno"
 msgstr "Brezno"
 
-#: contrib/localflavor/sk/sk_districts.py:13
+#: .\contrib\localflavor\sk\sk_districts.py:13
 msgid "Bratislava I"
 msgstr "Bratislava I"
 
-#: contrib/localflavor/sk/sk_districts.py:14
+#: .\contrib\localflavor\sk\sk_districts.py:14
 msgid "Bratislava II"
 msgstr "Bratislava II"
 
-#: contrib/localflavor/sk/sk_districts.py:15
+#: .\contrib\localflavor\sk\sk_districts.py:15
 msgid "Bratislava III"
 msgstr "Bratislava III"
 
-#: contrib/localflavor/sk/sk_districts.py:16
+#: .\contrib\localflavor\sk\sk_districts.py:16
 msgid "Bratislava IV"
 msgstr "Bratislava IV"
 
-#: contrib/localflavor/sk/sk_districts.py:17
+#: .\contrib\localflavor\sk\sk_districts.py:17
 msgid "Bratislava V"
 msgstr "Bratislava V"
 
-#: contrib/localflavor/sk/sk_districts.py:18
+#: .\contrib\localflavor\sk\sk_districts.py:18
 msgid "Bytca"
 msgstr "Bytca"
 
-#: contrib/localflavor/sk/sk_districts.py:19
+#: .\contrib\localflavor\sk\sk_districts.py:19
 msgid "Cadca"
 msgstr "Cadca"
 
-#: contrib/localflavor/sk/sk_districts.py:20
+#: .\contrib\localflavor\sk\sk_districts.py:20
 msgid "Detva"
 msgstr "Detva"
 
-#: contrib/localflavor/sk/sk_districts.py:21
+#: .\contrib\localflavor\sk\sk_districts.py:21
 msgid "Dolny Kubin"
 msgstr "Dolny Kubin"
 
-#: contrib/localflavor/sk/sk_districts.py:22
+#: .\contrib\localflavor\sk\sk_districts.py:22
 msgid "Dunajska Streda"
 msgstr "Dunajska Streda"
 
-#: contrib/localflavor/sk/sk_districts.py:23
+#: .\contrib\localflavor\sk\sk_districts.py:23
 msgid "Galanta"
 msgstr "Galanta"
 
-#: contrib/localflavor/sk/sk_districts.py:24
+#: .\contrib\localflavor\sk\sk_districts.py:24
 msgid "Gelnica"
 msgstr "Gelnica"
 
-#: contrib/localflavor/sk/sk_districts.py:25
+#: .\contrib\localflavor\sk\sk_districts.py:25
 msgid "Hlohovec"
 msgstr "Hlohovec"
 
-#: contrib/localflavor/sk/sk_districts.py:26
+#: .\contrib\localflavor\sk\sk_districts.py:26
 msgid "Humenne"
 msgstr "Humenne"
 
-#: contrib/localflavor/sk/sk_districts.py:27
+#: .\contrib\localflavor\sk\sk_districts.py:27
 msgid "Ilava"
 msgstr "Ilava"
 
-#: contrib/localflavor/sk/sk_districts.py:28
+#: .\contrib\localflavor\sk\sk_districts.py:28
 msgid "Kezmarok"
 msgstr "Kezmarok"
 
-#: contrib/localflavor/sk/sk_districts.py:29
+#: .\contrib\localflavor\sk\sk_districts.py:29
 msgid "Komarno"
 msgstr "Komarno"
 
-#: contrib/localflavor/sk/sk_districts.py:30
+#: .\contrib\localflavor\sk\sk_districts.py:30
 msgid "Kosice I"
 msgstr "Kosice I"
 
-#: contrib/localflavor/sk/sk_districts.py:31
+#: .\contrib\localflavor\sk\sk_districts.py:31
 msgid "Kosice II"
 msgstr "Kosice II"
 
-#: contrib/localflavor/sk/sk_districts.py:32
+#: .\contrib\localflavor\sk\sk_districts.py:32
 msgid "Kosice III"
 msgstr "Kosice III"
 
-#: contrib/localflavor/sk/sk_districts.py:33
+#: .\contrib\localflavor\sk\sk_districts.py:33
 msgid "Kosice IV"
 msgstr "Kosice IV"
 
-#: contrib/localflavor/sk/sk_districts.py:34
+#: .\contrib\localflavor\sk\sk_districts.py:34
 msgid "Kosice - okolie"
 msgstr "Kosice - okolie"
 
-#: contrib/localflavor/sk/sk_districts.py:35
+#: .\contrib\localflavor\sk\sk_districts.py:35
 msgid "Krupina"
 msgstr "Krupina"
 
-#: contrib/localflavor/sk/sk_districts.py:36
+#: .\contrib\localflavor\sk\sk_districts.py:36
 msgid "Kysucke Nove Mesto"
 msgstr "Kysucke Nove Mesto"
 
-#: contrib/localflavor/sk/sk_districts.py:37
+#: .\contrib\localflavor\sk\sk_districts.py:37
 msgid "Levice"
 msgstr "Levice"
 
-#: contrib/localflavor/sk/sk_districts.py:38
+#: .\contrib\localflavor\sk\sk_districts.py:38
 msgid "Levoca"
 msgstr "Levoca"
 
-#: contrib/localflavor/sk/sk_districts.py:39
+#: .\contrib\localflavor\sk\sk_districts.py:39
 msgid "Liptovsky Mikulas"
 msgstr "Liptovsky Mikulas"
 
-#: contrib/localflavor/sk/sk_districts.py:40
+#: .\contrib\localflavor\sk\sk_districts.py:40
 msgid "Lucenec"
 msgstr "Lucenec"
 
-#: contrib/localflavor/sk/sk_districts.py:41
+#: .\contrib\localflavor\sk\sk_districts.py:41
 msgid "Malacky"
 msgstr "Malacky"
 
-#: contrib/localflavor/sk/sk_districts.py:42
+#: .\contrib\localflavor\sk\sk_districts.py:42
 msgid "Martin"
 msgstr "Martin"
 
-#: contrib/localflavor/sk/sk_districts.py:43
+#: .\contrib\localflavor\sk\sk_districts.py:43
 msgid "Medzilaborce"
 msgstr "Medzilaborce"
 
-#: contrib/localflavor/sk/sk_districts.py:44
+#: .\contrib\localflavor\sk\sk_districts.py:44
 msgid "Michalovce"
 msgstr "Michalovce"
 
-#: contrib/localflavor/sk/sk_districts.py:45
+#: .\contrib\localflavor\sk\sk_districts.py:45
 msgid "Myjava"
 msgstr "Myjava"
 
-#: contrib/localflavor/sk/sk_districts.py:46
+#: .\contrib\localflavor\sk\sk_districts.py:46
 msgid "Namestovo"
 msgstr "Namestovo"
 
-#: contrib/localflavor/sk/sk_districts.py:47
+#: .\contrib\localflavor\sk\sk_districts.py:47
 msgid "Nitra"
 msgstr "Nitra"
 
-#: contrib/localflavor/sk/sk_districts.py:48
+#: .\contrib\localflavor\sk\sk_districts.py:48
 msgid "Nove Mesto nad Vahom"
 msgstr "Nove Mesto nad Vahom"
 
-#: contrib/localflavor/sk/sk_districts.py:49
+#: .\contrib\localflavor\sk\sk_districts.py:49
 msgid "Nove Zamky"
 msgstr "Nove Zamky"
 
-#: contrib/localflavor/sk/sk_districts.py:50
+#: .\contrib\localflavor\sk\sk_districts.py:50
 msgid "Partizanske"
 msgstr "Partizanske"
 
-#: contrib/localflavor/sk/sk_districts.py:51
+#: .\contrib\localflavor\sk\sk_districts.py:51
 msgid "Pezinok"
 msgstr "Pezinok"
 
-#: contrib/localflavor/sk/sk_districts.py:52
+#: .\contrib\localflavor\sk\sk_districts.py:52
 msgid "Piestany"
 msgstr "Piestany"
 
-#: contrib/localflavor/sk/sk_districts.py:53
+#: .\contrib\localflavor\sk\sk_districts.py:53
 msgid "Poltar"
 msgstr "Poltar"
 
-#: contrib/localflavor/sk/sk_districts.py:54
+#: .\contrib\localflavor\sk\sk_districts.py:54
 msgid "Poprad"
 msgstr "Poprad"
 
-#: contrib/localflavor/sk/sk_districts.py:55
+#: .\contrib\localflavor\sk\sk_districts.py:55
 msgid "Povazska Bystrica"
 msgstr "Povazska Bystrica"
 
-#: contrib/localflavor/sk/sk_districts.py:56
+#: .\contrib\localflavor\sk\sk_districts.py:56
 msgid "Presov"
 msgstr "Presov"
 
-#: contrib/localflavor/sk/sk_districts.py:57
+#: .\contrib\localflavor\sk\sk_districts.py:57
 msgid "Prievidza"
 msgstr "Prievidza"
 
-#: contrib/localflavor/sk/sk_districts.py:58
+#: .\contrib\localflavor\sk\sk_districts.py:58
 msgid "Puchov"
 msgstr "Puchov"
 
-#: contrib/localflavor/sk/sk_districts.py:59
+#: .\contrib\localflavor\sk\sk_districts.py:59
 msgid "Revuca"
 msgstr "Revuca"
 
-#: contrib/localflavor/sk/sk_districts.py:60
+#: .\contrib\localflavor\sk\sk_districts.py:60
 msgid "Rimavska Sobota"
 msgstr "Rimavska Sobota"
 
-#: contrib/localflavor/sk/sk_districts.py:61
+#: .\contrib\localflavor\sk\sk_districts.py:61
 msgid "Roznava"
 msgstr "Roznava"
 
-#: contrib/localflavor/sk/sk_districts.py:62
+#: .\contrib\localflavor\sk\sk_districts.py:62
 msgid "Ruzomberok"
 msgstr "Ruzomberok"
 
-#: contrib/localflavor/sk/sk_districts.py:63
+#: .\contrib\localflavor\sk\sk_districts.py:63
 msgid "Sabinov"
 msgstr "Sabinov"
 
-#: contrib/localflavor/sk/sk_districts.py:64
+#: .\contrib\localflavor\sk\sk_districts.py:64
 msgid "Senec"
 msgstr "Senec"
 
-#: contrib/localflavor/sk/sk_districts.py:65
+#: .\contrib\localflavor\sk\sk_districts.py:65
 msgid "Senica"
 msgstr "Senica"
 
-#: contrib/localflavor/sk/sk_districts.py:66
+#: .\contrib\localflavor\sk\sk_districts.py:66
 msgid "Skalica"
 msgstr "Skalica"
 
-#: contrib/localflavor/sk/sk_districts.py:67
+#: .\contrib\localflavor\sk\sk_districts.py:67
 msgid "Snina"
 msgstr "Snina"
 
-#: contrib/localflavor/sk/sk_districts.py:68
+#: .\contrib\localflavor\sk\sk_districts.py:68
 msgid "Sobrance"
 msgstr "Sobrance"
 
-#: contrib/localflavor/sk/sk_districts.py:69
+#: .\contrib\localflavor\sk\sk_districts.py:69
 msgid "Spisska Nova Ves"
 msgstr "Spisska Nova Ves"
 
-#: contrib/localflavor/sk/sk_districts.py:70
+#: .\contrib\localflavor\sk\sk_districts.py:70
 msgid "Stara Lubovna"
 msgstr "Stara Lubovna"
 
-#: contrib/localflavor/sk/sk_districts.py:71
+#: .\contrib\localflavor\sk\sk_districts.py:71
 msgid "Stropkov"
 msgstr "Stropkov"
 
-#: contrib/localflavor/sk/sk_districts.py:72
+#: .\contrib\localflavor\sk\sk_districts.py:72
 msgid "Svidnik"
 msgstr "Svidnik"
 
-#: contrib/localflavor/sk/sk_districts.py:73
+#: .\contrib\localflavor\sk\sk_districts.py:73
 msgid "Sala"
 msgstr "Sala"
 
-#: contrib/localflavor/sk/sk_districts.py:74
+#: .\contrib\localflavor\sk\sk_districts.py:74
 msgid "Topolcany"
 msgstr "Topolcany"
 
-#: contrib/localflavor/sk/sk_districts.py:75
+#: .\contrib\localflavor\sk\sk_districts.py:75
 msgid "Trebisov"
 msgstr "Trebisov"
 
-#: contrib/localflavor/sk/sk_districts.py:76
+#: .\contrib\localflavor\sk\sk_districts.py:76
 msgid "Trencin"
 msgstr "Trencin"
 
-#: contrib/localflavor/sk/sk_districts.py:77
+#: .\contrib\localflavor\sk\sk_districts.py:77
 msgid "Trnava"
 msgstr "Trnava"
 
-#: contrib/localflavor/sk/sk_districts.py:78
+#: .\contrib\localflavor\sk\sk_districts.py:78
 msgid "Turcianske Teplice"
 msgstr "Turcianske Teplice"
 
-#: contrib/localflavor/sk/sk_districts.py:79
+#: .\contrib\localflavor\sk\sk_districts.py:79
 msgid "Tvrdosin"
 msgstr "Tvrdosin"
 
-#: contrib/localflavor/sk/sk_districts.py:80
+#: .\contrib\localflavor\sk\sk_districts.py:80
 msgid "Velky Krtis"
 msgstr "Velky Krtis"
 
-#: contrib/localflavor/sk/sk_districts.py:81
+#: .\contrib\localflavor\sk\sk_districts.py:81
 msgid "Vranov nad Toplou"
 msgstr "Vranov nad Toplou"
 
-#: contrib/localflavor/sk/sk_districts.py:82
+#: .\contrib\localflavor\sk\sk_districts.py:82
 msgid "Zlate Moravce"
 msgstr "Zlate Moravce"
 
-#: contrib/localflavor/sk/sk_districts.py:83
+#: .\contrib\localflavor\sk\sk_districts.py:83
 msgid "Zvolen"
 msgstr "Zvolen"
 
-#: contrib/localflavor/sk/sk_districts.py:84
+#: .\contrib\localflavor\sk\sk_districts.py:84
 msgid "Zarnovica"
 msgstr "Zarnovica"
 
-#: contrib/localflavor/sk/sk_districts.py:85
+#: .\contrib\localflavor\sk\sk_districts.py:85
 msgid "Ziar nad Hronom"
 msgstr "Ziar nad Hronom"
 
-#: contrib/localflavor/sk/sk_districts.py:86
+#: .\contrib\localflavor\sk\sk_districts.py:86
 msgid "Zilina"
 msgstr "Zilina"
 
-#: contrib/localflavor/sk/sk_regions.py:8
+#: .\contrib\localflavor\sk\sk_regions.py:8
 msgid "Banska Bystrica region"
 msgstr "Regió de Banska Bystrica"
 
-#: contrib/localflavor/sk/sk_regions.py:9
+#: .\contrib\localflavor\sk\sk_regions.py:9
 msgid "Bratislava region"
 msgstr "Regió de Bratislava"
 
-#: contrib/localflavor/sk/sk_regions.py:10
+#: .\contrib\localflavor\sk\sk_regions.py:10
 msgid "Kosice region"
 msgstr "Regió de Kosice"
 
-#: contrib/localflavor/sk/sk_regions.py:11
+#: .\contrib\localflavor\sk\sk_regions.py:11
 msgid "Nitra region"
 msgstr "Regió de Nitra"
 
-#: contrib/localflavor/sk/sk_regions.py:12
+#: .\contrib\localflavor\sk\sk_regions.py:12
 msgid "Presov region"
 msgstr "Regió de Presov"
 
-#: contrib/localflavor/sk/sk_regions.py:13
+#: .\contrib\localflavor\sk\sk_regions.py:13
 msgid "Trencin region"
 msgstr "Regió de Trencin"
 
-#: contrib/localflavor/sk/sk_regions.py:14
+#: .\contrib\localflavor\sk\sk_regions.py:14
 msgid "Trnava region"
 msgstr "Regió de Trnava"
 
-#: contrib/localflavor/sk/sk_regions.py:15
+#: .\contrib\localflavor\sk\sk_regions.py:15
 msgid "Zilina region"
 msgstr "Regió de Zilina"
 
-#: contrib/localflavor/uk/forms.py:21
+#: .\contrib\localflavor\uk\forms.py:21
 msgid "Enter a valid postcode."
-msgstr "Introdueix un codi postal vàlid."
+msgstr "Introduïu un codi postal vàlid."
 
-#: contrib/localflavor/uk/uk_regions.py:11
+#: .\contrib\localflavor\uk\uk_regions.py:11
 msgid "Bedfordshire"
 msgstr "Bedfordshire"
 
-#: contrib/localflavor/uk/uk_regions.py:12
+#: .\contrib\localflavor\uk\uk_regions.py:12
 msgid "Buckinghamshire"
 msgstr "Buckinghamshire"
 
-#: contrib/localflavor/uk/uk_regions.py:14
+#: .\contrib\localflavor\uk\uk_regions.py:14
 msgid "Cheshire"
 msgstr "Cheshire"
 
-#: contrib/localflavor/uk/uk_regions.py:15
+#: .\contrib\localflavor\uk\uk_regions.py:15
 msgid "Cornwall and Isles of Scilly"
 msgstr "Cornwall and Isles of Scilly"
 
-#: contrib/localflavor/uk/uk_regions.py:16
+#: .\contrib\localflavor\uk\uk_regions.py:16
 msgid "Cumbria"
 msgstr "Cumbria"
 
-#: contrib/localflavor/uk/uk_regions.py:17
+#: .\contrib\localflavor\uk\uk_regions.py:17
 msgid "Derbyshire"
 msgstr "Derbyshire"
 
-#: contrib/localflavor/uk/uk_regions.py:18
+#: .\contrib\localflavor\uk\uk_regions.py:18
 msgid "Devon"
 msgstr "Devon"
 
-#: contrib/localflavor/uk/uk_regions.py:19
+#: .\contrib\localflavor\uk\uk_regions.py:19
 msgid "Dorset"
 msgstr "Dorset"
 
-#: contrib/localflavor/uk/uk_regions.py:20
+#: .\contrib\localflavor\uk\uk_regions.py:20
 msgid "Durham"
 msgstr "Durham"
 
-#: contrib/localflavor/uk/uk_regions.py:21
+#: .\contrib\localflavor\uk\uk_regions.py:21
 msgid "East Sussex"
 msgstr "East Sussex"
 
-#: contrib/localflavor/uk/uk_regions.py:22
+#: .\contrib\localflavor\uk\uk_regions.py:22
 msgid "Essex"
 msgstr "Essex"
 
-#: contrib/localflavor/uk/uk_regions.py:23
+#: .\contrib\localflavor\uk\uk_regions.py:23
 msgid "Gloucestershire"
 msgstr "Gloucestershire"
 
-#: contrib/localflavor/uk/uk_regions.py:24
+#: .\contrib\localflavor\uk\uk_regions.py:24
 msgid "Greater London"
 msgstr "Greater London"
 
-#: contrib/localflavor/uk/uk_regions.py:25
+#: .\contrib\localflavor\uk\uk_regions.py:25
 msgid "Greater Manchester"
 msgstr "Greater Manchester"
 
-#: contrib/localflavor/uk/uk_regions.py:26
+#: .\contrib\localflavor\uk\uk_regions.py:26
 msgid "Hampshire"
 msgstr "Hampshire"
 
-#: contrib/localflavor/uk/uk_regions.py:27
+#: .\contrib\localflavor\uk\uk_regions.py:27
 msgid "Hertfordshire"
 msgstr "Hertfordshire"
 
-#: contrib/localflavor/uk/uk_regions.py:28
+#: .\contrib\localflavor\uk\uk_regions.py:28
 msgid "Kent"
 msgstr "Kent"
 
-#: contrib/localflavor/uk/uk_regions.py:29
+#: .\contrib\localflavor\uk\uk_regions.py:29
 msgid "Lancashire"
 msgstr "Lancashire"
 
-#: contrib/localflavor/uk/uk_regions.py:30
+#: .\contrib\localflavor\uk\uk_regions.py:30
 msgid "Leicestershire"
 msgstr "Leicestershire"
 
-#: contrib/localflavor/uk/uk_regions.py:31
+#: .\contrib\localflavor\uk\uk_regions.py:31
 msgid "Lincolnshire"
 msgstr "Lincolnshire"
 
-#: contrib/localflavor/uk/uk_regions.py:32
+#: .\contrib\localflavor\uk\uk_regions.py:32
 msgid "Merseyside"
 msgstr "Merseyside"
 
-#: contrib/localflavor/uk/uk_regions.py:33
+#: .\contrib\localflavor\uk\uk_regions.py:33
 msgid "Norfolk"
 msgstr "Norfolk"
 
-#: contrib/localflavor/uk/uk_regions.py:34
+#: .\contrib\localflavor\uk\uk_regions.py:34
 msgid "North Yorkshire"
 msgstr "North Yorkshire"
 
-#: contrib/localflavor/uk/uk_regions.py:35
+#: .\contrib\localflavor\uk\uk_regions.py:35
 msgid "Northamptonshire"
 msgstr "Northamptonshire"
 
-#: contrib/localflavor/uk/uk_regions.py:36
+#: .\contrib\localflavor\uk\uk_regions.py:36
 msgid "Northumberland"
 msgstr "Northumberland"
 
-#: contrib/localflavor/uk/uk_regions.py:37
+#: .\contrib\localflavor\uk\uk_regions.py:37
 msgid "Nottinghamshire"
 msgstr "Nottinghamshire"
 
-#: contrib/localflavor/uk/uk_regions.py:38
+#: .\contrib\localflavor\uk\uk_regions.py:38
 msgid "Oxfordshire"
 msgstr "Oxfordshire"
 
-#: contrib/localflavor/uk/uk_regions.py:39
+#: .\contrib\localflavor\uk\uk_regions.py:39
 msgid "Shropshire"
 msgstr "Shropshire"
 
-#: contrib/localflavor/uk/uk_regions.py:40
+#: .\contrib\localflavor\uk\uk_regions.py:40
 msgid "Somerset"
 msgstr "Somerset"
 
-#: contrib/localflavor/uk/uk_regions.py:41
+#: .\contrib\localflavor\uk\uk_regions.py:41
 msgid "South Yorkshire"
 msgstr "South Yorkshire"
 
-#: contrib/localflavor/uk/uk_regions.py:42
+#: .\contrib\localflavor\uk\uk_regions.py:42
 msgid "Staffordshire"
 msgstr "Staffordshire"
 
-#: contrib/localflavor/uk/uk_regions.py:43
+#: .\contrib\localflavor\uk\uk_regions.py:43
 msgid "Suffolk"
 msgstr "Suffolk"
 
-#: contrib/localflavor/uk/uk_regions.py:44
+#: .\contrib\localflavor\uk\uk_regions.py:44
 msgid "Surrey"
 msgstr "Surrey"
 
-#: contrib/localflavor/uk/uk_regions.py:45
+#: .\contrib\localflavor\uk\uk_regions.py:45
 msgid "Tyne and Wear"
 msgstr "Tyne and Wear"
 
-#: contrib/localflavor/uk/uk_regions.py:46
+#: .\contrib\localflavor\uk\uk_regions.py:46
 msgid "Warwickshire"
 msgstr "Warwickshire"
 
-#: contrib/localflavor/uk/uk_regions.py:47
+#: .\contrib\localflavor\uk\uk_regions.py:47
 msgid "West Midlands"
 msgstr "West Midlands"
 
-#: contrib/localflavor/uk/uk_regions.py:48
+#: .\contrib\localflavor\uk\uk_regions.py:48
 msgid "West Sussex"
 msgstr "West Sussex"
 
-#: contrib/localflavor/uk/uk_regions.py:49
+#: .\contrib\localflavor\uk\uk_regions.py:49
 msgid "West Yorkshire"
 msgstr "West Yorkshire"
 
-#: contrib/localflavor/uk/uk_regions.py:50
+#: .\contrib\localflavor\uk\uk_regions.py:50
 msgid "Wiltshire"
 msgstr "Wiltshire"
 
-#: contrib/localflavor/uk/uk_regions.py:51
+#: .\contrib\localflavor\uk\uk_regions.py:51
 msgid "Worcestershire"
 msgstr "Worcestershire"
 
-#: contrib/localflavor/uk/uk_regions.py:55
+#: .\contrib\localflavor\uk\uk_regions.py:55
 msgid "County Antrim"
 msgstr "County Antrim"
 
-#: contrib/localflavor/uk/uk_regions.py:56
+#: .\contrib\localflavor\uk\uk_regions.py:56
 msgid "County Armagh"
 msgstr "County Armagh"
 
-#: contrib/localflavor/uk/uk_regions.py:57
+#: .\contrib\localflavor\uk\uk_regions.py:57
 msgid "County Down"
 msgstr "County Down"
 
-#: contrib/localflavor/uk/uk_regions.py:58
+#: .\contrib\localflavor\uk\uk_regions.py:58
 msgid "County Fermanagh"
-msgstr "Comptat de Fermanagh"
+msgstr "County Fermanagh"
 
-#: contrib/localflavor/uk/uk_regions.py:59
+#: .\contrib\localflavor\uk\uk_regions.py:59
 msgid "County Londonderry"
 msgstr "County Londonderry"
 
-#: contrib/localflavor/uk/uk_regions.py:60
+#: .\contrib\localflavor\uk\uk_regions.py:60
 msgid "County Tyrone"
 msgstr "County Tyrone"
 
-#: contrib/localflavor/uk/uk_regions.py:64
+#: .\contrib\localflavor\uk\uk_regions.py:64
 msgid "Clwyd"
 msgstr "Clwyd"
 
-#: contrib/localflavor/uk/uk_regions.py:65
+#: .\contrib\localflavor\uk\uk_regions.py:65
 msgid "Dyfed"
 msgstr "Dyfed"
 
-#: contrib/localflavor/uk/uk_regions.py:66
+#: .\contrib\localflavor\uk\uk_regions.py:66
 msgid "Gwent"
 msgstr "Gwent"
 
-#: contrib/localflavor/uk/uk_regions.py:67
+#: .\contrib\localflavor\uk\uk_regions.py:67
 msgid "Gwynedd"
 msgstr "Gwynedd"
 
-#: contrib/localflavor/uk/uk_regions.py:68
+#: .\contrib\localflavor\uk\uk_regions.py:68
 msgid "Mid Glamorgan"
 msgstr "Mid Glamorgan"
 
-#: contrib/localflavor/uk/uk_regions.py:69
+#: .\contrib\localflavor\uk\uk_regions.py:69
 msgid "Powys"
 msgstr "Powys"
 
-#: contrib/localflavor/uk/uk_regions.py:70
+#: .\contrib\localflavor\uk\uk_regions.py:70
 msgid "South Glamorgan"
 msgstr "Glamorgan Sud"
 
-#: contrib/localflavor/uk/uk_regions.py:71
+#: .\contrib\localflavor\uk\uk_regions.py:71
 msgid "West Glamorgan"
 msgstr "Glamorgan Oest"
 
-#: contrib/localflavor/uk/uk_regions.py:75
+#: .\contrib\localflavor\uk\uk_regions.py:75
 msgid "Borders"
 msgstr "Borders"
 
-#: contrib/localflavor/uk/uk_regions.py:76
+#: .\contrib\localflavor\uk\uk_regions.py:76
 msgid "Central Scotland"
 msgstr "Escòcia central"
 
-#: contrib/localflavor/uk/uk_regions.py:77
+#: .\contrib\localflavor\uk\uk_regions.py:77
 msgid "Dumfries and Galloway"
 msgstr "Dumfries and Galloway"
 
-#: contrib/localflavor/uk/uk_regions.py:78
+#: .\contrib\localflavor\uk\uk_regions.py:78
 msgid "Fife"
 msgstr "Fife"
 
-#: contrib/localflavor/uk/uk_regions.py:79
+#: .\contrib\localflavor\uk\uk_regions.py:79
 msgid "Grampian"
 msgstr "Grampian"
 
-#: contrib/localflavor/uk/uk_regions.py:80
+#: .\contrib\localflavor\uk\uk_regions.py:80
 msgid "Highland"
 msgstr "Highland"
 
-#: contrib/localflavor/uk/uk_regions.py:81
+#: .\contrib\localflavor\uk\uk_regions.py:81
 msgid "Lothian"
 msgstr "Lothian"
 
-#: contrib/localflavor/uk/uk_regions.py:82
+#: .\contrib\localflavor\uk\uk_regions.py:82
 msgid "Orkney Islands"
-msgstr "Orkney Islands"
+msgstr "Illes Orkney"
 
-#: contrib/localflavor/uk/uk_regions.py:83
+#: .\contrib\localflavor\uk\uk_regions.py:83
 msgid "Shetland Islands"
-msgstr "Shetland Islands"
+msgstr "Illes Shetland"
 
-#: contrib/localflavor/uk/uk_regions.py:84
+#: .\contrib\localflavor\uk\uk_regions.py:84
 msgid "Strathclyde"
 msgstr "Strathclyde"
 
-#: contrib/localflavor/uk/uk_regions.py:85
+#: .\contrib\localflavor\uk\uk_regions.py:85
 msgid "Tayside"
 msgstr "Tayside"
 
-#: contrib/localflavor/uk/uk_regions.py:86
+#: .\contrib\localflavor\uk\uk_regions.py:86
 msgid "Western Isles"
-msgstr "Western Isles"
+msgstr "Illes Occidentals"
 
-#: contrib/localflavor/uk/uk_regions.py:90
+#: .\contrib\localflavor\uk\uk_regions.py:90
 msgid "England"
 msgstr "Anglaterra"
 
-#: contrib/localflavor/uk/uk_regions.py:91
+#: .\contrib\localflavor\uk\uk_regions.py:91
 msgid "Northern Ireland"
 msgstr "Irlanda del Nord"
 
-#: contrib/localflavor/uk/uk_regions.py:92
+#: .\contrib\localflavor\uk\uk_regions.py:92
 msgid "Scotland"
 msgstr "Escòcia"
 
-#: contrib/localflavor/uk/uk_regions.py:93
+#: .\contrib\localflavor\uk\uk_regions.py:93
 msgid "Wales"
 msgstr "Gal·les"
 
-#: contrib/localflavor/us/forms.py:16
+#: .\contrib\localflavor\us\forms.py:17
 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
-msgstr "Introduïu un codi zip en el format XXXXX o XXXXX-XXXX."
+msgstr "Introduïu un codi postal en el format XXXXX o XXXXX-XXXX."
 
-#: contrib/localflavor/us/forms.py:54
+#: .\contrib\localflavor\us\forms.py:26
+msgid "Phone numbers must be in XXX-XXX-XXXX format."
+msgstr "Els números de telèfon han d'estar en el format XXX-XXX-XXXX."
+
+#: .\contrib\localflavor\us\forms.py:55
 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
 msgstr ""
 "Introduïu un número vàlid de la Seguretat Social dels E.U.A. en el format "
 "XXX-XX-XXXX."
 
-#: contrib/localflavor/za/forms.py:20
+#: .\contrib\localflavor\us\forms.py:88
+msgid "Enter a U.S. state or territory."
+msgstr "Introduïu un estat o territori dels E.U.A."
+
+#: .\contrib\localflavor\us\models.py:8
+msgid "U.S. state (two uppercase letters)"
+msgstr "Estat dels E.U.A. (dues lletres majúscules)"
+
+#: .\contrib\localflavor\us\models.py:17
+msgid "Phone number"
+msgstr "Número de telèfon"
+
+#: .\contrib\localflavor\uy\forms.py:28
+msgid "Enter a valid CI number in X.XXX.XXX-X,XXXXXXX-X or XXXXXXXX format."
+msgstr ""
+"Introduïu un número CI vàlid en el format X.XXX.XXX-X,XXXXXXX-X o XXXXXXXX."
+
+#: .\contrib\localflavor\uy\forms.py:30
+msgid "Enter a valid CI number."
+msgstr "Introduïu un número CI vàlid."
+
+#: .\contrib\localflavor\za\forms.py:21
 msgid "Enter a valid South African ID number"
-msgstr "Introduïu un número d'Identitat Sud Africà valid"
+msgstr "Introduïu un número d'Identitat Sud Africà vàlid"
 
-#: contrib/localflavor/za/forms.py:54
+#: .\contrib\localflavor\za\forms.py:55
 msgid "Enter a valid South African postal code"
 msgstr "Introduïu un codi postal Sud Africà vàlid."
 
-#: contrib/localflavor/za/za_provinces.py:4
+#: .\contrib\localflavor\za\za_provinces.py:4
 msgid "Eastern Cape"
 msgstr "Cap Oriental"
 
-#: contrib/localflavor/za/za_provinces.py:5
+#: .\contrib\localflavor\za\za_provinces.py:5
 msgid "Free State"
 msgstr "Estat lliure"
 
-#: contrib/localflavor/za/za_provinces.py:6
+#: .\contrib\localflavor\za\za_provinces.py:6
 msgid "Gauteng"
 msgstr "Gauteng"
 
-#: contrib/localflavor/za/za_provinces.py:7
+#: .\contrib\localflavor\za\za_provinces.py:7
 msgid "KwaZulu-Natal"
 msgstr "KwaZulu-Natal"
 
-#: contrib/localflavor/za/za_provinces.py:8
+#: .\contrib\localflavor\za\za_provinces.py:8
 msgid "Limpopo"
 msgstr "Limpopo"
 
-#: contrib/localflavor/za/za_provinces.py:9
+#: .\contrib\localflavor\za\za_provinces.py:9
 msgid "Mpumalanga"
 msgstr "Mpumalanga"
 
-#: contrib/localflavor/za/za_provinces.py:10
+#: .\contrib\localflavor\za\za_provinces.py:10
 msgid "Northern Cape"
 msgstr "Cap Nord"
 
-#: contrib/localflavor/za/za_provinces.py:11
+#: .\contrib\localflavor\za\za_provinces.py:11
 msgid "North West"
 msgstr "Cap Oest"
 
-#: contrib/localflavor/za/za_provinces.py:12
+#: .\contrib\localflavor\za\za_provinces.py:12
 msgid "Western Cape"
 msgstr "Cap Occidental"
 
-#: contrib/redirects/models.py:7
+#: .\contrib\messages\tests\base.py:101
+msgid "lazy message"
+msgstr "missatge gandul"
+
+#: .\contrib\redirects\models.py:7
 msgid "redirect from"
-msgstr "redreçar des de"
+msgstr "redirecció des de"
 
-#: contrib/redirects/models.py:8
+#: .\contrib\redirects\models.py:8
 msgid ""
 "This should be an absolute path, excluding the domain name. Example: '/"
 "events/search/'."
 msgstr ""
-"Aquesta ruta hauria de ser el camí absolut, excloent-ne el nom del domini. "
+"Aquesta ruta hauria de ser un camí absolut, excloent-ne el nom del domini. "
 "Exemple '/events/search/'."
 
-#: contrib/redirects/models.py:9
+#: .\contrib\redirects\models.py:9
 msgid "redirect to"
-msgstr "redreçar a"
+msgstr "redirigir a"
 
-#: contrib/redirects/models.py:10
+#: .\contrib\redirects\models.py:10
 msgid ""
 "This can be either an absolute path (as above) or a full URL starting with "
 "'http://'."
 msgstr ""
-"Això pot ser bé una ruta absoluta (com a dalt) o una URL completa que "
-"comenci per http:// ."
+"Això pot ser bé una ruta absoluta (com a sobre) o una URL completa que "
+"comenci per 'http://'."
 
-#: contrib/redirects/models.py:13
+#: .\contrib\redirects\models.py:13
 msgid "redirect"
-msgstr "redreçament"
+msgstr "redirecció"
 
-#: contrib/redirects/models.py:14
+#: .\contrib\redirects\models.py:14
 msgid "redirects"
-msgstr "redreçaments"
+msgstr "redireccions"
 
-#: contrib/sessions/models.py:45
+#: .\contrib\sessions\models.py:45
 msgid "session key"
 msgstr "clau de la sessió"
 
-#: contrib/sessions/models.py:47
+#: .\contrib\sessions\models.py:47
 msgid "session data"
 msgstr "dades de la sessió"
 
-#: contrib/sessions/models.py:48
+#: .\contrib\sessions\models.py:48
 msgid "expire date"
 msgstr "data de caducitat"
 
-#: contrib/sessions/models.py:53
+#: .\contrib\sessions\models.py:53
 msgid "session"
 msgstr "sessió"
 
-#: contrib/sessions/models.py:54
+#: .\contrib\sessions\models.py:54
 msgid "sessions"
 msgstr "sessions"
 
-#: contrib/sites/models.py:32
+#: .\contrib\sites\models.py:32
 msgid "domain name"
 msgstr "nom del domini"
 
-#: contrib/sites/models.py:33
+#: .\contrib\sites\models.py:33
 msgid "display name"
 msgstr "nom per mostrar"
 
-#: contrib/sites/models.py:39
+#: .\contrib\sites\models.py:39
 msgid "sites"
 msgstr "llocs"
 
-#: db/models/fields/__init__.py:356 db/models/fields/__init__.py:710
+#: .\core\validators.py:20 .\forms\fields.py:66
+msgid "Enter a valid value."
+msgstr "Introduïu un valor vàlid."
+
+#: .\core\validators.py:87 .\forms\fields.py:528
+msgid "Enter a valid URL."
+msgstr "Introduïu una URL vàlida."
+
+#: .\core\validators.py:89 .\forms\fields.py:529
+msgid "This URL appears to be a broken link."
+msgstr "Aquesta URL sembla ser un enllaç trencat."
+
+#: .\core\validators.py:123 .\forms\fields.py:877
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Introduïu un 'slug' vàlid, consistent en lletres, números, guions o guions "
+"baixos."
+
+#: .\core\validators.py:126 .\forms\fields.py:870
+msgid "Enter a valid IPv4 address."
+msgstr "Introduïu una adreça IPv4 vàlida."
+
+#: .\core\validators.py:129 .\db\models\fields\__init__.py:572
+msgid "Enter only digits separated by commas."
+msgstr "Introduïu només dígits separats per comes."
+
+#: .\core\validators.py:135
+#, python-format
+msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
+msgstr ""
+"Assegureu-vos que el valor sigui %(limit_value)s (és %(show_value)s)."
+
+#: .\core\validators.py:153 .\forms\fields.py:204 .\forms\fields.py:256
+#, python-format
+msgid "Ensure this value is less than or equal to %(limit_value)s."
+msgstr "Assegureu-vos que aquest valor sigui menor o igual que %(limit_value)s."
+
+#: .\core\validators.py:158 .\forms\fields.py:205 .\forms\fields.py:257
+#, python-format
+msgid "Ensure this value is greater than or equal to %(limit_value)s."
+msgstr "Assegureu-vos que aquest valor sigui més gran o igual que "
+"%(limit_value)s."
+
+#: .\core\validators.py:164
+#, python-format
+msgid ""
+"Ensure this value has at least %(limit_value)d characters (it has %"
+"(show_value)d)."
+msgstr ""
+"Assegureu-vos que el valor tingui com a mínim %(limit_value)d caràcters "
+"(en té %(show_value)d)."
+
+#: .\core\validators.py:170
+#, python-format
+msgid ""
+"Ensure this value has at most %(limit_value)d characters (it has %"
+"(show_value)d)."
+msgstr ""
+"Assegureu-vos que el valor tingui com a màxim %(limit_value)d caràcters "
+"(en té %(show_value)d)."
+
+#: .\db\models\base.py:823
+#, python-format
+msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
+msgstr "El camp %(field_name)s ha de ser únic per a %(lookup)s %(date_field)s."
+
+#: .\db\models\base.py:838 .\db\models\base.py:846
+#, python-format
+msgid "%(model_name)s with this %(field_label)s already exists."
+msgstr "Ja existeix %(model_name)s amb aquest %(field_label)s."
+
+#: .\db\models\fields\__init__.py:63
+#, python-format
+msgid "Value %r is not a valid choice."
+msgstr "El valor %r no és una opció vàlida."
+
+#: .\db\models\fields\__init__.py:64
+msgid "This field cannot be null."
+msgstr "Aquest camp no pot ser nul."
+
+#: .\db\models\fields\__init__.py:65
+msgid "This field cannot be blank."
+msgstr "Aquest camp no pot estar en blanc."
+
+#: .\db\models\fields\__init__.py:70
+#, python-format
+msgid "Field of type: %(field_type)s"
+msgstr "Camp del tipus: %(field_type)s"
+
+#: .\db\models\fields\__init__.py:451 .\db\models\fields\__init__.py:852
+#: .\db\models\fields\__init__.py:961 .\db\models\fields\__init__.py:972
+#: .\db\models\fields\__init__.py:999
+msgid "Integer"
+msgstr "Enter"
+
+#: .\db\models\fields\__init__.py:455 .\db\models\fields\__init__.py:850
 msgid "This value must be an integer."
 msgstr "Aquest valor ha de ser un enter."
 
-#: db/models/fields/__init__.py:388
+#: .\db\models\fields\__init__.py:490
 msgid "This value must be either True or False."
-msgstr "Aquest valor ha de ser True (Veritat) o False (Fals)"
+msgstr "Aquest valor ha de ser True (Cert) o False (Fals)"
 
-#: db/models/fields/__init__.py:427
-msgid "This field cannot be null."
-msgstr "Aquest camp no pot ser nul."
+#: .\db\models\fields\__init__.py:492
+msgid "Boolean (Either True or False)"
+msgstr "Booleà (Cert o Fals)"
 
-#: db/models/fields/__init__.py:443
-msgid "Enter only digits separated by commas."
-msgstr "Introduïu només dígits separats per comes."
+#: .\db\models\fields\__init__.py:539 .\db\models\fields\__init__.py:982
+#, python-format
+msgid "String (up to %(max_length)s)"
+msgstr "Cadena (de fins a %(max_length)s)"
 
-#: db/models/fields/__init__.py:474
+#: .\db\models\fields\__init__.py:567
+msgid "Comma-separated integers"
+msgstr "Enters separats per comes"
+
+#: .\db\models\fields\__init__.py:581
+msgid "Date (without time)"
+msgstr "Data (sense hora)"
+
+#: .\db\models\fields\__init__.py:585
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "Introduïu una data vàlida en el forma AAAA-MM-DD."
 
-#: db/models/fields/__init__.py:483
+#: .\db\models\fields\__init__.py:586
 #, python-format
 msgid "Invalid date: %s"
 msgstr "Data invàlida: %s"
 
-#: db/models/fields/__init__.py:547 db/models/fields/__init__.py:565
+#: .\db\models\fields\__init__.py:667
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
 msgstr ""
 "Introduïu un data/hora vàlida en format YYYY-MM-DD HH:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/__init__.py:601
+#: .\db\models\fields\__init__.py:669
+msgid "Date (with time)"
+msgstr "Data (amb hora)"
+
+#: .\db\models\fields\__init__.py:735
 msgid "This value must be a decimal number."
 msgstr "Aquest valor ha de ser un número decimal."
 
-#: db/models/fields/__init__.py:686
+#: .\db\models\fields\__init__.py:737
+msgid "Decimal number"
+msgstr "Número decimal"
+
+#: .\db\models\fields\__init__.py:792
+msgid "E-mail address"
+msgstr "Adreça de correu electrònic"
+
+#: .\db\models\fields\__init__.py:799 .\db\models\fields\files.py:220
+#: .\db\models\fields\files.py:331
+msgid "File path"
+msgstr "Ruta del fitxer"
+
+#: .\db\models\fields\__init__.py:822
 msgid "This value must be a float."
 msgstr "Aquest valor ha de ser un número amb punt de coma flotant."
 
-#: db/models/fields/__init__.py:746
+#: .\db\models\fields\__init__.py:824
+msgid "Floating point number"
+msgstr "Número de coma flotant"
+
+#: .\db\models\fields\__init__.py:883
+msgid "Big (8 byte) integer"
+msgstr "Enter gran (8 bytes)"
+
+#: .\db\models\fields\__init__.py:912
 msgid "This value must be either None, True or False."
-msgstr "Aquest valor ha de ser None (Cap), True (Veritat) o False (Fals)"
+msgstr "Aquest valor ha de ser None (Cap), True (Cert) o False (Fals)"
 
-#: db/models/fields/__init__.py:849 db/models/fields/__init__.py:863
+#: .\db\models\fields\__init__.py:914
+msgid "Boolean (Either True, False or None)"
+msgstr "Booleà (Cert, Fals o Cap ('None'))"
+
+#: .\db\models\fields\__init__.py:1005
+msgid "Text"
+msgstr "Text"
+
+#: .\db\models\fields\__init__.py:1021
+msgid "Time"
+msgstr "Hora"
+
+#: .\db\models\fields\__init__.py:1025
 msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
 msgstr "Introduïu una hora vàlida en el format HH:MM[:ss[.uuuuuu]]."
 
-#: db/models/fields/related.py:869
+#: .\db\models\fields\__init__.py:1109
+msgid "XML text"
+msgstr "Text XML"
+
+#: .\db\models\fields\related.py:799
+#, python-format
+msgid "Model %(model)s with pk %(pk)r does not exist."
+msgstr "No existeix el model %(model)s amb la clau primària %(pk)r."
+
+#: .\db\models\fields\related.py:801
+msgid "Foreign Key (type determined by related field)"
+msgstr "Clau forana (tipus determinat pel camp relacionat)"
+
+#: .\db\models\fields\related.py:918
+msgid "One-to-one relationship"
+msgstr "Inter-relació un-a-un"
+
+#: .\db\models\fields\related.py:980
+msgid "Many-to-many relationship"
+msgstr "Inter-relació molts-a-molts"
+
+#: .\db\models\fields\related.py:1000
 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 "
+"Premeu la tecla \"Control\", o \"Command\" en un Mac, per seleccionar més "
 "d'un valor."
 
-#: db/models/fields/related.py:930
+#: .\db\models\fields\related.py:1061
 #, python-format
 msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
 msgid_plural ""
@@ -3960,516 +4726,478 @@
 "Si us plau, introduïu IDs de %(self)s vàlids. Els valors %(value)r són "
 "invàlids."
 
-#: forms/fields.py:53
+#: .\forms\fields.py:65
 msgid "This field is required."
 msgstr "Aquest camp és obligatori."
 
-#: forms/fields.py:54
-msgid "Enter a valid value."
-msgstr "Introduïu un valor vàlid."
-
-#: forms/fields.py:137
-#, 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)."
-
-#: forms/fields.py:138
-#, 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)."
-
-#: forms/fields.py:165
+#: .\forms\fields.py:203
 msgid "Enter a whole number."
 msgstr "Introduïu un número sencer."
 
-#: 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 "Aquest valor ha de ser menor o igual a %s."
-
-#: 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 "Assegureu-vos de que aquest valor sigui superior o igual a %s."
-
-#: forms/fields.py:194 forms/fields.py:223
+#: .\forms\fields.py:234 .\forms\fields.py:255
 msgid "Enter a number."
 msgstr "Introduïu un número."
 
-#: forms/fields.py:226
+#: .\forms\fields.py:258
 #, python-format
 msgid "Ensure that there are no more than %s digits in total."
-msgstr "Assegureu-vos de que no hi ha més de %s dígits en total."
+msgstr "Assegureu-vos que no hi ha més de %s dígits en total."
 
-#: forms/fields.py:227
+#: .\forms\fields.py:259
 #, python-format
 msgid "Ensure that there are no more than %s decimal places."
-msgstr "Assegureu-vos de que no hi ha més de %s decimals."
+msgstr "Assegureu-vos que no hi ha més de %s decimals."
 
-#: forms/fields.py:228
+#: .\forms\fields.py:260
 #, python-format
 msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr "Assegureu-vos de que no hi ha més de %s dígits decimals."
+msgstr "Assegureu-vos que no hi ha més de %s dígits decimals."
 
-#: forms/fields.py:287 forms/fields.py:862
+#: .\forms\fields.py:322 .\forms\fields.py:837
 msgid "Enter a valid date."
 msgstr "Introduïu una data vàlida."
 
-#: forms/fields.py:321 forms/fields.py:863
+#: .\forms\fields.py:350 .\forms\fields.py:838
 msgid "Enter a valid time."
 msgstr "Introduïu una hora vàlida."
 
-#: forms/fields.py:360
+#: .\forms\fields.py:376
 msgid "Enter a valid date/time."
 msgstr "Introduïu una data/hora vàlides."
 
-#: forms/fields.py:446
+#: .\forms\fields.py:434
 msgid "No file was submitted. Check the encoding type on the form."
 msgstr ""
-"No s'ha enviat cap fitxer. Comprovi el tipus de codificació del formulari."
+"No s'ha enviat cap fitxer. Comproveu el tipus de codificació del formulari."
 
-#: forms/fields.py:447
+#: .\forms\fields.py:435
 msgid "No file was submitted."
 msgstr "No s'ha enviat cap fitxer."
 
-#: forms/fields.py:448
+#: .\forms\fields.py:436
 msgid "The submitted file is empty."
 msgstr "El fitxer enviat està buit."
 
-#: forms/fields.py:449
+#: .\forms\fields.py:437
 #, python-format
 msgid ""
 "Ensure this filename 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 que el valor té com a màxim %(max)d caràcters (en té %(length)"
+"d)."
 
-#: forms/fields.py:482
+#: .\forms\fields.py:472
 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 "
+"Carregueu una imatge vàlida. El fitxer que heu carregat no era una imatge o "
 "estava corrupte."
 
-#: forms/fields.py:543
-msgid "Enter a valid URL."
-msgstr "Introduïu una URL vàlida."
-
-#: forms/fields.py:544
-msgid "This URL appears to be a broken link."
-msgstr "Aquesta URL sembla ser un enllaç trencat."
-
-#: forms/fields.py:624 forms/fields.py:702
+#: .\forms\fields.py:595 .\forms\fields.py:670
 #, python-format
 msgid "Select a valid choice. %(value)s is not one of the available choices."
 msgstr "Esculliu una opció vàlida. %(value)s no és una de les opcions vàlides."
 
-#: forms/fields.py:703 forms/fields.py:764 forms/models.py:999
+#: .\forms\fields.py:671 .\forms\fields.py:733 .\forms\models.py:1002
 msgid "Enter a list of values."
 msgstr "Introduïu una llista de valors."
 
-#: forms/fields.py:891
-msgid "Enter a valid IPv4 address."
-msgstr "Introduïu una adreça IPv4 vàlida."
-
-#: forms/fields.py:901
-msgid ""
-"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-msgstr ""
-"Introduïu un 'slug' vàlid, consistent en lletres, números, guions o guions "
-"baixos."
-
-#: forms/formsets.py:271 forms/formsets.py:273
+#: .\forms\formsets.py:298 .\forms\formsets.py:300
 msgid "Order"
 msgstr "Ordre"
 
-#: forms/models.py:363
+#: .\forms\models.py:562
 #, python-format
-msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "El camp %(field_name)s ha de ser únic per a %(lookup)s %(date_field)s."
-
-#: forms/models.py:377 forms/models.py:385
-#, python-format
-msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Ja existeix %(model_name)s amb aquest %(field_label)s."
-
-#: forms/models.py:590
-#, python-format
 msgid "Please correct the duplicate data for %(field)s."
 msgstr "Si us plau, corregiu la dada duplicada per a %(field)s."
 
-#: forms/models.py:594
+#: .\forms\models.py:566
 #, python-format
 msgid "Please correct the duplicate data for %(field)s, which must be unique."
 msgstr ""
 "Si us plau, corregiu la dada duplicada per a %(field)s, la qual ha de ser "
 "única."
 
-#: forms/models.py:600
+#: .\forms\models.py:572
 #, python-format
 msgid ""
 "Please correct the duplicate data for %(field_name)s which must be unique "
 "for the %(lookup)s in %(date_field)s."
 msgstr ""
 "Si us plau, corregiu la dada duplicada per a %(field_name)s, la qual ha de "
-"ser única per a la cerca %(lookup)s en %(date_field)s."
+"ser única per a %(lookup)s en %(date_field)s."
 
-#: forms/models.py:608
+#: .\forms\models.py:580
 msgid "Please correct the duplicate values below."
-msgstr "Si us plau, corregiu els valors duplicats a baix."
+msgstr "Si us plau, corregiu els valors duplicats a sota."
 
-#: forms/models.py:863
+#: .\forms\models.py:855
 msgid "The inline foreign key did not match the parent instance primary key."
 msgstr ""
-"La clau forànea en línea no coincideix amb la clau primària de la instància "
-"del pare"
+"La clau forana en línia no coincideix amb la clau primària de la instància "
+"mare."
 
-#: forms/models.py:926
+#: .\forms\models.py:921
 msgid "Select a valid choice. That choice is not one of the available choices."
 msgstr ""
-"Escolli una opció vàlida; Aquesta opció no és una de les opcions disponibles."
+"Esculli una opció vàlida. Aquesta opció no és una de les opcions disponibles."
 
-#: forms/models.py:1000
+#: .\forms\models.py:1003
 #, python-format
 msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Escolliu una opció vàlida; %s' no és una de les opcions vàlides."
+msgstr "Escolliu una opció vàlida; %s no és una de les opcions vàlides."
 
-#: forms/models.py:1002
+#: .\forms\models.py:1005
 #, python-format
 msgid "\"%s\" is not a valid value for a primary key."
 msgstr "\"%s\" no és un valor vàlid per a una clau primària."
 
-#: template/defaultfilters.py:767
+#: .\template\defaultfilters.py:776
 msgid "yes,no,maybe"
-msgstr "si,no,potser"
+msgstr "sí,no,potser"
 
-#: template/defaultfilters.py:798
+#: .\template\defaultfilters.py:807
 #, python-format
 msgid "%(size)d byte"
 msgid_plural "%(size)d bytes"
 msgstr[0] "%(size)d byte"
 msgstr[1] "%(size)d bytes"
 
-#: template/defaultfilters.py:800
+#: .\template\defaultfilters.py:809
 #, python-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#: template/defaultfilters.py:802
+#: .\template\defaultfilters.py:811
 #, python-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: template/defaultfilters.py:803
+#: .\template\defaultfilters.py:812
 #, python-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: utils/dateformat.py:42
+#: .\utils\dateformat.py:42
 msgid "p.m."
 msgstr "p.m."
 
-#: utils/dateformat.py:43
+#: .\utils\dateformat.py:43
 msgid "a.m."
 msgstr "a.m."
 
-#: utils/dateformat.py:48
+#: .\utils\dateformat.py:48
 msgid "PM"
 msgstr "PM"
 
-#: utils/dateformat.py:49
+#: .\utils\dateformat.py:49
 msgid "AM"
 msgstr "AM"
 
-#: utils/dateformat.py:98
+#: .\utils\dateformat.py:98
 msgid "midnight"
-msgstr "mitja nit"
+msgstr "mitjanit"
 
-#: utils/dateformat.py:100
+#: .\utils\dateformat.py:100
 msgid "noon"
-msgstr "mig dia"
+msgstr "migdia"
 
-#: utils/dates.py:6
+#: .\utils\dates.py:6
 msgid "Monday"
 msgstr "Dilluns"
 
-#: utils/dates.py:6
+#: .\utils\dates.py:6
 msgid "Tuesday"
 msgstr "Dimarts"
 
-#: utils/dates.py:6
+#: .\utils\dates.py:6
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: utils/dates.py:6
+#: .\utils\dates.py:6
 msgid "Thursday"
 msgstr "Dijous"
 
-#: utils/dates.py:6
+#: .\utils\dates.py:6
 msgid "Friday"
 msgstr "Divendres"
 
-#: utils/dates.py:7
+#: .\utils\dates.py:7
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: utils/dates.py:7
+#: .\utils\dates.py:7
 msgid "Sunday"
 msgstr "Diumenge"
 
-#: utils/dates.py:10
+#: .\utils\dates.py:10
 msgid "Mon"
-msgstr "Dl"
+msgstr "dl."
 
-#: utils/dates.py:10
+#: .\utils\dates.py:10
 msgid "Tue"
-msgstr "Dm"
+msgstr "dt."
 
-#: utils/dates.py:10
+#: .\utils\dates.py:10
 msgid "Wed"
-msgstr "Dmx"
+msgstr "dc."
 
-#: utils/dates.py:10
+#: .\utils\dates.py:10
 msgid "Thu"
-msgstr "Dj"
+msgstr "dj."
 
-#: utils/dates.py:10
+#: .\utils\dates.py:10
 msgid "Fri"
-msgstr "Dv"
+msgstr "dv."
 
-#: utils/dates.py:11
+#: .\utils\dates.py:11
 msgid "Sat"
-msgstr "Ds"
+msgstr "ds."
 
-#: utils/dates.py:11
+#: .\utils\dates.py:11
 msgid "Sun"
-msgstr "Dg"
+msgstr "dg."
 
-#: utils/dates.py:18
+#: .\utils\dates.py:18
 msgid "January"
 msgstr "gener"
 
-#: utils/dates.py:18
+#: .\utils\dates.py:18
 msgid "February"
 msgstr "febrer"
 
-#: utils/dates.py:18 utils/dates.py:31
+#: .\utils\dates.py:18 .\utils\dates.py:31
 msgid "March"
 msgstr "març"
 
-#: utils/dates.py:18 utils/dates.py:31
+#: .\utils\dates.py:18 .\utils\dates.py:31
 msgid "April"
 msgstr "abril"
 
-#: utils/dates.py:18 utils/dates.py:31
+#: .\utils\dates.py:18 .\utils\dates.py:31
 msgid "May"
 msgstr "maig"
 
-#: utils/dates.py:18 utils/dates.py:31
+#: .\utils\dates.py:18 .\utils\dates.py:31
 msgid "June"
 msgstr "juny"
 
-#: utils/dates.py:19 utils/dates.py:31
+#: .\utils\dates.py:19 .\utils\dates.py:31
 msgid "July"
 msgstr "juliol"
 
-#: utils/dates.py:19
+#: .\utils\dates.py:19
 msgid "August"
 msgstr "agost"
 
-#: utils/dates.py:19
+#: .\utils\dates.py:19
 msgid "September"
 msgstr "setembre"
 
-#: utils/dates.py:19
+#: .\utils\dates.py:19
 msgid "October"
 msgstr "octubre"
 
-#: utils/dates.py:19
+#: .\utils\dates.py:19
 msgid "November"
 msgstr "novembre"
 
-#: utils/dates.py:20
+#: .\utils\dates.py:20
 msgid "December"
 msgstr "desembre"
 
-#: utils/dates.py:23
+#: .\utils\dates.py:23
 msgid "jan"
-msgstr "gen"
+msgstr "gen."
 
-#: utils/dates.py:23
+#: .\utils\dates.py:23
 msgid "feb"
-msgstr "feb"
+msgstr "feb."
 
-#: utils/dates.py:23
+#: .\utils\dates.py:23
 msgid "mar"
-msgstr "mar"
+msgstr "març"
 
-#: utils/dates.py:23
+#: .\utils\dates.py:23
 msgid "apr"
-msgstr "abr"
+msgstr "abr."
 
-#: utils/dates.py:23
+#: .\utils\dates.py:23
 msgid "may"
-msgstr "mai"
+msgstr "maig"
 
-#: utils/dates.py:23
+#: .\utils\dates.py:23
 msgid "jun"
-msgstr "jun"
+msgstr "juny"
 
-#: utils/dates.py:24
+#: .\utils\dates.py:24
 msgid "jul"
-msgstr "jul"
+msgstr "jul."
 
-#: utils/dates.py:24
+#: .\utils\dates.py:24
 msgid "aug"
-msgstr "ago"
+msgstr "ago."
 
-#: utils/dates.py:24
+#: .\utils\dates.py:24
 msgid "sep"
-msgstr "set"
+msgstr "set."
 
-#: utils/dates.py:24
+#: .\utils\dates.py:24
 msgid "oct"
-msgstr "oct"
+msgstr "oct."
 
-#: utils/dates.py:24
+#: .\utils\dates.py:24
 msgid "nov"
-msgstr "nov"
+msgstr "nov."
 
-#: utils/dates.py:24
+#: .\utils\dates.py:24
 msgid "dec"
-msgstr "des"
+msgstr "des."
 
-#: utils/dates.py:31
+#: .\utils\dates.py:31
 msgid "Jan."
 msgstr "gen."
 
-#: utils/dates.py:31
+#: .\utils\dates.py:31
 msgid "Feb."
 msgstr "feb."
 
-#: utils/dates.py:32
+#: .\utils\dates.py:32
 msgid "Aug."
 msgstr "ago."
 
-#: utils/dates.py:32
+#: .\utils\dates.py:32
 msgid "Sept."
 msgstr "set."
 
-#: utils/dates.py:32
+#: .\utils\dates.py:32
 msgid "Oct."
 msgstr "oct."
 
-#: utils/dates.py:32
+#: .\utils\dates.py:32
 msgid "Nov."
 msgstr "nov."
 
-#: utils/dates.py:32
+#: .\utils\dates.py:32
 msgid "Dec."
 msgstr "des."
 
-#: utils/text.py:128
+#: .\utils\text.py:130
 msgid "or"
 msgstr "o"
 
-#: utils/timesince.py:21
+#: .\utils\timesince.py:21
 msgid "year"
 msgid_plural "years"
 msgstr[0] "any"
 msgstr[1] "anys"
 
-#: utils/timesince.py:22
+#: .\utils\timesince.py:22
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mes"
 msgstr[1] "mesos"
 
-#: utils/timesince.py:23
+#: .\utils\timesince.py:23
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "setmana"
 msgstr[1] "setmanes"
 
-#: utils/timesince.py:24
+#: .\utils\timesince.py:24
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dies"
 
-#: utils/timesince.py:25
+#: .\utils\timesince.py:25
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "hores"
 
-#: utils/timesince.py:26
+#: .\utils\timesince.py:26
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
-#: utils/timesince.py:45
+#: .\utils\timesince.py:45
 msgid "minutes"
 msgstr "minuts"
 
-#: utils/timesince.py:50
+#: .\utils\timesince.py:50
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:56
+#: .\utils\timesince.py:56
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: utils/translation/trans_real.py:399
+#: .\utils\translation\trans_real.py:519
 msgid "DATE_FORMAT"
 msgstr "j \\de F \\de Y"
 
-#: utils/translation/trans_real.py:401
+#: .\utils\translation\trans_real.py:520
+msgid "DATETIME_FORMAT"
+msgstr "j \\de F \\de Y, H:i"
+
+#: .\utils\translation\trans_real.py:521
 msgid "TIME_FORMAT"
 msgstr "H:i"
 
-#: utils/translation/trans_real.py:417
+#: .\utils\translation\trans_real.py:542
 msgid "YEAR_MONTH_FORMAT"
 msgstr "F \\de Y"
 
-#: utils/translation/trans_real.py:418
+#: .\utils\translation\trans_real.py:543
 msgid "MONTH_DAY_FORMAT"
 msgstr "j \\de F"
 
-#: views/generic/create_update.py:114
+#: .\views\generic\create_update.py:115
 #, python-format
 msgid "The %(verbose_name)s was created successfully."
 msgstr "El/la %(verbose_name)s s'ha creat amb èxit."
 
-#: views/generic/create_update.py:156
+#: .\views\generic\create_update.py:158
 #, python-format
 msgid "The %(verbose_name)s was updated successfully."
 msgstr "El/la %(verbose_name)s s'ha actualtzat amb èxit."
 
-#: views/generic/create_update.py:198
+#: .\views\generic\create_update.py:201
 #, python-format
 msgid "The %(verbose_name)s was deleted."
-msgstr "El %(verbose_name)s s'ha eliminat."
+msgstr "El/la %(verbose_name)s s'ha eliminat."
 
+#~ msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+#~ msgstr "Un o més %(fieldname)s en %(name)s: %(obj)s"
+
+#~ msgid "One or more %(fieldname)s in %(name)s:"
+#~ msgstr "Un o més %(fieldname)s en %(name)s:"
+
+#~ msgid "Old password:"
+#~ msgstr "Contrasenya antiga:"
+
+#~ msgid "Relation to parent model"
+#~ msgstr "Relació amb el model pare"
+
+#~ msgid "Add user"
+#~ msgstr "Afegir usuari"
+
 #~ msgid "Comment moderation queue"
 #~ msgstr "Cua de moderació de comentaris"
 
 #~ msgid "No comments to moderate"
-#~ msgstr "No hi ha comentaris per a moderar"
+#~ msgstr "No hi ha comentaris per moderar"
 
 #~ msgid "Email"
 #~ msgstr "Correu electrònic"
 
 #~ msgid "Authenticated?"
-#~ msgstr "Autentificat?"
+#~ msgstr "Autenticat?"
 
 #~ msgid "IP Address"
 #~ msgstr "Adreça IP"
@@ -4478,12 +5206,11 @@
 #~ msgstr "Data d'enviament"
 
 #~ msgid "yes"
-#~ msgstr "si"
+#~ msgstr "sí"
 
 #~ msgid "no"
 #~ msgstr "no"
 
-#, fuzzy
 #~ msgid "verbose_name"
 #~ msgid_plural "verbose_name_plural"
 #~ msgstr[0] "verbose_name"
Index: django/conf/locale/ca/LC_MESSAGES/djangojs.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: django/conf/locale/ca/LC_MESSAGES/django.mo
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: django/conf/locale/ca/LC_MESSAGES/djangojs.po
===================================================================
--- django/conf/locale/ca/LC_MESSAGES/djangojs.po	(revision 13317)
+++ django/conf/locale/ca/LC_MESSAGES/djangojs.po	(working copy)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-15 01:00+0200\n"
+"POT-Creation-Date: 2010-06-04 21:59+0200\n"
 "PO-Revision-Date: 2008-03-25 18:54+0100\n"
 "Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -14,102 +14,144 @@
 "X-Generator: VIM 7.1\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: contrib/admin/media/js/SelectFilter2.js:33
+#: .\contrib\admin\media\js\SelectFilter2.js.py:37
 #, perl-format
 msgid "Available %s"
 msgstr "%s Disponibles"
 
-#: contrib/admin/media/js/SelectFilter2.js:41
+#: .\contrib\admin\media\js\SelectFilter2.js.py:45
 msgid "Choose all"
 msgstr "Seleccionar tots"
 
-#: contrib/admin/media/js/SelectFilter2.js:46
+#: .\contrib\admin\media\js\SelectFilter2.js.py:50
 msgid "Add"
 msgstr "Afegir"
 
-#: contrib/admin/media/js/SelectFilter2.js:48
+#: .\contrib\admin\media\js\SelectFilter2.js.py:52
 msgid "Remove"
 msgstr "Eliminar"
 
-#: contrib/admin/media/js/SelectFilter2.js:53
+#: .\contrib\admin\media\js\SelectFilter2.js.py:57
 #, perl-format
 msgid "Chosen %s"
 msgstr "%s Escollits"
 
-#: contrib/admin/media/js/SelectFilter2.js:54
+#: .\contrib\admin\media\js\SelectFilter2.js.py:58
 msgid "Select your choice(s) and click "
 msgstr "Faci les seves seleccions i faci click a"
 
-#: contrib/admin/media/js/SelectFilter2.js:59
+#: .\contrib\admin\media\js\SelectFilter2.js.py:63
 msgid "Clear all"
 msgstr "Deseleccionar tots"
 
-#: contrib/admin/media/js/dateparse.js:32
-#: contrib/admin/media/js/calendar.js:24
-msgid "January February March April May June July August September October November December"
-msgstr "Gener Febrer Març Abril Maig Juny Juliol Agost Setembre Octubre Novembre Desembre"
+#: .\contrib\admin\media\js\actions.js.py:18
+#: .\contrib\admin\media\js\actions.min.js.py:1
+msgid "%(sel)s of %(cnt)s selected"
+msgid_plural "%(sel)s of %(cnt)s selected"
+msgstr[0] "%(sel)s de %(cnt)s seleccionat"
+msgstr[1] "%(sel)s of %(cnt)s seleccionats"
 
-#: contrib/admin/media/js/dateparse.js:33
+#: .\contrib\admin\media\js\actions.js.py:109
+#: .\contrib\admin\media\js\actions.min.js.py:5
+msgid ""
+"You have unsaved changes on individual editable fields. If you run an "
+"action, your unsaved changes will be lost."
+msgstr ""
+"Teniu canvis sense desar a camps editables individuals. Si executeu "
+"una acció, es perdran aquests canvis no desats."
+
+#: .\contrib\admin\media\js\actions.js.py:121
+#: .\contrib\admin\media\js\actions.min.js.py:6
+msgid ""
+"You have selected an action, but you haven't saved your changes to "
+"individual fields yet. Please click OK to save. You'll need to re-run the "
+"action."
+msgstr ""
+"Heu seleccionat una acció, però encara no heu desat els vostres canvis a "
+"camps individuals. Si us plau premeu OK per desar. Haureu de tornar a "
+"executar l'acció."
+
+#: .\contrib\admin\media\js\actions.js.py:123
+#: .\contrib\admin\media\js\actions.min.js.py:6
+msgid ""
+"You have selected an action, and you haven't made any changes on individual "
+"fields. You're probably looking for the Go button rather than the Save "
+"button."
+msgstr ""
+"Heu seleccionat una acció i no heu fet cap canvi a camps individuals. "
+"Probablement esteu cercant el botó 'Anar' enlloc de 'Desar'."
+
+#: .\contrib\admin\media\js\calendar.js.py:24
+#: .\contrib\admin\media\js\dateparse.js.py:32
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"Gener Febrer Març Abril Maig Juny Juliol Agost Setembre Octubre Novembre "
+"Desembre"
+
+#: .\contrib\admin\media\js\calendar.js.py:25
+msgid "S M T W T F S"
+msgstr "dg dl dt dc dj dv ds"
+
+#: .\contrib\admin\media\js\collapse.js.py:9
+#: .\contrib\admin\media\js\collapse.js.py:21
+#: .\contrib\admin\media\js\collapse.min.js.py:1
+msgid "Show"
+msgstr "Mostrar"
+
+#: .\contrib\admin\media\js\collapse.js.py:16
+#: .\contrib\admin\media\js\collapse.min.js.py:1
+msgid "Hide"
+msgstr "Ocultar"
+
+#: .\contrib\admin\media\js\dateparse.js.py:33
 msgid "Sunday Monday Tuesday Wednesday Thursday Friday Saturday"
 msgstr "Diumenge Dilluns Dimarts Dimecres Dijous Divendres Dissabte"
 
-#: contrib/admin/media/js/calendar.js:25
-msgid "S M T W T F S"
-msgstr "Dg Dl Dt Dc Dj Dv Ds"
-
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:47
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:81
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:48
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:83
 msgid "Now"
 msgstr "Ara"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:51
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:52
 msgid "Clock"
-msgstr "Rellotje"
+msgstr "Rellotge"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:78
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:79
 msgid "Choose a time"
 msgstr "Esculli una hora"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:82
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:84
 msgid "Midnight"
-msgstr "Mitja nit"
+msgstr "Mitjanit"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:83
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:85
 msgid "6 a.m."
 msgstr "6 a.m."
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:84
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:86
 msgid "Noon"
 msgstr "Migdia"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:88
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:183
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:90
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:187
 msgid "Cancel"
 msgstr "Cancel·lar"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:128
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:177
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:132
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:181
 msgid "Today"
 msgstr "Avui"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:132
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:136
 msgid "Calendar"
 msgstr "Calendari"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:175
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:179
 msgid "Yesterday"
 msgstr "Ahir"
 
-#: contrib/admin/media/js/admin/DateTimeShortcuts.js:179
+#: .\contrib\admin\media\js\admin\DateTimeShortcuts.js.py:183
 msgid "Tomorrow"
 msgstr "Demà"
-
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:34
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:72
-msgid "Show"
-msgstr "Mostrar"
-
-#: contrib/admin/media/js/admin/CollapsedFieldsets.js:63
-msgid "Hide"
-msgstr "Ocultar"
-
