Index: django/conf/locale/ca/LC_MESSAGES/django.po
===================================================================
--- django/conf/locale/ca/LC_MESSAGES/django.po	(revision 6564)
+++ django/conf/locale/ca/LC_MESSAGES/django.po	(working copy)
@@ -5,8 +5,8 @@
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-14 12:38+0200\n"
-"PO-Revision-Date: 2007-09-14 14:21+0100\n"
+"POT-Creation-Date: 2007-10-20 14:55+0200\n"
+"PO-Revision-Date: 2007-10-20 15:22+0100\n"
 "Last-Translator: Marc Garcia <marc.garcia@accopensys.com>\n"
 "Language-Team:  <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -14,91 +14,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: db/models/manipulators.py:309
-#, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."
-msgstr "Ja existeix un %(object)s del tipus %(type)s amb aquest %(field)s."
-
-#: db/models/manipulators.py:310
-#: core/validators.py:283
-#: contrib/admin/views/main.py:342
-#: contrib/admin/views/main.py:344
-#: contrib/admin/views/main.py:346
-msgid "and"
-msgstr "i"
-
-#: db/models/fields/related.py:55
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Si us plau, introdueixi un %s vàlid."
-
-#: db/models/fields/related.py:658
-msgid "Separate multiple IDs with commas."
-msgstr "Separi múltiples IDs amb comes."
-
-#: db/models/fields/related.py:660
-msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr "Premi \"Control\" o \"Command\" en un Mac per escollir més d'un."
-
-#: db/models/fields/related.py:707
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
-msgstr[0] "Si us plau, introdueixi els IDs de %(self)s vàlids. El valor %(value)r és invàlid."
-msgstr[1] "Si us plau, introdueixi IDs de %(self)s vàlids. Els valors %(value)r són invàlids."
-
-#: db/models/fields/__init__.py:52
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "Ja existeix  %(optname)s amb auqest %(fieldname)s."
-
-#: db/models/fields/__init__.py:159
-#: db/models/fields/__init__.py:316
-#: db/models/fields/__init__.py:724
-#: db/models/fields/__init__.py:735
-#: oldforms/__init__.py:373
-#: newforms/fields.py:93
-#: newforms/fields.py:509
-#: newforms/fields.py:585
-#: newforms/fields.py:596
-#: newforms/models.py:193
-msgid "This field is required."
-msgstr "Aquest camp és obligatori."
-
-#: db/models/fields/__init__.py:414
-msgid "This value must be an integer."
-msgstr "Aquest valor ha de ser  un enter."
-
-#: db/models/fields/__init__.py:449
-msgid "This value must be either True or False."
-msgstr "Aquest valor ha de ser True (Veritat) o False (Fals)"
-
-#: db/models/fields/__init__.py:470
-msgid "This field cannot be null."
-msgstr "Aquest camp no pot ser null (estar buit)."
-
-#: db/models/fields/__init__.py:504
-#: core/validators.py:156
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introdueixi una data vàlida en el forma AAAA-MM-DD."
-
-#: db/models/fields/__init__.py:573
-#: core/validators.py:165
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Introdueixi un data/hora vàlida en format YYYY-MM-DD HH:MM."
-
-#: db/models/fields/__init__.py:634
-msgid "This value must be a decimal number."
-msgstr "Aquest valor ha de ser un número decimal."
-
-#: db/models/fields/__init__.py:744
-msgid "Enter a valid filename."
-msgstr "Introdueixi un nom de fitxer vàlid."
-
-#: db/models/fields/__init__.py:887
-msgid "This value must be either None, True or False."
-msgstr "Aquest valor ha de ser None (Cap), True (Veritat) o False (Fals)"
-
 #: conf/global_settings.py:39
 msgid "Arabic"
 msgstr "Arabic"
@@ -160,758 +75,701 @@
 msgstr "Francès"
 
 #: conf/global_settings.py:54
+msgid "Gaeilge"
+msgstr "Gaeilge"
+
+#: conf/global_settings.py:55
 msgid "Galician"
 msgstr "Galleg"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
 msgid "Hungarian"
 msgstr "Húngar"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:57
 msgid "Hebrew"
 msgstr "Hebreu"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:58
 msgid "Croatian"
 msgstr "Croat"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
 msgid "Icelandic"
 msgstr "Islandès"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
 msgid "Italian"
 msgstr "Italià"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
 msgid "Japanese"
 msgstr "Japonès"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
 msgid "Korean"
 msgstr "Coreà"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
 msgid "Kannada"
 msgstr "Canès"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
 msgid "Latvian"
 msgstr "Letó"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
 msgid "Macedonian"
 msgstr "Macedoni"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
 msgid "Dutch"
 msgstr "Holandès"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
 msgid "Norwegian"
 msgstr "Norueg"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
 msgid "Polish"
 msgstr "Polac"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
 msgid "Portugese"
 msgstr "Portuguès"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
 msgid "Brazilian"
 msgstr "Brasileny"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
 msgid "Romanian"
 msgstr "Rumanès"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
 msgid "Russian"
 msgstr "Rús"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
 msgid "Slovak"
 msgstr "Eslovac"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
 msgid "Slovenian"
 msgstr "Esloveni"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
 msgid "Serbian"
 msgstr "Serbi"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
 msgid "Swedish"
 msgstr "Suec"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
 msgid "Tamil"
 msgstr "Tàmil"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
 msgid "Turkish"
 msgstr "Turc"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
 msgid "Ukrainian"
 msgstr "Ucranià"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
 msgid "Simplified Chinese"
 msgstr "Xinés simplificat"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
 msgid "Traditional Chinese"
 msgstr "Xinés tradicional"
 
-#: core/validators.py:72
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Aquest valor ha de contenir només números, guions, i guions baixos."
+#: contrib/admin/filterspecs.py:42
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Per %s:</h3>\n"
+"<ul>\n"
 
-#: core/validators.py:76
-msgid "This value must contain only letters, numbers, underscores, dashes or slashes."
-msgstr "Aquest valor ha de contenir només lletres, números, guions, guions baixos, i barres (/)."
+#: contrib/admin/filterspecs.py:72
+#: contrib/admin/filterspecs.py:90
+#: contrib/admin/filterspecs.py:145
+#: contrib/admin/filterspecs.py:171
+msgid "All"
+msgstr "Tots"
 
-#: core/validators.py:80
-msgid "This value must contain only letters, numbers, underscores or hyphens."
-msgstr "Aquest valor ha de contenir només lletres, números, guions o guions baixos"
+#: contrib/admin/filterspecs.py:111
+msgid "Any date"
+msgstr "Qualsevol data"
 
-#: core/validators.py:84
-msgid "Uppercase letters are not allowed here."
-msgstr "No es permeten majúscules aquí."
+#: contrib/admin/filterspecs.py:112
+msgid "Today"
+msgstr "Avui"
 
-#: core/validators.py:88
-msgid "Lowercase letters are not allowed here."
-msgstr "No es permeten minúscules aquí."
+#: contrib/admin/filterspecs.py:115
+msgid "Past 7 days"
+msgstr "Últims 7 dies"
 
-#: core/validators.py:95
-msgid "Enter only digits separated by commas."
-msgstr "Introdueixi només dígits separats per comes."
+#: contrib/admin/filterspecs.py:117
+msgid "This month"
+msgstr "Aquest mes"
 
-#: core/validators.py:107
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "Introdueixi adreces de correu electrònic vàlides separades per comes."
+#: contrib/admin/filterspecs.py:119
+msgid "This year"
+msgstr "Aquest any"
 
-#: core/validators.py:111
-msgid "Please enter a valid IP address."
-msgstr "Per favor introdueixi una adreça IP vàlida."
+#: contrib/admin/filterspecs.py:145
+#: newforms/widgets.py:205
+#: oldforms/__init__.py:591
+msgid "Yes"
+msgstr "Si"
 
-#: core/validators.py:115
-msgid "Empty values are not allowed here."
-msgstr "No s'admeten valor buits."
+#: contrib/admin/filterspecs.py:145
+#: newforms/widgets.py:205
+#: oldforms/__init__.py:591
+msgid "No"
+msgstr "No"
 
-#: core/validators.py:119
-msgid "Non-numeric characters aren't allowed here."
-msgstr "No s'admeten caracters no numèrics."
+#: contrib/admin/filterspecs.py:152
+#: newforms/widgets.py:205
+#: oldforms/__init__.py:591
+msgid "Unknown"
+msgstr "Desconegut"
 
-#: core/validators.py:123
-msgid "This value can't be comprised solely of digits."
-msgstr "Aquest valor no pot contenir només dígits."
+#: contrib/admin/models.py:17
+msgid "action time"
+msgstr "moment de l'acció"
 
-#: core/validators.py:128
-#: newforms/fields.py:149
-msgid "Enter a whole number."
-msgstr "Introdueixi un número sencer."
+#: contrib/admin/models.py:20
+msgid "object id"
+msgstr "id del objecte"
 
-#: core/validators.py:132
-msgid "Only alphabetical characters are allowed here."
-msgstr "Només s'admeted caracters alfabètics aquí."
+#: contrib/admin/models.py:21
+msgid "object repr"
+msgstr "'repr' de l'objecte"
 
-#: core/validators.py:147
-msgid "Year must be 1900 or later."
-msgstr "L'any ha de ser posterior al 1900"
+#: contrib/admin/models.py:22
+msgid "action flag"
+msgstr "marca de l'acció"
 
-#: core/validators.py:151
-#, python-format
-msgid "Invalid date: %s"
-msgstr "Data invàlida: %s"
+#: contrib/admin/models.py:23
+msgid "change message"
+msgstr "missatge del canvi"
 
-#: core/validators.py:161
-msgid "Enter a valid time in HH:MM format."
-msgstr "Introdueixi una hora vàlida en el format HH:MM."
+#: contrib/admin/models.py:26
+msgid "log entry"
+msgstr "entrada del registre"
 
-#: core/validators.py:170
-#: newforms/fields.py:343
-msgid "Enter a valid e-mail address."
-msgstr "Introdueixi una adreça de correu vàlida."
+#: contrib/admin/models.py:27
+msgid "log entries"
+msgstr "entrades del registre"
 
-#: core/validators.py:182
-#: core/validators.py:469
-#: oldforms/__init__.py:686
-#: newforms/fields.py:377
-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."
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "No s'ha pogut trobar la pàgina"
 
-#: core/validators.py:193
-#: newforms/fields.py:405
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Envii una imatge vàilda. El fitxer que ha enviat no era una imatge o estaba corrupte."
+#: contrib/admin/templates/admin/404.html: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 solicitada"
 
-#: core/validators.py:200
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "La URL %s no apunta una imatge vàlida."
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:37
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/delete_confirmation.html:5
+#: contrib/admin/templates/admin/invalid_setup.html:4
+#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/auth/user/change_password.html:11
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+msgid "Home"
+msgstr "Inici"
 
-#: core/validators.py:204
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "El números de telèfon han de guardar-se en el format XXX-XXX-XXXX. \"%s\" no és vàlid."
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Error del servidor"
 
-#: core/validators.py:212
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "La URL %s no apunta a un video QuickTime vàlid."
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Error del servidor (500)"
 
-#: core/validators.py:216
-msgid "A valid URL is required."
-msgstr "Es precisa d'una URL vàlida."
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Error del servidor <em>(500)</em>"
 
-#: core/validators.py:230
-#, python-format
-msgid ""
-"Valid HTML is required. Specific errors are:\n"
-"%s"
-msgstr ""
-"Es precisa HTML vàlid. Els errors específics sòn:\n"
-"%s"
+#: contrib/admin/templates/admin/500.html:10
+msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
+msgstr "Hi ha hagut un error. S'ha informat als administradors del lloc per correu electrònic y hauria d'arreglar-se en breu. Gràcies per la seva paciència."
 
-#: core/validators.py:237
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "XML incorrectament formatejat: %s"
+#: contrib/admin/templates/admin/base.html:26
+msgid "Welcome,"
+msgstr "Benvingut,"
 
-#: core/validators.py:254
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "URL invalida: %s"
+#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr "Documentació"
 
-#: core/validators.py:259
-#: core/validators.py:261
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "La URL %sés un enllaç trencat."
+#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/auth/user/change_password.html:14
+#: contrib/admin/templates/admin/auth/user/change_password.html:45
+msgid "Change password"
+msgstr "Canviar clau"
 
-#: core/validators.py:267
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "Introdueixi una abreviatura vàlida d'estat d'els E.U.A.."
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/comments/templates/comments/form.html:6
+msgid "Log out"
+msgstr "Finalitzar sessió"
 
-#: core/validators.py:281
-#, python-format
-msgid "Watch your mouth! The word %s is not allowed here."
-msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] "Vigili la seva boca! Aquí no admetem la paraula: %s."
-msgstr[1] "Vigili la seva boca! Aquí no admetem les paraules: %s."
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Lloc administratiu de Django"
 
-#: core/validators.py:288
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "Aquest camp ha de concordar amb el camp '%s'."
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Adminsitració de Django"
 
-#: core/validators.py:307
-msgid "Please enter something for at least one field."
-msgstr "Si us plau, introdueixi alguna cosa alemnys en un camp."
+#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/index.html:28
+msgid "Add"
+msgstr "Afegir"
 
-#: core/validators.py:316
-#: core/validators.py:327
-msgid "Please enter both fields or leave them both empty."
-msgstr "Si us plau, ompli els dos camps o deixi'ls tots dos en blanc."
+#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/object_history.html:4
+msgid "History"
+msgstr "Històric"
 
-#: core/validators.py:335
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
-msgstr "S'ha de proporcionar aquest camps si %(field)s és %(value)s"
+#: contrib/admin/templates/admin/change_form.html:21
+msgid "View on site"
+msgstr "Veure en el lloc"
 
-#: core/validators.py:348
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
-msgstr "S'ha de proporcionar aquest camps si %(field)s no és %(value)s"
+#: contrib/admin/templates/admin/change_form.html:31
+#: contrib/admin/templates/admin/auth/user/change_password.html:23
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Si us plau, corregeixi l'error mostrat abaix."
+msgstr[1] "Si us plau, corregeixi els errors mostrats abaix."
 
-#: core/validators.py:367
-msgid "Duplicate values are not allowed."
-msgstr "No s'admeten valors duplicats."
+#: contrib/admin/templates/admin/change_form.html:49
+msgid "Ordering"
+msgstr "Ordre"
 
-#: core/validators.py:382
-#, python-format
-msgid "This value must be between %(lower)s and %(upper)s."
-msgstr "Aquest valor ha de estar comprés entre %(lower)s i %(upper)s."
+#: contrib/admin/templates/admin/change_form.html:52
+msgid "Order:"
+msgstr "Ordre:"
 
-#: core/validators.py:384
+#: contrib/admin/templates/admin/change_list.html:11
 #, python-format
-msgid "This value must be at least %s."
-msgstr "Aquest valor ha de ser com a mínim %s."
+msgid "Add %(name)s"
+msgstr "Afegir %(name)s"
 
-#: core/validators.py:386
-#, python-format
-msgid "This value must be no more than %s."
-msgstr "Aquest valor ha de ser com a màxim %s."
+#: contrib/admin/templates/admin/delete_confirmation.html:8
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr "Eliminar"
 
-#: core/validators.py:422
+#: contrib/admin/templates/admin/delete_confirmation.html:13
 #, python-format
-msgid "This value must be a power of %s."
-msgstr "Aquest valor ha de ser una potència de %s."
+msgid "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
+msgstr "Eliminar el/la %(object_name)s '%(escaped_object)s' provocaria l'eliminació d'objectes relacionats, però el seu compte no te permisos per a esborrar els tipus d'objecte següents:"
 
-#: core/validators.py:432
-msgid "Please enter a valid decimal number."
-msgstr "Si us plau, introdueixi un número decimal vàlid."
-
-#: core/validators.py:439
+#: contrib/admin/templates/admin/delete_confirmation.html:20
 #, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural "Please enter a valid decimal number with at most %s total digits."
-msgstr[0] "Si us plau, introdueixi un número decimal vàlid de com a màxim %s digit."
-msgstr[1] "Si us plau, introdueixi un número decimal vàlid de com a màxim %s digits."
+msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:"
+msgstr "Està segur de voler esborrar els/les %(object_name)s \"%(escaped_object)s\"? S'esborraran els següents elements relacionats:"
 
-#: core/validators.py:442
-#, python-format
-msgid "Please enter a valid decimal number with a whole part of at most %s digit."
-msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits."
-msgstr[0] "Si us plau, introdueixi un número decimal vàlid que la seva part sencera sigui de com a màxim %s digit."
-msgstr[1] "Si us plau, introdueixi un número decimal vàlid que la seva part sencera sigui de com a màxim %s digits."
+#: contrib/admin/templates/admin/delete_confirmation.html:25
+msgid "Yes, I'm sure"
+msgstr "Si, estic segur"
 
-#: core/validators.py:445
+#: contrib/admin/templates/admin/filter.html:2
 #, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural "Please enter a valid decimal number with at most %s decimal places."
-msgstr[0] "Si us plau, introdueixi un número decimal vàlid de com a màxim %s posició decimal."
-msgstr[1] "Si us plau, introdueixi un número decimal vàlid de com a màxim %s posicions decimals."
+msgid " By %(filter_title)s "
+msgstr "Per %(filter_title)s "
 
-#: core/validators.py:453
-msgid "Please enter a valid floating point number."
-msgstr "Si us plau, introdueixi un número amb punt de coma flotant vàlid."
+#: contrib/admin/templates/admin/filters.html:4
+msgid "Filter"
+msgstr "Filtre"
 
-#: core/validators.py:462
+#: contrib/admin/templates/admin/index.html:17
 #, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "Asseguris de que el fitxer que ha enviat té, com a mínim, %s bytes."
+msgid "Models available in the %(name)s application."
+msgstr "Models disponibles en la aplicació %(name)s."
 
-#: core/validators.py:463
+#: contrib/admin/templates/admin/index.html:18
 #, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "Asseguris de que el fitxer que ha enviat té, com a màxim %s bytes."
+msgid "%(name)s"
+msgstr "%(name)s"
 
-#: core/validators.py:480
-msgid "The format for this field is wrong."
-msgstr "El format per aquest camp és incorrecte."
+#: contrib/admin/templates/admin/index.html:34
+msgid "Change"
+msgstr "Modificar"
 
-#: core/validators.py:495
-msgid "This field is invalid."
-msgstr "El camp no és vàlid."
+#: contrib/admin/templates/admin/index.html:44
+msgid "You don't have permission to edit anything."
+msgstr "No té permís per editar res."
 
-#: core/validators.py:531
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "No s'ha pogut obtenir res de %s."
+#: contrib/admin/templates/admin/index.html:52
+msgid "Recent Actions"
+msgstr "Accions recents"
 
-#: core/validators.py:534
-#, python-format
-msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr "La URL %(url)s ha va tornar la capcelera Content-Type '%(contenttype)s', que no és vàlida."
+#: contrib/admin/templates/admin/index.html:53
+msgid "My Actions"
+msgstr "Les meves accions"
 
-#: core/validators.py:567
-#, python-format
-msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
-msgstr "Si us plau, tanqui l'etiqueta %(tag)s des de la línia %(line)s. (La línia comença amb \"%(start)s\".)"
+#: contrib/admin/templates/admin/index.html:57
+msgid "None available"
+msgstr "Cap disponible"
 
-#: core/validators.py:571
-#, python-format
-msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
-msgstr "Part del text que comença en la línia %(line)s no està permès en aquest context. (La línia comença per \"%(start)s\".)"
+#: contrib/admin/templates/admin/invalid_setup.html:8
+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 teva base de dades. Assegurat de que s'han creat les taules, i de que la base de dades és llegible per l'usuari apropiat."
 
-#: core/validators.py:576
-#, python-format
-msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
-msgstr "El \"%(attr)s\" de la línia %(line)s no és un atribut vàlid. (La línia comença per \"%(start)s\".)"
+#: contrib/admin/templates/admin/login.html:17
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+msgid "Username:"
+msgstr "Usuari:"
 
-#: core/validators.py:581
-#, python-format
-msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
-msgstr "La \"<%(tag)s>\" de la línia %(line)s no és una etiqueta vàlida. (La línia comença per \"%(start)s\".)"
+#: contrib/admin/templates/admin/login.html:20
+#: contrib/comments/templates/comments/form.html:8
+msgid "Password:"
+msgstr "Contrasenya:"
 
-#: core/validators.py:585
-#, python-format
-msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
-msgstr "Una etiqueta de la línia %(line)s li falta un o més atributs requerits.(La línia comença per \"%(start)s\".)"
+#: contrib/admin/templates/admin/login.html:25
+#: contrib/admin/views/decorators.py:24
+msgid "Log in"
+msgstr "Iniciar sessió"
 
-#: core/validators.py:590
-#, python-format
-msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
-msgstr "L'atribut \"%(attr)s\" de la línia %(line)s té un valor que no és vàlid. (La línia comença per \"%(start)s\".)"
+#: contrib/admin/templates/admin/object_history.html:17
+msgid "Date/time"
+msgstr "Data/hora"
 
-#: contrib/auth/forms.py:17
-#: contrib/auth/forms.py:138
-msgid "The two password fields didn't match."
-msgstr "Els dos camps de contrasenya no coincideixen."
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "User"
+msgstr "Usuari"
 
-#: contrib/auth/forms.py:25
-msgid "A user with that username already exists."
-msgstr "Ja existeix un usuari amb aquest nom."
+#: contrib/admin/templates/admin/object_history.html:19
+msgid "Action"
+msgstr "Acció"
 
-#: contrib/auth/forms.py:53
-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ó."
+#: contrib/admin/templates/admin/object_history.html:25
+msgid "DATE_WITH_TIME_FULL"
+msgstr "F j, Y, H:i "
 
-#: contrib/auth/forms.py:60
-#: contrib/admin/views/decorators.py:10
-msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
-msgstr "Si us plau, introdueixi un nom d'usuari i contrasenya vàlids. Tingui en compte que tots dos camps son sensibles a majúscules i minúscules."
+#: contrib/admin/templates/admin/object_history.html:35
+msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
+msgstr "Aquest objecte no te historial de canvis. Probablement no va ser afegit utilitzant aquest lloc administratiu."
 
-#: contrib/auth/forms.py:62
-msgid "This account is inactive."
-msgstr "Aquest compte està inactiu"
+#: contrib/admin/templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Mostrar tots"
 
-#: contrib/auth/forms.py:84
-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. Està segur de que s'ha registrat?"
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
+msgstr "Cercar"
 
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
-msgstr "Els dos camps de nova contrasenya no coincideixen."
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "1 result"
+msgid_plural "%(counter)s results"
+msgstr[0] "1 resultat"
+msgstr[1] "%(counter)s resultats"
 
-#: contrib/auth/forms.py:124
-msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr "La seva antiga contrasenya no és correcte. Si el plau, introdueixi-la de nou."
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "%(full_result_count)s en total"
 
-#: contrib/auth/models.py:53
-#: contrib/auth/models.py:73
-msgid "name"
-msgstr "nom"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Desar com a nou"
 
-#: contrib/auth/models.py:55
-msgid "codename"
-msgstr "nom en clau"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Desar i afegir-ne un de nou"
 
-#: contrib/auth/models.py:58
-msgid "permission"
-msgstr "permís"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Desar i continuar editant"
 
-#: contrib/auth/models.py:59
-#: contrib/auth/models.py:74
-msgid "permissions"
-msgstr "permissos"
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Desar"
 
-#: contrib/auth/models.py:77
-msgid "group"
-msgstr "grup"
+#: contrib/admin/templates/admin/auth/user/add_form.html:6
+msgid "First, enter a username and password. Then, you'll be able to edit more user options."
+msgstr "Primer, entri un usuari i una contrasenya. Després podrà editar més opcions del usuari."
 
-#: contrib/auth/models.py:78
-#: contrib/auth/models.py:121
-msgid "groups"
-msgstr "grups"
+#: contrib/admin/templates/admin/auth/user/add_form.html:12
+msgid "Username"
+msgstr "Usuari"
 
-#: contrib/auth/models.py:111
-msgid "username"
-msgstr "nom d'usuari"
+#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: contrib/admin/templates/admin/auth/user/change_password.html:33
+msgid "Password"
+msgstr "Contrasenya"
 
-#: contrib/auth/models.py:111
-msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
-msgstr "Requerit. 30 o menys caracters. Només caracters alfanumèrics (lletres, dígits i guions baixos)."
+#: contrib/admin/templates/admin/auth/user/add_form.html:23
+#: contrib/admin/templates/admin/auth/user/change_password.html:38
+msgid "Password (again)"
+msgstr "Contrasenya (de nou)"
 
-#: contrib/auth/models.py:112
-msgid "first name"
-msgstr "nom propi"
+#: contrib/admin/templates/admin/auth/user/add_form.html:24
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+msgid "Enter the same password as above, for verification."
+msgstr "Introdueixi la mateixa contrasenya que a sobre, per a verificació."
 
-#: contrib/auth/models.py:113
-msgid "last name"
-msgstr "cognoms"
+#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr "Introdueixi una contrasenya per l'usuari <strong>%(username)s</strong>"
 
-#: contrib/auth/models.py:114
-msgid "e-mail address"
-msgstr "adreça de correu electrònic"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "'Bookmarklets'"
 
-#: contrib/auth/models.py:115
-msgid "password"
-msgstr "contrasenya"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+msgid "Documentation bookmarklets"
+msgstr "'Bookmarklets' de documentació"
 
-#: contrib/auth/models.py:115
-msgid "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."
-msgstr "Utilitzi '[algo]$[salt]$[hexdigest]' o el <a href=\"password/\">formulari de canvi de contrasenya</a>."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:8
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">Per a instalar 'bookmarklets', arrosegui l'enllaç a la seva barra de\n"
+"marcadors, o faci click amb el botò dret en l'enllaç i afegeixi'l als marcadors.\n"
+"Ara pot escollir el 'bookmarklet' des de qualsevol pàgina del lloc.\n"
+"Observi que alguns d'aquests 'bookmarklets' precisen que estigui veient\n"
+"el lloc des de un ordinador senyalat com a \"intern\" (parli\n"
+"amb el seu administrador de sistemes si no està segur de la condició del seu).</p>\n"
 
-#: contrib/auth/models.py:116
-msgid "staff status"
-msgstr "és membre del personal"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:18
+msgid "Documentation for this page"
+msgstr "Documentació d'aquesta pàgina"
 
-#: contrib/auth/models.py:116
-msgid "Designates whether the user can log into this admin site."
-msgstr "Indica si l'usuari pot entrar en el lloc administratiu."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Jumps you from any page to the documentation for the view that generates that page."
+msgstr "El porta des de qualsevol pàgina de la documentació a la vista que la genera."
 
-#: contrib/auth/models.py:117
-msgid "active"
-msgstr "actiu"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:21
+msgid "Show object ID"
+msgstr "Mostra el ID de l'objecte"
 
-#: contrib/auth/models.py:117
-msgid "Designates whether this user can log into the Django admin. Unselect this instead of deleting accounts."
-msgstr "Designa si aquest usuari pot iniciar sessió a la interfície administrativa Djano. Deselecciona-ho enlloc de esborrar comptes d'usuari."
+#: contrib/admin/templates/admin_doc/bookmarklets.html: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 pàgines que representen un únic objecte."
 
-#: contrib/auth/models.py:118
-msgid "superuser status"
-msgstr "estat de superusuari"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:24
+msgid "Edit this object (current window)"
+msgstr "Editar aquest objecte (finestra actual)"
 
-#: contrib/auth/models.py:118
-msgid "Designates that this user has all permissions without explicitly assigning them."
-msgstr "Designa que aquest usuari té tots els permisos sense assignar-los explícitament."
+#: contrib/admin/templates/admin_doc/bookmarklets.html: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/auth/models.py:119
-msgid "last login"
-msgstr "últim inici de sessió"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:27
+msgid "Edit this object (new window)"
+msgstr "Editar aquest objecte (nova finestra)"
 
-#: contrib/auth/models.py:120
-msgid "date joined"
-msgstr "data de creació"
+#: contrib/admin/templates/admin_doc/bookmarklets.html: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/models.py:122
-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."
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Gràcies per emprar algun temps de cualitat amb el lloc web avui."
 
-#: contrib/auth/models.py:123
-msgid "user permissions"
-msgstr "permissos de l'usuari"
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Iniciar sessió de nou"
 
-#: contrib/auth/models.py:127
-msgid "user"
-msgstr "usuari"
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_form.html:5
+#: contrib/admin/templates/registration/password_change_form.html:9
+msgid "Password change"
+msgstr "Canvi de clau"
 
-#: contrib/auth/models.py:128
-msgid "users"
-msgstr "usuaris"
+#: contrib/admin/templates/registration/password_change_done.html:5
+#: contrib/admin/templates/registration/password_change_done.html:9
+msgid "Password change successful"
+msgstr "Canvi de clau exitò"
 
-#: contrib/auth/models.py:134
-msgid "Personal info"
-msgstr "Informaciò personal"
+#: contrib/admin/templates/registration/password_change_done.html:11
+msgid "Your password was changed."
+msgstr "La seva clau ha estat canviada."
 
-#: contrib/auth/models.py:135
-msgid "Permissions"
-msgstr "permissos"
+#: contrib/admin/templates/registration/password_change_form.html:11
+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, introdueixi la seva contrasenya antiga, per seguretat, i tot seguit introdueixi la seva nova contrasenya dues vegades per verificar que l'ha escrit correctament."
 
-#: contrib/auth/models.py:136
-msgid "Important dates"
-msgstr "Dates importants"
+#: contrib/admin/templates/registration/password_change_form.html:16
+msgid "Old password:"
+msgstr "Contrasenya antiga:"
 
-#: contrib/auth/models.py:137
-msgid "Groups"
-msgstr "Grups"
+#: contrib/admin/templates/registration/password_change_form.html:18
+msgid "New password:"
+msgstr "Contrasenya nova:"
 
-#: contrib/auth/models.py:288
-msgid "message"
-msgstr "missatge"
+#: contrib/admin/templates/registration/password_change_form.html:20
+msgid "Confirm password:"
+msgstr "Confirmar contrasenya:"
 
-#: contrib/auth/views.py:47
-msgid "Logged out"
-msgstr "Sessió finalitzada"
+#: contrib/admin/templates/registration/password_change_form.html:22
+msgid "Change my password"
+msgstr "Canviar la meva clau:"
 
-#: contrib/admin/models.py:17
-msgid "action time"
-msgstr "moment de l'acció"
+#: 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
+msgid "Password reset"
+msgstr "Restablir contrasenya"
 
-#: contrib/admin/models.py:20
-msgid "object id"
-msgstr "id del objecte"
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Contrasenya restaber-ta amb èxit"
 
-#: contrib/admin/models.py:21
-msgid "object repr"
-msgstr "'repr' de l'objecte"
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
+msgstr "Li hem enviat una contrasenya nova a l'adreça de correu electrònic que ens ha indicat. L'hauria de rebre en breu."
 
-#: contrib/admin/models.py:22
-msgid "action flag"
-msgstr "marca de l'acció"
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "Està rebent aquest missatge degut a que va solicitar un restabliment de contrasenya."
 
-#: contrib/admin/models.py:23
-msgid "change message"
-msgstr "missatge del canvi"
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "del seu compte d'usuari a %(site_name)s."
 
-#: contrib/admin/models.py:26
-msgid "log entry"
-msgstr "entrada del registre"
-
-#: contrib/admin/models.py:27
-msgid "log entries"
-msgstr "entrades del registre"
-
-#: contrib/admin/filterspecs.py:42
+#: contrib/admin/templates/registration/password_reset_email.html:5
 #, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-"<h3>Per %s:</h3>\n"
-"<ul>\n"
+msgid "Your new password is: %(new_password)s"
+msgstr "La seva nova contrasenya és: %(new_password)s"
 
-#: contrib/admin/filterspecs.py:72
-#: contrib/admin/filterspecs.py:90
-#: contrib/admin/filterspecs.py:145
-#: contrib/admin/filterspecs.py:171
-msgid "All"
-msgstr "Tots"
+#: contrib/admin/templates/registration/password_reset_email.html:7
+msgid "Feel free to change this password by going to this page:"
+msgstr "Sentis lliure de canviar-la en aquesta pàgina:"
 
-#: contrib/admin/filterspecs.py:111
-msgid "Any date"
-msgstr "Qualsevol data"
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "El seu nom d'usuari, en cas d'haver-lo oblidat:"
 
-#: contrib/admin/filterspecs.py:112
-msgid "Today"
-msgstr "Avui"
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "Gràcies per fer us del nostre lloc!"
 
-#: contrib/admin/filterspecs.py:115
-msgid "Past 7 days"
-msgstr "Últims 7 dies"
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "L'equip de %(site_name)s"
 
-#: contrib/admin/filterspecs.py:117
-msgid "This month"
-msgstr "Aquest mes"
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
+msgstr "Ha oblidat la seva contrasenya? Introdueixi la seva adreça de correu electrònic i crearem una nova que li enviarem per correu."
 
-#: contrib/admin/filterspecs.py:119
-msgid "This year"
-msgstr "Aquest any"
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Adreça de correu electrònic:"
 
-#: contrib/admin/filterspecs.py:145
-#: oldforms/__init__.py:591
-#: newforms/widgets.py:188
-msgid "Yes"
-msgstr "Si"
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Restablir la meva contrasenya"
 
-#: contrib/admin/filterspecs.py:145
-#: oldforms/__init__.py:591
-#: newforms/widgets.py:188
-msgid "No"
-msgstr "No"
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr "Data:"
 
-#: contrib/admin/filterspecs.py:152
-#: oldforms/__init__.py:591
-#: newforms/widgets.py:188
-msgid "Unknown"
-msgstr "Desconegut"
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr "Hora:"
 
-#: contrib/admin/views/decorators.py:24
-#: contrib/admin/templates/admin/login.html:25
-msgid "Log in"
-msgstr "Iniciar sessió"
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr "Actualment:"
 
-#: contrib/admin/views/decorators.py:62
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
-msgstr "Si us plau, identifiquis de nou doncs la seva sessió ha expirat. No es preocupi, el seu enviament està emmagatzemat."
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
+msgstr "Modificar:"
 
-#: contrib/admin/views/decorators.py:69
-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 seu navegador no està configurat per acceptar 'cookies' (galetes). Si us plau, habiliti les 'cookies', recarregui aquesta pàgina i provi-ho de nou. "
+#: contrib/admin/templatetags/admin_list.py:254
+msgid "All dates"
+msgstr "Totes les dates"
 
-#: contrib/admin/views/decorators.py:83
-msgid "Usernames cannot contain the '@' character."
-msgstr "Els noms d'usuari no poden contenir el caracter '@'."
-
-#: contrib/admin/views/decorators.py:85
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "La seva adreça de correu no és el seu nom d'usuari. Provi '%s' en tot cas."
-
-#: contrib/admin/views/main.py:230
-msgid "Site administration"
-msgstr "Lloc administratiu"
-
+#: contrib/admin/views/auth.py:20
 #: contrib/admin/views/main.py:264
-#: contrib/admin/views/auth.py:20
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "El/la %(name)s \"%(obj)s\".ha estat agregat/da amb èxit."
 
+#: contrib/admin/views/auth.py:25
 #: contrib/admin/views/main.py:268
 #: contrib/admin/views/main.py:354
-#: contrib/admin/views/auth.py:25
 msgid "You may edit it again below."
 msgstr "Pot editar-lo de nou abaix."
 
-#: contrib/admin/views/main.py:278
-#: contrib/admin/views/main.py:363
-#, python-format
-msgid "You may add another %s below."
-msgstr "Pot afegir un altre %s a baix."
+#: contrib/admin/views/auth.py:31
+msgid "Add user"
+msgstr "Afegir usuari"
 
-#: contrib/admin/views/main.py:296
-#, python-format
-msgid "Add %s"
-msgstr "Afegir %s"
+#: contrib/admin/views/auth.py:58
+msgid "Password changed successfully."
+msgstr "Canvi de clau exitós"
 
-#: contrib/admin/views/main.py:342
+#: contrib/admin/views/auth.py:65
 #, python-format
-msgid "Added %s."
-msgstr "Agregat %s."
+msgid "Change password: %s"
+msgstr "Canviar clau: %s"
 
-#: contrib/admin/views/main.py:344
-#, python-format
-msgid "Changed %s."
-msgstr "Modificat %s."
+#: contrib/admin/views/decorators.py:10
+#: contrib/auth/forms.py:60
+msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
+msgstr "Si us plau, introdueixi un nom d'usuari i contrasenya vàlids. Tingui en compte que tots dos camps son sensibles a majúscules i minúscules."
 
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "Deleted %s."
-msgstr "Eliminat %s."
+#: contrib/admin/views/decorators.py:62
+msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
+msgstr "Si us plau, identifiquis de nou doncs la seva sessió ha expirat. No es preocupi, el seu enviament està emmagatzemat."
 
-#: contrib/admin/views/main.py:349
-msgid "No fields changed."
-msgstr "Cap camp canviat."
+#: contrib/admin/views/decorators.py:69
+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 seu navegador no està configurat per acceptar 'cookies' (galetes). Si us plau, habiliti les 'cookies', recarregui aquesta pàgina i provi-ho de nou. "
 
-#: contrib/admin/views/main.py:352
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "S'ha modificat amb èxist el/la %(name)s \"%(obj)s."
+#: contrib/admin/views/decorators.py:83
+msgid "Usernames cannot contain the '@' character."
+msgstr "Els noms d'usuari no poden contenir el caracter '@'."
 
-#: contrib/admin/views/main.py:360
+#: contrib/admin/views/decorators.py:85
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "S'ha agregat amb èxit el/la %(name)s \"%(obj)s\". Pot editar-lo de nou abaix."
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "La seva adreça de correu no és el seu nom d'usuari. Provi '%s' en tot cas."
 
-#: contrib/admin/views/main.py:398
-#, python-format
-msgid "Change %s"
-msgstr "Modificar %s"
-
-#: contrib/admin/views/main.py:483
-#, 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/views/main.py:488
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Un o més %(fieldname)s en %(name)s:"
-
-#: contrib/admin/views/main.py:520
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "El/la %(name)s \"%(obj)s\".ha estat eliminat amb èxit."
-
-#: contrib/admin/views/main.py:523
-msgid "Are you sure?"
-msgstr "Està segur?"
-
-#: contrib/admin/views/main.py:545
-#, python-format
-msgid "Change history: %s"
-msgstr "Modificar històric: %s"
-
-#: contrib/admin/views/main.py:579
-#, python-format
-msgid "Select %s"
-msgstr "Seleccioni %s"
-
-#: contrib/admin/views/main.py:579
-#, python-format
-msgid "Select %s to change"
-msgstr "Seleccioni %s per modificar"
-
-#: contrib/admin/views/main.py:780
-msgid "Database error"
-msgstr "Error de/en la base de dades"
-
 #: contrib/admin/views/doc.py:47
 #: contrib/admin/views/doc.py:49
 #: contrib/admin/views/doc.py:51
@@ -1064,667 +922,257 @@
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s no sembla ser un objecte 'urlpattern'"
 
-#: contrib/admin/views/auth.py:31
-msgid "Add user"
-msgstr "Afegir usuari"
+#: contrib/admin/views/main.py:230
+msgid "Site administration"
+msgstr "Lloc administratiu"
 
-#: contrib/admin/views/auth.py:58
-msgid "Password changed successfully."
-msgstr "Canvi de clau exitós"
-
-#: contrib/admin/views/auth.py:65
+#: contrib/admin/views/main.py:278
+#: contrib/admin/views/main.py:363
 #, python-format
-msgid "Change password: %s"
-msgstr "Canviar clau: %s"
+msgid "You may add another %s below."
+msgstr "Pot afegir un altre %s a baix."
 
-#: contrib/admin/templatetags/admin_list.py:254
-msgid "All dates"
-msgstr "Totes les dates"
-
-#: contrib/admin/templates/admin/pagination.html:10
-msgid "Show all"
-msgstr "Mostrar tots"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
-msgid "Documentation"
-msgstr "Documentació"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin/auth/user/change_password.html:15
-#: contrib/admin/templates/admin/auth/user/change_password.html:46
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
-msgid "Change password"
-msgstr "Canviar clau"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/comments/templates/comments/form.html:6
-msgid "Log out"
-msgstr "Finalitzar sessió"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/admin/change_form.html:13
-#: contrib/admin/templates/admin/change_list.html:6
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/base.html:30
-#: contrib/admin/templates/admin/auth/user/change_password.html:12
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_done.html:4
-msgid "Home"
-msgstr "Inici"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:9
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Delete"
-msgstr "Eliminar"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/views/main.py:296
 #, python-format
-msgid "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "Eliminar el/la %(object_name)s '%(escaped_object)s' provocaria l'eliminació d'objectes relacionats, però el seu compte no te permisos per a esborrar els tipus d'objecte següents:"
+msgid "Add %s"
+msgstr "Afegir %s"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:21
+#: contrib/admin/views/main.py:342
 #, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:"
-msgstr "Està segur de voler esborrar els/les %(object_name)s \"%(escaped_object)s\"? S'esborraran els següents elements relacionats:"
+msgid "Added %s."
+msgstr "Agregat %s."
 
-#: contrib/admin/templates/admin/delete_confirmation.html:26
-msgid "Yes, I'm sure"
-msgstr "Si, estic segur"
+#: contrib/admin/views/main.py:342
+#: contrib/admin/views/main.py:344
+#: contrib/admin/views/main.py:346
+#: core/validators.py:283
+#: db/models/manipulators.py:309
+msgid "and"
+msgstr "i"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "No s'ha pogut trobar la pàgina"
+#: contrib/admin/views/main.py:344
+#, python-format
+msgid "Changed %s."
+msgstr "Modificat %s."
 
-#: contrib/admin/templates/admin/404.html: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 solicitada"
-
-#: contrib/admin/templates/admin/change_form.html:15
-#: contrib/admin/templates/admin/index.html:28
-msgid "Add"
-msgstr "Afegir"
-
-#: contrib/admin/templates/admin/change_form.html:21
-#: contrib/admin/templates/admin/object_history.html:5
-msgid "History"
-msgstr "Històric"
-
-#: contrib/admin/templates/admin/change_form.html:22
-msgid "View on site"
-msgstr "Veure en el lloc"
-
-#: contrib/admin/templates/admin/change_form.html:32
-#: contrib/admin/templates/admin/auth/user/change_password.html:24
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Si us plau, corregeixi l'error mostrat abaix."
-msgstr[1] "Si us plau, corregeixi els errors mostrats abaix."
-
-#: contrib/admin/templates/admin/change_form.html:50
-msgid "Ordering"
-msgstr "Ordre"
-
-#: contrib/admin/templates/admin/change_form.html:53
-msgid "Order:"
-msgstr "Ordre:"
-
-#: contrib/admin/templates/admin/filter.html:2
+#: contrib/admin/views/main.py:346
 #, python-format
-msgid " By %(filter_title)s "
-msgstr "Per %(filter_title)s "
+msgid "Deleted %s."
+msgstr "Eliminat %s."
 
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
-msgstr "Desar com a nou"
+#: contrib/admin/views/main.py:349
+msgid "No fields changed."
+msgstr "Cap camp canviat."
 
-#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
-msgstr "Desar i afegir-ne un de nou"
-
-#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
-msgstr "Desar i continuar editant"
-
-#: contrib/admin/templates/admin/submit_line.html:7
-msgid "Save"
-msgstr "Desar"
-
-#: contrib/admin/templates/admin/change_list.html:12
+#: contrib/admin/views/main.py:352
 #, python-format
-msgid "Add %(name)s"
-msgstr "Afegir %(name)s"
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "S'ha modificat amb èxist el/la %(name)s \"%(obj)s."
 
-#: contrib/admin/templates/admin/index.html:17
+#: contrib/admin/views/main.py:360
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Models disponibles en la aplicació %(name)s."
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "S'ha agregat amb èxit el/la %(name)s \"%(obj)s\". Pot editar-lo de nou abaix."
 
-#: contrib/admin/templates/admin/index.html:18
+#: contrib/admin/views/main.py:398
 #, python-format
-msgid "%(name)s"
-msgstr "%(name)s"
+msgid "Change %s"
+msgstr "Modificar %s"
 
-#: contrib/admin/templates/admin/index.html:34
-msgid "Change"
-msgstr "Modificar"
-
-#: contrib/admin/templates/admin/index.html:44
-msgid "You don't have permission to edit anything."
-msgstr "No té permís per editar res."
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "Recent Actions"
-msgstr "Accions recents"
-
-#: contrib/admin/templates/admin/index.html:53
-msgid "My Actions"
-msgstr "Les meves accions"
-
-#: contrib/admin/templates/admin/index.html:57
-msgid "None available"
-msgstr "Cap disponible"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Lloc administratiu de Django"
-
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Adminsitració de Django"
-
-#: contrib/admin/templates/admin/object_history.html:18
-msgid "Date/time"
-msgstr "Data/hora"
-
-#: contrib/admin/templates/admin/object_history.html:19
-msgid "User"
-msgstr "Usuari"
-
-#: contrib/admin/templates/admin/object_history.html:20
-msgid "Action"
-msgstr "Acció"
-
-#: contrib/admin/templates/admin/object_history.html:26
-msgid "DATE_WITH_TIME_FULL"
-msgstr "F j, Y, H:i "
-
-#: contrib/admin/templates/admin/object_history.html:36
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
-msgstr "Aquest objecte no te historial de canvis. Probablement no va ser afegit utilitzant aquest lloc administratiu."
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Error del servidor"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Error del servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Error del servidor <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
-msgstr "Hi ha hagut un error. S'ha informat als administradors del lloc per correu electrònic y hauria d'arreglar-se en breu. Gràcies per la seva paciència."
-
-#: contrib/admin/templates/admin/invalid_setup.html:8
-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 teva base de dades. Assegurat de que s'han creat les taules, i de que la base de dades és llegible per l'usuari apropiat."
-
-#: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
-msgstr "Cercar"
-
-#: contrib/admin/templates/admin/search_form.html:10
+#: contrib/admin/views/main.py:483
 #, python-format
-msgid "1 result"
-msgid_plural "%(counter)s results"
-msgstr[0] "1 resultat"
-msgstr[1] "%(counter)s resultats"
+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/templates/admin/search_form.html:10
+#: contrib/admin/views/main.py:488
 #, python-format
-msgid "%(full_result_count)s total"
-msgstr "%(full_result_count)s en total"
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Un o més %(fieldname)s en %(name)s:"
 
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "Filtre"
-
-#: contrib/admin/templates/admin/login.html:17
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/comments/templates/comments/form.html:8
-msgid "Username:"
-msgstr "Usuari:"
-
-#: contrib/admin/templates/admin/login.html:20
-#: contrib/comments/templates/comments/form.html:8
-msgid "Password:"
-msgstr "Contrasenya:"
-
-#: contrib/admin/templates/admin/base.html:25
-msgid "Welcome,"
-msgstr "Benvingut,"
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:6
-msgid "First, enter a username and password. Then, you'll be able to edit more user options."
-msgstr "Primer, entri un usuari i una contrasenya. Després podrà editar més opcions del usuari."
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
-msgid "Username"
-msgstr "Usuari"
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
-#: contrib/admin/templates/admin/auth/user/change_password.html:34
-msgid "Password"
-msgstr "Contrasenya"
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
-msgid "Password (again)"
-msgstr "Contrasenya (de nou)"
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
-msgid "Enter the same password as above, for verification."
-msgstr "Introdueixi la mateixa contrasenya que a sobre, per a verificació."
-
-#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#: contrib/admin/views/main.py:520
 #, python-format
-msgid "Enter a new password for the user <strong>%(username)s</strong>."
-msgstr "Introdueixi una contrasenya per l'usuari <strong>%(username)s</strong>"
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "El/la %(name)s \"%(obj)s\".ha estat eliminat amb èxit."
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Bookmarklets"
-msgstr "'Bookmarklets'"
+#: contrib/admin/views/main.py:523
+msgid "Are you sure?"
+msgstr "Està segur?"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:5
-msgid "Documentation bookmarklets"
-msgstr "'Bookmarklets' de documentació"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:9
-msgid ""
-"\n"
-"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
-"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
-"select the bookmarklet from any page in the site.  Note that some of these\n"
-"bookmarklets require you to be viewing the site from a computer designated\n"
-"as \"internal\" (talk to your system administrator if you aren't sure if\n"
-"your computer is \"internal\").</p>\n"
-msgstr ""
-"\n"
-"<p class=\"help\">Per a instalar 'bookmarklets', arrosegui l'enllaç a la seva barra de\n"
-"marcadors, o faci click amb el botò dret en l'enllaç i afegeixi'l als marcadors.\n"
-"Ara pot escollir el 'bookmarklet' des de qualsevol pàgina del lloc.\n"
-"Observi que alguns d'aquests 'bookmarklets' precisen que estigui veient\n"
-"el lloc des de un ordinador senyalat com a \"intern\" (parli\n"
-"amb el seu administrador de sistemes si no està segur de la condició del seu).</p>\n"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid "Documentation for this page"
-msgstr "Documentació d'aquesta pàgina"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid "Jumps you from any page to the documentation for the view that generates that page."
-msgstr "El porta des de qualsevol pàgina de la documentació a la vista que la genera."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid "Show object ID"
-msgstr "Mostra el ID de l'objecte"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "Mostra el 'content-type' (tipus de contingut) i el ID inequívoc de les pàgines que representen un únic objecte."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
-msgstr "Editar aquest objecte (finestra actual)"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-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/admin/templates/admin_doc/bookmarklets.html:28
-msgid "Edit this object (new window)"
-msgstr "Editar aquest objecte (nova finestra)"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
-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/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Data:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Hora:"
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Actualment:"
-
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Modificar:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-#: contrib/admin/templates/registration/password_reset_form.html:10
-#: contrib/admin/templates/registration/password_reset_done.html:4
-msgid "Password reset"
-msgstr "Restablir contrasenya"
-
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
-msgstr "Ha oblidat la seva contrasenya? Introdueixi la seva adreça de correu electrònic i crearem una nova que li enviarem per correu."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "Adreça de correu electrònic:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Restablir la meva contrasenya"
-
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "Està rebent aquest missatge degut a que va solicitar un restabliment de contrasenya."
-
-#: contrib/admin/templates/registration/password_reset_email.html:3
+#: contrib/admin/views/main.py:545
 #, python-format
-msgid "for your user account at %(site_name)s"
-msgstr "del seu compte d'usuari a %(site_name)s."
+msgid "Change history: %s"
+msgstr "Modificar històric: %s"
 
-#: contrib/admin/templates/registration/password_reset_email.html:5
+#: contrib/admin/views/main.py:579
 #, python-format
-msgid "Your new password is: %(new_password)s"
-msgstr "La seva nova contrasenya és: %(new_password)s"
+msgid "Select %s"
+msgstr "Seleccioni %s"
 
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
-msgstr "Sentis lliure de canviar-la en aquesta pàgina:"
-
-#: contrib/admin/templates/registration/password_reset_email.html:11
-msgid "Your username, in case you've forgotten:"
-msgstr "El seu nom d'usuari, en cas d'haver-lo oblidat:"
-
-#: contrib/admin/templates/registration/password_reset_email.html:13
-msgid "Thanks for using our site!"
-msgstr "Gràcies per fer us del nostre lloc!"
-
-#: contrib/admin/templates/registration/password_reset_email.html:15
+#: contrib/admin/views/main.py:579
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "L'equip de %(site_name)s"
+msgid "Select %s to change"
+msgstr "Seleccioni %s per modificar"
 
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Gràcies per emprar algun temps de cualitat amb el lloc web avui."
+#: contrib/admin/views/main.py:780
+msgid "Database error"
+msgstr "Error de/en la base de dades"
 
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Iniciar sessió de nou"
+#: contrib/auth/forms.py:17
+#: contrib/auth/forms.py:138
+msgid "The two password fields didn't match."
+msgstr "Els dos camps de contrasenya no coincideixen."
 
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Contrasenya restaber-ta amb èxit"
+#: contrib/auth/forms.py:25
+msgid "A user with that username already exists."
+msgstr "Ja existeix un usuari amb aquest nom."
 
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "Li hem enviat una contrasenya nova a l'adreça de correu electrònic que ens ha indicat. L'hauria de rebre en breu."
+#: contrib/auth/forms.py:53
+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ó."
 
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_form.html:6
-#: contrib/admin/templates/registration/password_change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:4
-msgid "Password change"
-msgstr "Canvi de clau"
+#: contrib/auth/forms.py:62
+msgid "This account is inactive."
+msgstr "Aquest compte està inactiu"
 
-#: contrib/admin/templates/registration/password_change_form.html:12
-msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
-msgstr "Si us plau, introdueixi la seva contrasenya antiga, per seguretat, i tot seguit introdueixi la seva nova contrasenya dues vegades per verificar que l'ha escrit correctament."
+#: contrib/auth/forms.py:84
+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. Està segur de que s'ha registrat?"
 
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
-msgstr "Contrasenya antiga:"
+#: contrib/auth/forms.py:117
+msgid "The two 'new password' fields didn't match."
+msgstr "Els dos camps de nova contrasenya no coincideixen."
 
-#: contrib/admin/templates/registration/password_change_form.html:19
-msgid "New password:"
-msgstr "Contrasenya nova:"
+#: contrib/auth/forms.py:124
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "La seva antiga contrasenya no és correcte. Si el plau, introdueixi-la de nou."
 
-#: contrib/admin/templates/registration/password_change_form.html:21
-msgid "Confirm password:"
-msgstr "Confirmar contrasenya:"
+#: contrib/auth/models.py:73
+#: contrib/auth/models.py:93
+msgid "name"
+msgstr "nom"
 
-#: contrib/admin/templates/registration/password_change_form.html:23
-msgid "Change my password"
-msgstr "Canviar la meva clau:"
+#: contrib/auth/models.py:75
+msgid "codename"
+msgstr "nom en clau"
 
-#: contrib/admin/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/registration/password_change_done.html:10
-msgid "Password change successful"
-msgstr "Canvi de clau exitò"
+#: contrib/auth/models.py:78
+msgid "permission"
+msgstr "permís"
 
-#: contrib/admin/templates/registration/password_change_done.html:12
-msgid "Your password was changed."
-msgstr "La seva clau ha estat canviada."
+#: contrib/auth/models.py:79
+#: contrib/auth/models.py:94
+msgid "permissions"
+msgstr "permissos"
 
-#: contrib/sites/models.py:33
-msgid "domain name"
-msgstr "nom del domini"
+#: contrib/auth/models.py:97
+msgid "group"
+msgstr "grup"
 
-#: contrib/sites/models.py:34
-msgid "display name"
-msgstr "nom per mostrar"
+#: contrib/auth/models.py:98
+#: contrib/auth/models.py:141
+msgid "groups"
+msgstr "grups"
 
-#: contrib/sites/models.py:38
-msgid "site"
-msgstr "lloc"
+#: contrib/auth/models.py:131
+msgid "username"
+msgstr "nom d'usuari"
 
-#: contrib/sites/models.py:39
-msgid "sites"
-msgstr "llocs"
+#: contrib/auth/models.py:131
+msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
+msgstr "Requerit. 30 o menys caracters. Només caracters alfanumèrics (lletres, dígits i guions baixos)."
 
-#: contrib/humanize/templatetags/humanize.py:20
-msgid "th"
-msgstr "rt"
+#: contrib/auth/models.py:132
+msgid "first name"
+msgstr "nom propi"
 
-#: contrib/humanize/templatetags/humanize.py:20
-msgid "st"
-msgstr "r"
+#: contrib/auth/models.py:133
+msgid "last name"
+msgstr "cognoms"
 
-#: contrib/humanize/templatetags/humanize.py:20
-msgid "nd"
-msgstr "n"
+#: contrib/auth/models.py:134
+msgid "e-mail address"
+msgstr "adreça de correu electrònic"
 
-#: contrib/humanize/templatetags/humanize.py:20
-msgid "rd"
-msgstr "r"
+#: contrib/auth/models.py:135
+msgid "password"
+msgstr "contrasenya"
 
-#: contrib/humanize/templatetags/humanize.py:50
-#, python-format
-msgid "%(value).1f million"
-msgid_plural "%(value).1f million"
-msgstr[0] "%(value).1f milió"
-msgstr[1] "%(value).1f  milions"
+#: contrib/auth/models.py:135
+msgid "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."
+msgstr "Utilitzi '[algo]$[salt]$[hexdigest]' o el <a href=\"password/\">formulari de canvi de contrasenya</a>."
 
-#: contrib/humanize/templatetags/humanize.py:53
-#, python-format
-msgid "%(value).1f billion"
-msgid_plural "%(value).1f billion"
-msgstr[0] "%(value).1f bilió"
-msgstr[1] "%(value).1f bilions"
+#: contrib/auth/models.py:136
+msgid "staff status"
+msgstr "és membre del personal"
 
-#: contrib/humanize/templatetags/humanize.py:56
-#, python-format
-msgid "%(value).1f trillion"
-msgid_plural "%(value).1f trillion"
-msgstr[0] "%(value).1f trilió"
-msgstr[1] "%(value).1f trilions"
+#: contrib/auth/models.py:136
+msgid "Designates whether the user can log into this admin site."
+msgstr "Indica si l'usuari pot entrar en el lloc administratiu."
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "one"
-msgstr "un"
+#: contrib/auth/models.py:137
+msgid "active"
+msgstr "actiu"
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "two"
-msgstr "dos"
+#: contrib/auth/models.py:137
+msgid "Designates whether this user can log into the Django admin. Unselect this instead of deleting accounts."
+msgstr "Designa si aquest usuari pot iniciar sessió a la interfície administrativa Djano. Deselecciona-ho enlloc de esborrar comptes d'usuari."
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "three"
-msgstr "tres"
+#: contrib/auth/models.py:138
+msgid "superuser status"
+msgstr "estat de superusuari"
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "four"
-msgstr "cuatre"
+#: contrib/auth/models.py:138
+msgid "Designates that this user has all permissions without explicitly assigning them."
+msgstr "Designa que aquest usuari té tots els permisos sense assignar-los explícitament."
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "five"
-msgstr "cinc"
+#: contrib/auth/models.py:139
+msgid "last login"
+msgstr "últim inici de sessió"
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "six"
-msgstr "sis"
+#: contrib/auth/models.py:140
+msgid "date joined"
+msgstr "data de creació"
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "seven"
-msgstr "set"
+#: contrib/auth/models.py:142
+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."
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "eight"
-msgstr "vuit"
+#: contrib/auth/models.py:143
+msgid "user permissions"
+msgstr "permissos de l'usuari"
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "nine"
-msgstr "nou"
+#: contrib/auth/models.py:147
+msgid "user"
+msgstr "usuari"
 
-#: contrib/humanize/templatetags/humanize.py:90
-msgid "today"
-msgstr "avui"
+#: contrib/auth/models.py:148
+msgid "users"
+msgstr "usuaris"
 
-#: contrib/humanize/templatetags/humanize.py:92
-msgid "tomorrow"
-msgstr "demà"
+#: contrib/auth/models.py:154
+msgid "Personal info"
+msgstr "Informaciò personal"
 
-#: contrib/humanize/templatetags/humanize.py:94
-msgid "yesterday"
-msgstr "ahir"
+#: contrib/auth/models.py:155
+msgid "Permissions"
+msgstr "permissos"
 
-#: contrib/flatpages/models.py:8
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "Exemple: '/about/contact/'. Asseguri's de posar les barres al principi i al final."
+#: contrib/auth/models.py:156
+msgid "Important dates"
+msgstr "Dates importants"
 
-#: contrib/flatpages/models.py:9
-msgid "title"
-msgstr "tìtol"
+#: contrib/auth/models.py:157
+msgid "Groups"
+msgstr "Grups"
 
-#: contrib/flatpages/models.py:10
-msgid "content"
-msgstr "contingut"
+#: contrib/auth/models.py:316
+msgid "message"
+msgstr "missatge"
 
-#: contrib/flatpages/models.py:11
-msgid "enable comments"
-msgstr "habilitar comentaris"
+#: contrib/auth/views.py:47
+msgid "Logged out"
+msgstr "Sessió finalitzada"
 
-#: contrib/flatpages/models.py:12
-msgid "template name"
-msgstr "nom de la plantilla"
-
-#: contrib/flatpages/models.py:13
-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 el proporciona, el sistema utilitzarà 'flatpages/defaula.htmlt'."
-
-#: contrib/flatpages/models.py:14
-msgid "registration required"
-msgstr "s'ha de estar registrat"
-
-#: contrib/flatpages/models.py:14
-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
-msgid "flat page"
-msgstr "pàgina estàtica"
-
-#: contrib/flatpages/models.py:19
-msgid "flat pages"
-msgstr "pàgines estàtiques"
-
-#: contrib/redirects/models.py:7
-msgid "redirect from"
-msgstr "redreçar des de"
-
-#: 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. Exemple '/events/search/'."
-
-#: contrib/redirects/models.py:9
-msgid "redirect to"
-msgstr "redreçar a"
-
-#: 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 abans) o una URL completa que comenci per http:// ."
-
-#: contrib/redirects/models.py:13
-msgid "redirect"
-msgstr "redreçament"
-
-#: contrib/redirects/models.py:14
-msgid "redirects"
-msgstr "redreçaments"
-
 #: contrib/comments/models.py:67
 #: contrib/comments/models.py:169
 msgid "object ID"
@@ -1904,18 +1352,42 @@
 msgid "Moderator deletion by %r"
 msgstr "eliminació del moderador per %r"
 
-#: contrib/comments/views/karma.py:20
-msgid "Anonymous users cannot vote"
-msgstr "Els usuaris anònims no poden votar"
+#: contrib/comments/templates/comments/form.html:8
+msgid "Forgotten your password?"
+msgstr "Contrasenya oblidada?"
 
-#: contrib/comments/views/karma.py:24
-msgid "Invalid comment ID"
-msgstr "ID del comentari invàlid"
+#: contrib/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr "Qualificacions"
 
-#: contrib/comments/views/karma.py:26
-msgid "No voting for yourself"
-msgstr "No pots votar-te a tu mateix"
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr "Requerit"
 
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr "Opcional"
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr "Enviar una fotografia"
+
+#: contrib/comments/templates/comments/form.html:28
+#: contrib/comments/templates/comments/freeform.html:5
+msgid "Comment:"
+msgstr "Comentari:"
+
+#: contrib/comments/templates/comments/form.html:35
+#: contrib/comments/templates/comments/freeform.html:10
+msgid "Preview comment"
+msgstr "Previsualitzar comentari"
+
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
+msgstr "El seu nom:"
+
 #: contrib/comments/views/comments.py:28
 msgid "This rating is required because you've entered at least one other rating."
 msgstr "Es precisa aquesta puntuació perquè has introduït almenys un altre."
@@ -1950,67 +1422,180 @@
 "\n"
 "%(text)s"
 
-#: contrib/comments/views/comments.py:189
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:283
 msgid "Only POSTs are allowed"
 msgstr "Només s'admed POST"
 
-#: contrib/comments/views/comments.py:193
-#: contrib/comments/views/comments.py:285
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:287
 msgid "One or more of the required fields wasn't submitted"
 msgstr "Un o més dels caps requerits no ha estat sotmès"
 
-#: contrib/comments/views/comments.py:197
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:198
+#: contrib/comments/views/comments.py:289
 msgid "Somebody tampered with the comment form (security violation)"
 msgstr "Algú està jugant amb el formulari de comentaris (violació de seguretat)"
 
-#: contrib/comments/views/comments.py:207
-#: contrib/comments/views/comments.py:293
+#: contrib/comments/views/comments.py:208
+#: contrib/comments/views/comments.py:295
 msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
 msgstr "El formulari de comentaris tenia un paràmetre 'target' invàlid -- el ID del objecte era invàlid"
 
-#: contrib/comments/views/comments.py:258
-#: contrib/comments/views/comments.py:322
+#: contrib/comments/views/comments.py:259
+#: contrib/comments/views/comments.py:324
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "El formulari del comentari no ha proveït ni 'previsualitzar' ni 'enviar'"
 
-#: contrib/comments/templates/comments/form.html:8
-msgid "Forgotten your password?"
-msgstr "Contrasenya oblidada?"
+#: contrib/comments/views/karma.py:21
+msgid "Anonymous users cannot vote"
+msgstr "Els usuaris anònims no poden votar"
 
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
-msgstr "Qualificacions"
+#: contrib/comments/views/karma.py:25
+msgid "Invalid comment ID"
+msgstr "ID del comentari invàlid"
 
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-msgstr "Requerit"
+#: contrib/comments/views/karma.py:27
+msgid "No voting for yourself"
+msgstr "No pots votar-te a tu mateix"
 
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
-msgstr "Opcional"
+#: contrib/contenttypes/models.py:37
+msgid "python model class name"
+msgstr "nom de la classe del model en python"
 
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
-msgstr "Enviar una fotografia"
+#: contrib/contenttypes/models.py:40
+msgid "content type"
+msgstr "tipus de contingut"
 
-#: contrib/comments/templates/comments/form.html:28
-#: contrib/comments/templates/comments/freeform.html:5
-msgid "Comment:"
-msgstr "Comentari:"
+#: contrib/contenttypes/models.py:41
+msgid "content types"
+msgstr "tipus de continguts"
 
-#: contrib/comments/templates/comments/form.html:35
-#: contrib/comments/templates/comments/freeform.html:10
-msgid "Preview comment"
-msgstr "Previsualitzar comentari"
+#: contrib/flatpages/models.py:8
+msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr "Exemple: '/about/contact/'. Asseguri's de posar les barres al principi i al final."
 
-#: contrib/comments/templates/comments/freeform.html:4
-msgid "Your name:"
-msgstr "El seu nom:"
+#: contrib/flatpages/models.py:9
+msgid "title"
+msgstr "tìtol"
 
+#: contrib/flatpages/models.py:10
+msgid "content"
+msgstr "contingut"
+
+#: contrib/flatpages/models.py:11
+msgid "enable comments"
+msgstr "habilitar comentaris"
+
+#: contrib/flatpages/models.py:12
+msgid "template name"
+msgstr "nom de la plantilla"
+
+#: contrib/flatpages/models.py:13
+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 el proporciona, el sistema utilitzarà 'flatpages/defaula.htmlt'."
+
+#: contrib/flatpages/models.py:14
+msgid "registration required"
+msgstr "s'ha de estar registrat"
+
+#: contrib/flatpages/models.py:14
+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
+msgid "flat page"
+msgstr "pàgina estàtica"
+
+#: contrib/flatpages/models.py:19
+msgid "flat pages"
+msgstr "pàgines estàtiques"
+
+#: contrib/humanize/templatetags/humanize.py:20
+msgid "th"
+msgstr "rt"
+
+#: contrib/humanize/templatetags/humanize.py:20
+msgid "st"
+msgstr "r"
+
+#: contrib/humanize/templatetags/humanize.py:20
+msgid "nd"
+msgstr "n"
+
+#: contrib/humanize/templatetags/humanize.py:20
+msgid "rd"
+msgstr "r"
+
+#: contrib/humanize/templatetags/humanize.py:50
+#, 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:53
+#, 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:56
+#, 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:71
+msgid "one"
+msgstr "un"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "two"
+msgstr "dos"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "three"
+msgstr "tres"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "four"
+msgstr "cuatre"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "five"
+msgstr "cinc"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "six"
+msgstr "sis"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "seven"
+msgstr "set"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "eight"
+msgstr "vuit"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "nine"
+msgstr "nou"
+
+#: contrib/humanize/templatetags/humanize.py:90
+msgid "today"
+msgstr "avui"
+
+#: contrib/humanize/templatetags/humanize.py:92
+msgid "tomorrow"
+msgstr "demà"
+
+#: contrib/humanize/templatetags/humanize.py:94
+msgid "yesterday"
+msgstr "ahir"
+
 #: contrib/localflavor/ar/forms.py:30
 #: contrib/localflavor/ar/forms.py:38
 msgid "Enter a postal code in the format NNNN or ANNNNAAA."
@@ -2018,6 +1603,8 @@
 
 #: contrib/localflavor/ar/forms.py:61
 #: contrib/localflavor/br/forms.py:103
+#: contrib/localflavor/pe/forms.py:34
+#: contrib/localflavor/pe/forms.py:57
 msgid "This field requires only numbers."
 msgstr "Aquest camps requereix només números."
 
@@ -2065,14 +1652,13 @@
 msgid "Invalid CNPJ number."
 msgstr "Número CNPJ invàlid."
 
-#: contrib/localflavor/ch/forms.py:18
-#: contrib/localflavor/no/forms.py:14
-msgid "Enter a zip code in the format XXXX."
-msgstr "Introdueixi un codi zip en el format XXXX."
+#: contrib/localflavor/ca/forms.py:19
+msgid "Enter a postal code in the format XXX XXX."
+msgstr "Introdueixi un codi postal en el format XXX XXX."
 
-#: contrib/localflavor/ch/forms.py:90
-msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format."
-msgstr "Introdueixi un número de identificació o de passaport Suïssos en els formats 1234567890 o X1234567<0."
+#: contrib/localflavor/ca/forms.py:81
+msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXXX format."
+msgstr "Introdueixi un número vàlid de la Seguretat Social de Canada en el format XXX-XXX-XXXX."
 
 #: contrib/localflavor/ch/ch_states.py:5
 msgid "Aargau"
@@ -2178,6 +1764,15 @@
 msgid "Zurich"
 msgstr "Zurich"
 
+#: contrib/localflavor/ch/forms.py:18
+#: contrib/localflavor/no/forms.py:14
+msgid "Enter a zip code in the format XXXX."
+msgstr "Introdueixi un codi zip en el format XXXX."
+
+#: contrib/localflavor/ch/forms.py:90
+msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format."
+msgstr "Introdueixi un número de identificació o de passaport Suïssos en els formats 1234567890 o X1234567<0."
+
 #: contrib/localflavor/cl/forms.py:32
 msgid "Enter valid a Chilean RUT. The format is XX.XXX.XXX-X."
 msgstr "Introdueixi un RUT Xilè vàlid. El format és XX.XXX.XXX-X"
@@ -2186,16 +1781,6 @@
 msgid "Enter valid a Chilean RUT"
 msgstr "Introdueixi un RUT Xilè vàlid."
 
-#: contrib/localflavor/de/forms.py:16
-#: contrib/localflavor/fi/forms.py:14
-#: contrib/localflavor/fr/forms.py:17
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Introdueixi un codi zip en el format XXXXX."
-
-#: contrib/localflavor/de/forms.py:60
-msgid "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format."
-msgstr "Introdueixi un número de tarjeta d'identificació alemany vàlid en el format XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
 #: contrib/localflavor/de/de_states.py:5
 msgid "Baden-Wuerttemberg"
 msgstr "Baden-Wuerttemberg"
@@ -2260,11 +1845,335 @@
 msgid "Thuringia"
 msgstr "Thuringia"
 
+#: contrib/localflavor/de/forms.py:16
+#: contrib/localflavor/fi/forms.py:14
+#: contrib/localflavor/fr/forms.py:17
+msgid "Enter a zip code in the format XXXXX."
+msgstr "Introdueixi un codi zip en el format XXXXX."
+
+#: contrib/localflavor/de/forms.py:60
+msgid "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format."
+msgstr "Introdueixi un número de tarjeta d'identificació alemany vàlid en el format XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
+
+#: contrib/localflavor/es/es_provinces.py:5
+msgid "Arava"
+msgstr "Àlaba"
+
+#: contrib/localflavor/es/es_provinces.py:6
+msgid "Albacete"
+msgstr "Albacete"
+
+#: contrib/localflavor/es/es_provinces.py:7
+msgid "Alacant"
+msgstr "Alacant"
+
+#: contrib/localflavor/es/es_provinces.py:8
+msgid "Almeria"
+msgstr "Almeria"
+
+#: contrib/localflavor/es/es_provinces.py:9
+msgid "Avila"
+msgstr "Àvila"
+
+#: contrib/localflavor/es/es_provinces.py:10
+msgid "Badajoz"
+msgstr "Badajoz"
+
+#: contrib/localflavor/es/es_provinces.py:11
+msgid "Illes Balears"
+msgstr "Illes Balears"
+
+#: contrib/localflavor/es/es_provinces.py:12
+msgid "Barcelona"
+msgstr "Barcelona"
+
+#: contrib/localflavor/es/es_provinces.py:13
+msgid "Burgos"
+msgstr "Burgos"
+
+#: contrib/localflavor/es/es_provinces.py:14
+msgid "Caceres"
+msgstr "Càceres"
+
+#: contrib/localflavor/es/es_provinces.py:15
+msgid "Cadiz"
+msgstr "Cadis"
+
+#: contrib/localflavor/es/es_provinces.py:16
+msgid "Castello"
+msgstr "Castelló"
+
+#: contrib/localflavor/es/es_provinces.py:17
+msgid "Ciudad Real"
+msgstr "Ciudad Real"
+
+#: contrib/localflavor/es/es_provinces.py:18
+msgid "Cordoba"
+msgstr "Còrdova"
+
+#: contrib/localflavor/es/es_provinces.py:19
+msgid "A Coruna"
+msgstr "La Corunya"
+
+#: contrib/localflavor/es/es_provinces.py:20
+msgid "Cuenca"
+msgstr "Conca"
+
+#: contrib/localflavor/es/es_provinces.py:21
+msgid "Girona"
+msgstr "Girona"
+
+#: contrib/localflavor/es/es_provinces.py:22
+msgid "Granada"
+msgstr "Granada"
+
+#: contrib/localflavor/es/es_provinces.py:23
+msgid "Guadalajara"
+msgstr "Guadalajara"
+
+#: contrib/localflavor/es/es_provinces.py:24
+msgid "Guipuzkoa"
+msgstr "Guipúscoa"
+
+#: contrib/localflavor/es/es_provinces.py:25
+msgid "Huelva"
+msgstr "Huelva"
+
+#: contrib/localflavor/es/es_provinces.py:26
+msgid "Huesca"
+msgstr "Osca"
+
+#: contrib/localflavor/es/es_provinces.py:27
+msgid "Jaen"
+msgstr "Jaén"
+
+#: contrib/localflavor/es/es_provinces.py:28
+msgid "Leon"
+msgstr "Lleó"
+
+#: 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
+msgid "La Rioja"
+msgstr "La Rioja"
+
+#: 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
+msgid "Madrid"
+msgstr "Madrid"
+
+#: contrib/localflavor/es/es_provinces.py:33
+msgid "Malaga"
+msgstr "Màlaga"
+
+#: contrib/localflavor/es/es_provinces.py:34
+msgid "Murcia"
+msgstr "Múrcia"
+
+#: contrib/localflavor/es/es_provinces.py:35
+msgid "Navarre"
+msgstr "Navarra"
+
+#: contrib/localflavor/es/es_provinces.py:36
+msgid "Ourense"
+msgstr "Ourense"
+
+#: contrib/localflavor/es/es_provinces.py:37
+msgid "Asturias"
+msgstr "Astúries"
+
+#: contrib/localflavor/es/es_provinces.py:38
+msgid "Palencia"
+msgstr "Palència"
+
+#: contrib/localflavor/es/es_provinces.py:39
+msgid "Las Palmas"
+msgstr "Las Palmas"
+
+#: contrib/localflavor/es/es_provinces.py:40
+msgid "Pontevedra"
+msgstr "Pontevedra"
+
+#: contrib/localflavor/es/es_provinces.py:41
+msgid "Salamanca"
+msgstr "Salamanca"
+
+#: 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
+msgid "Cantabria"
+msgstr "Cantàbria"
+
+#: contrib/localflavor/es/es_provinces.py:44
+msgid "Segovia"
+msgstr "Segòvia"
+
+#: contrib/localflavor/es/es_provinces.py:45
+msgid "Seville"
+msgstr "Sevilla"
+
+#: contrib/localflavor/es/es_provinces.py:46
+msgid "Soria"
+msgstr "Sòria"
+
+#: contrib/localflavor/es/es_provinces.py:47
+msgid "Tarragona"
+msgstr "Tarragona"
+
+#: contrib/localflavor/es/es_provinces.py:48
+msgid "Teruel"
+msgstr "Terol"
+
+#: contrib/localflavor/es/es_provinces.py:49
+msgid "Toledo"
+msgstr "Toledo"
+
+#: contrib/localflavor/es/es_provinces.py:50
+msgid "Valencia"
+msgstr "València"
+
+#: contrib/localflavor/es/es_provinces.py:51
+msgid "Valladolid"
+msgstr "Valladolid"
+
+#: contrib/localflavor/es/es_provinces.py:52
+msgid "Bizkaia"
+msgstr "Biscaia"
+
+#: contrib/localflavor/es/es_provinces.py:53
+msgid "Zamora"
+msgstr "Zamora"
+
+#: contrib/localflavor/es/es_provinces.py:54
+msgid "Zaragoza"
+msgstr "Saragossa"
+
+#: contrib/localflavor/es/es_provinces.py:55
+msgid "Ceuta"
+msgstr "Ceuta"
+
+#: contrib/localflavor/es/es_provinces.py:56
+msgid "Melilla"
+msgstr "Melilla"
+
+#: contrib/localflavor/es/es_regions.py:5
+msgid "Andalusia"
+msgstr "Andalusia"
+
+#: contrib/localflavor/es/es_regions.py:6
+msgid "Aragon"
+msgstr "Aragó"
+
+#: contrib/localflavor/es/es_regions.py:7
+msgid "Principality of Asturias"
+msgstr "Principat d'Astúries"
+
+#: contrib/localflavor/es/es_regions.py:8
+msgid "Balearic Islands"
+msgstr "Illes Balears"
+
+#: contrib/localflavor/es/es_regions.py:9
+msgid "Basque Country"
+msgstr "Euskadi"
+
+#: contrib/localflavor/es/es_regions.py:10
+msgid "Canary Islands"
+msgstr "Canàries"
+
+#: contrib/localflavor/es/es_regions.py:12
+msgid "Castile-La Mancha"
+msgstr "Castella-La Mancha"
+
+#: contrib/localflavor/es/es_regions.py:13
+msgid "Castile and Leon"
+msgstr "Castella i Lleó"
+
+#: contrib/localflavor/es/es_regions.py:14
+msgid "Catalonia"
+msgstr "Catalunya"
+
+#: contrib/localflavor/es/es_regions.py:15
+msgid "Extremadura"
+msgstr "Extremadura"
+
+#: contrib/localflavor/es/es_regions.py:16
+msgid "Galicia"
+msgstr "Galícia"
+
+#: contrib/localflavor/es/es_regions.py:19
+msgid "Region of Murcia"
+msgstr "Regió de Múrcia"
+
+#: contrib/localflavor/es/es_regions.py:20
+msgid "Foral Community of Navarre"
+msgstr "Comunitat Foral de Navarra"
+
+#: contrib/localflavor/es/es_regions.py:21
+msgid "Valencian Community"
+msgstr "Comunitat Valenciana"
+
+#: contrib/localflavor/es/forms.py:22
+msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
+msgstr "Introdueixi un codi postal en rang i format 01XXX - 52XXX."
+
+#: contrib/localflavor/es/forms.py:39
+msgid "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX."
+msgstr "Introdueixi un número de telèfon vàlid en un dels formats 6XXXXXXXX, 8XXXXXXXX o 9XXXXXXXX."
+
+#: contrib/localflavor/es/forms.py:73
+#: contrib/localflavor/es/forms.py:108
+#: db/models/fields/related.py:55
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Si us plau, introdueixi un %s vàlid."
+
+#: contrib/localflavor/es/forms.py:91
+msgid "Invalid checksum for NIF."
+msgstr "Validació invàlida del NIF."
+
+#: contrib/localflavor/es/forms.py:97
+msgid "Invalid checksum for NIE."
+msgstr "Validació invàlida del NIE."
+
+#: contrib/localflavor/es/forms.py:106
+msgid "Invalid checksum for CIF."
+msgstr "Validació invàlida del CIF."
+
+#: contrib/localflavor/es/forms.py:136
+msgid "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
+msgstr "Introdueixi un número de compte bancari vàlid en el format XXXX-XXXX-XX-XXXXXXXXXX."
+
+#: contrib/localflavor/es/forms.py:150
+msgid "Invalid checksum for bank account number."
+msgstr "Validació invàlida del número de compte bancari."
+
 #: contrib/localflavor/fi/forms.py:40
 #: contrib/localflavor/fi/forms.py:45
 msgid "Enter a valid Finnish social security number."
 msgstr "Introdueixi un número vàlid de la seguretat social finlandesa."
 
+#: contrib/localflavor/in_/forms.py:16
+msgid "Enter a zip code in the format XXXXXXX."
+msgstr "Introdueixi un codi zip en el format XXXXXXX."
+
+#: contrib/localflavor/is_/forms.py:17
+msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
+msgstr "Introdueixi un número de identificació d'Islàndia. El format és XXXXXX-XXXX."
+
+#: contrib/localflavor/is_/forms.py:31
+msgid "The Icelandic identification number is not valid."
+msgstr "El número de identificació d'Islàndia no és vàlid."
+
 #: contrib/localflavor/it/forms.py:16
 msgid "Enter a valid zip code."
 msgstr "Introdueixi un codi zip vàlid."
@@ -2533,19 +2442,39 @@
 msgid "Enter a valid Norwegian social security number."
 msgstr "Introdueixi un número de la seguretat social Noruega vàlid."
 
-#: contrib/localflavor/pl/forms.py:53
+#: contrib/localflavor/pe/forms.py:36
+msgid "This field requires 8 digits."
+msgstr "Aquest camp requereix 8 dígits."
+
+#: contrib/localflavor/pe/forms.py:59
+msgid "This field requires 11 digits."
+msgstr "Aquest camp requereix 11 dígits."
+
+#: contrib/localflavor/pl/forms.py:41
 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:59
+#: contrib/localflavor/pl/forms.py:47
 msgid "Wrong checksum for the National Identification Number."
 msgstr "Validació invàlida del número d'identificació nacional."
 
-#: contrib/localflavor/pl/forms.py:71
+#: contrib/localflavor/pl/forms.py:72
 msgid "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
 msgstr "Introdueixi un número NIP en el format XXX-XXX-XX-XX o XX-XX-XXX-XXX."
 
-#: contrib/localflavor/pl/forms.py:82
+#: contrib/localflavor/pl/forms.py:78
+msgid "Wrong checksum for the Tax Number (NIP)."
+msgstr "Validació invàlida del número tributari (NIP)."
+
+#: contrib/localflavor/pl/forms.py:107
+msgid "National Business Register Number (REGON) consists of 7 or 9 digits."
+msgstr "El número nacional de registre de negocis (REGON) consisteix en 7 o 9 dígits."
+
+#: contrib/localflavor/pl/forms.py:113
+msgid "Wrong checksum for the National Business Register Number (REGON)."
+msgstr "Validació invàlida del número nacional de registre de negocis."
+
+#: contrib/localflavor/pl/forms.py:148
 msgid "Enter a postal code in the format XX-XXX."
 msgstr "Introdueixi un codi postal en el format XX-XXX."
 
@@ -2977,50 +2906,512 @@
 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
 msgstr "Introdueixi un número vàlid de la Seguretat Social dels E.U.A. en el format XXX-XX-XXXX."
 
-#: contrib/localflavor/in_/forms.py:16
-msgid "Enter a zip code in the format XXXXXXX."
-msgstr "Introdueixi un codi zip en el format XXXXXXX."
+#: contrib/redirects/models.py:7
+msgid "redirect from"
+msgstr "redreçar des de"
 
-#: contrib/localflavor/is_/forms.py:17
-msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Introdueixi un número de identificació d'Islàndia. El format és XXXXXX-XXXX."
+#: 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. Exemple '/events/search/'."
 
-#: contrib/localflavor/is_/forms.py:31
-msgid "The Icelandic identification number is not valid."
-msgstr "El número de identificació d'Islàndia no és vàlid."
+#: contrib/redirects/models.py:9
+msgid "redirect to"
+msgstr "redreçar a"
 
-#: contrib/sessions/models.py:68
+#: 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 abans) o una URL completa que comenci per http:// ."
+
+#: contrib/redirects/models.py:13
+msgid "redirect"
+msgstr "redreçament"
+
+#: contrib/redirects/models.py:14
+msgid "redirects"
+msgstr "redreçaments"
+
+#: contrib/sessions/models.py:80
 msgid "session key"
 msgstr "clau de la sessió"
 
-#: contrib/sessions/models.py:69
+#: contrib/sessions/models.py:81
 msgid "session data"
 msgstr "dades de la sessió"
 
-#: contrib/sessions/models.py:70
+#: contrib/sessions/models.py:82
 msgid "expire date"
 msgstr "data de caducitat"
 
-#: contrib/sessions/models.py:74
+#: contrib/sessions/models.py:87
 msgid "session"
 msgstr "sessió"
 
-#: contrib/sessions/models.py:75
+#: contrib/sessions/models.py:88
 msgid "sessions"
 msgstr "sessions"
 
-#: contrib/contenttypes/models.py:37
-msgid "python model class name"
-msgstr "nom de la classe del model en python"
+#: contrib/sites/models.py:32
+msgid "domain name"
+msgstr "nom del domini"
 
-#: contrib/contenttypes/models.py:40
-msgid "content type"
-msgstr "tipus de contingut"
+#: contrib/sites/models.py:33
+msgid "display name"
+msgstr "nom per mostrar"
 
-#: contrib/contenttypes/models.py:41
-msgid "content types"
-msgstr "tipus de continguts"
+#: contrib/sites/models.py:37
+msgid "site"
+msgstr "lloc"
 
+#: contrib/sites/models.py:38
+msgid "sites"
+msgstr "llocs"
+
+#: core/validators.py:72
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Aquest valor ha de contenir només números, guions, i guions baixos."
+
+#: core/validators.py:76
+msgid "This value must contain only letters, numbers, underscores, dashes or slashes."
+msgstr "Aquest valor ha de contenir només lletres, números, guions, guions baixos, i barres (/)."
+
+#: core/validators.py:80
+msgid "This value must contain only letters, numbers, underscores or hyphens."
+msgstr "Aquest valor ha de contenir només lletres, números, guions o guions baixos"
+
+#: core/validators.py:84
+msgid "Uppercase letters are not allowed here."
+msgstr "No es permeten majúscules aquí."
+
+#: core/validators.py:88
+msgid "Lowercase letters are not allowed here."
+msgstr "No es permeten minúscules aquí."
+
+#: core/validators.py:95
+msgid "Enter only digits separated by commas."
+msgstr "Introdueixi només dígits separats per comes."
+
+#: core/validators.py:107
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "Introdueixi adreces de correu electrònic vàlides separades per comes."
+
+#: core/validators.py:111
+msgid "Please enter a valid IP address."
+msgstr "Per favor introdueixi una adreça IP vàlida."
+
+#: core/validators.py:115
+msgid "Empty values are not allowed here."
+msgstr "No s'admeten valor buits."
+
+#: core/validators.py:119
+msgid "Non-numeric characters aren't allowed here."
+msgstr "No s'admeten caracters no numèrics."
+
+#: core/validators.py:123
+msgid "This value can't be comprised solely of digits."
+msgstr "Aquest valor no pot contenir només dígits."
+
+#: core/validators.py:128
+#: newforms/fields.py:149
+msgid "Enter a whole number."
+msgstr "Introdueixi un número sencer."
+
+#: core/validators.py:132
+msgid "Only alphabetical characters are allowed here."
+msgstr "Només s'admeted caracters alfabètics aquí."
+
+#: core/validators.py:147
+msgid "Year must be 1900 or later."
+msgstr "L'any ha de ser posterior al 1900"
+
+#: core/validators.py:151
+#, python-format
+msgid "Invalid date: %s"
+msgstr "Data invàlida: %s"
+
+#: core/validators.py:156
+#: db/models/fields/__init__.py:505
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Introdueixi una data vàlida en el forma AAAA-MM-DD."
+
+#: core/validators.py:161
+msgid "Enter a valid time in HH:MM format."
+msgstr "Introdueixi una hora vàlida en el format HH:MM."
+
+#: core/validators.py:165
+#: db/models/fields/__init__.py:579
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr "Introdueixi un data/hora vàlida en format YYYY-MM-DD HH:MM."
+
+#: core/validators.py:170
+#: newforms/fields.py:343
+msgid "Enter a valid e-mail address."
+msgstr "Introdueixi una adreça de correu vàlida."
+
+#: core/validators.py:182
+#: core/validators.py:474
+#: newforms/fields.py:377
+#: oldforms/__init__.py:686
+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."
+
+#: core/validators.py:193
+#: newforms/fields.py:405
+msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
+msgstr "Envii una imatge vàilda. El fitxer que ha enviat no era una imatge o estaba corrupte."
+
+#: core/validators.py:200
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr "La URL %s no apunta una imatge vàlida."
+
+#: core/validators.py:204
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr "El números de telèfon han de guardar-se en el format XXX-XXX-XXXX. \"%s\" no és vàlid."
+
+#: core/validators.py:212
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr "La URL %s no apunta a un video QuickTime vàlid."
+
+#: core/validators.py:216
+msgid "A valid URL is required."
+msgstr "Es precisa d'una URL vàlida."
+
+#: core/validators.py:230
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+"Es precisa HTML vàlid. Els errors específics sòn:\n"
+"%s"
+
+#: core/validators.py:237
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr "XML incorrectament formatejat: %s"
+
+#: core/validators.py:254
+#, python-format
+msgid "Invalid URL: %s"
+msgstr "URL invalida: %s"
+
+#: core/validators.py:259
+#: core/validators.py:261
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "La URL %sés un enllaç trencat."
+
+#: core/validators.py:267
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "Introdueixi una abreviatura vàlida d'estat d'els E.U.A.."
+
+#: core/validators.py:281
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] "Vigili la seva boca! Aquí no admetem la paraula: %s."
+msgstr[1] "Vigili la seva boca! Aquí no admetem les paraules: %s."
+
+#: core/validators.py:288
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr "Aquest camp ha de concordar amb el camp '%s'."
+
+#: core/validators.py:307
+msgid "Please enter something for at least one field."
+msgstr "Si us plau, introdueixi alguna cosa alemnys en un camp."
+
+#: core/validators.py:316
+#: core/validators.py:327
+msgid "Please enter both fields or leave them both empty."
+msgstr "Si us plau, ompli els dos camps o deixi'ls tots dos en blanc."
+
+#: core/validators.py:335
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr "S'ha de proporcionar aquest camps si %(field)s és %(value)s"
+
+#: core/validators.py:348
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr "S'ha de proporcionar aquest camps si %(field)s no és %(value)s"
+
+#: core/validators.py:367
+msgid "Duplicate values are not allowed."
+msgstr "No s'admeten valors duplicats."
+
+#: core/validators.py:382
+#, python-format
+msgid "This value must be between %(lower)s and %(upper)s."
+msgstr "Aquest valor ha de estar comprés entre %(lower)s i %(upper)s."
+
+#: core/validators.py:384
+#, python-format
+msgid "This value must be at least %s."
+msgstr "Aquest valor ha de ser com a mínim %s."
+
+#: core/validators.py:386
+#, python-format
+msgid "This value must be no more than %s."
+msgstr "Aquest valor ha de ser com a màxim %s."
+
+#: core/validators.py:427
+#, python-format
+msgid "This value must be a power of %s."
+msgstr "Aquest valor ha de ser una potència de %s."
+
+#: core/validators.py:437
+msgid "Please enter a valid decimal number."
+msgstr "Si us plau, introdueixi un número decimal vàlid."
+
+#: core/validators.py:444
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural "Please enter a valid decimal number with at most %s total digits."
+msgstr[0] "Si us plau, introdueixi un número decimal vàlid de com a màxim %s digit."
+msgstr[1] "Si us plau, introdueixi un número decimal vàlid de com a màxim %s digits."
+
+#: core/validators.py:447
+#, python-format
+msgid "Please enter a valid decimal number with a whole part of at most %s digit."
+msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits."
+msgstr[0] "Si us plau, introdueixi un número decimal vàlid que la seva part sencera sigui de com a màxim %s digit."
+msgstr[1] "Si us plau, introdueixi un número decimal vàlid que la seva part sencera sigui de com a màxim %s digits."
+
+#: core/validators.py:450
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural "Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] "Si us plau, introdueixi un número decimal vàlid de com a màxim %s posició decimal."
+msgstr[1] "Si us plau, introdueixi un número decimal vàlid de com a màxim %s posicions decimals."
+
+#: core/validators.py:458
+msgid "Please enter a valid floating point number."
+msgstr "Si us plau, introdueixi un número amb punt de coma flotant vàlid."
+
+#: core/validators.py:467
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr "Asseguris de que el fitxer que ha enviat té, com a mínim, %s bytes."
+
+#: core/validators.py:468
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr "Asseguris de que el fitxer que ha enviat té, com a màxim %s bytes."
+
+#: core/validators.py:485
+msgid "The format for this field is wrong."
+msgstr "El format per aquest camp és incorrecte."
+
+#: core/validators.py:500
+msgid "This field is invalid."
+msgstr "El camp no és vàlid."
+
+#: core/validators.py:536
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "No s'ha pogut obtenir res de %s."
+
+#: core/validators.py:539
+#, python-format
+msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr "La URL %(url)s ha va tornar la capcelera Content-Type '%(contenttype)s', que no és vàlida."
+
+#: core/validators.py:572
+#, python-format
+msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
+msgstr "Si us plau, tanqui l'etiqueta %(tag)s des de la línia %(line)s. (La línia comença amb \"%(start)s\".)"
+
+#: core/validators.py:576
+#, python-format
+msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
+msgstr "Part del text que comença en la línia %(line)s no està permès en aquest context. (La línia comença per \"%(start)s\".)"
+
+#: core/validators.py:581
+#, python-format
+msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
+msgstr "El \"%(attr)s\" de la línia %(line)s no és un atribut vàlid. (La línia comença per \"%(start)s\".)"
+
+#: core/validators.py:586
+#, python-format
+msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
+msgstr "La \"<%(tag)s>\" de la línia %(line)s no és una etiqueta vàlida. (La línia comença per \"%(start)s\".)"
+
+#: core/validators.py:590
+#, python-format
+msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
+msgstr "Una etiqueta de la línia %(line)s li falta un o més atributs requerits.(La línia comença per \"%(start)s\".)"
+
+#: core/validators.py:595
+#, python-format
+msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
+msgstr "L'atribut \"%(attr)s\" de la línia %(line)s té un valor que no és vàlid. (La línia comença per \"%(start)s\".)"
+
+#: db/models/manipulators.py:308
+#, python-format
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
+msgstr "Ja existeix un %(object)s del tipus %(type)s amb aquest %(field)s."
+
+#: db/models/fields/__init__.py:52
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "Ja existeix  %(optname)s amb auqest %(fieldname)s."
+
+#: db/models/fields/__init__.py:159
+#: db/models/fields/__init__.py:316
+#: db/models/fields/__init__.py:731
+#: db/models/fields/__init__.py:742
+#: newforms/fields.py:93
+#: newforms/fields.py:513
+#: newforms/fields.py:589
+#: newforms/fields.py:600
+#: newforms/models.py:193
+#: oldforms/__init__.py:373
+msgid "This field is required."
+msgstr "Aquest camp és obligatori."
+
+#: db/models/fields/__init__.py:414
+msgid "This value must be an integer."
+msgstr "Aquest valor ha de ser  un enter."
+
+#: db/models/fields/__init__.py:450
+msgid "This value must be either True or False."
+msgstr "Aquest valor ha de ser True (Veritat) o False (Fals)"
+
+#: db/models/fields/__init__.py:471
+msgid "This field cannot be null."
+msgstr "Aquest camp no pot ser null (estar buit)."
+
+#: db/models/fields/__init__.py:640
+msgid "This value must be a decimal number."
+msgstr "Aquest valor ha de ser un número decimal."
+
+#: db/models/fields/__init__.py:751
+msgid "Enter a valid filename."
+msgstr "Introdueixi un nom de fitxer vàlid."
+
+#: db/models/fields/__init__.py:900
+msgid "This value must be either None, True or False."
+msgstr "Aquest valor ha de ser None (Cap), True (Veritat) o False (Fals)"
+
+#: db/models/fields/related.py:658
+msgid "Separate multiple IDs with commas."
+msgstr "Separi múltiples IDs amb comes."
+
+#: db/models/fields/related.py:660
+msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr "Premi \"Control\" o \"Command\" en un Mac per escollir més d'un."
+
+#: db/models/fields/related.py:707
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgstr[0] "Si us plau, introdueixi els IDs de %(self)s vàlids. El valor %(value)r és invàlid."
+msgstr[1] "Si us plau, introdueixi IDs de %(self)s vàlids. Els valors %(value)r són invàlids."
+
+#: newforms/fields.py:123
+#, python-format
+msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
+msgstr "Asseguris de que el valor té com a màxim %(max)d caràcters (en té %(length)d)."
+
+#: newforms/fields.py:125
+#, python-format
+msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
+msgstr "Asseguris de que el valor té com a mínim %(min)d caràcters (en té %(length)d)."
+
+#: newforms/fields.py:151
+#: newforms/fields.py:174
+#: newforms/fields.py:204
+#, python-format
+msgid "Ensure this value is less than or equal to %s."
+msgstr "Aquest valor ha de ser menor o igual a %s."
+
+#: newforms/fields.py:153
+#: newforms/fields.py:176
+#: newforms/fields.py:206
+#, python-format
+msgid "Ensure this value is greater than or equal to %s."
+msgstr "Asseguris de que aquest valor sigui superior o igual a %s."
+
+#: newforms/fields.py:172
+#: newforms/fields.py:199
+msgid "Enter a number."
+msgstr "Introdueixi un número."
+
+#: newforms/fields.py:208
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Asseguris de que no hi ha més de %s dígits en total."
+
+#: newforms/fields.py:210
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Asseguris de que no hi ha més de %s decimals."
+
+#: newforms/fields.py:212
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr "Asseguris de que no hia ha més de %s dígits decimals."
+
+#: newforms/fields.py:245
+#: newforms/fields.py:633
+msgid "Enter a valid date."
+msgstr "Introdueixi una data vàlida."
+
+#: newforms/fields.py:272
+#: newforms/fields.py:635
+msgid "Enter a valid time."
+msgstr "Introdueixi una hora vàlida."
+
+#: newforms/fields.py:308
+msgid "Enter a valid date/time."
+msgstr "Introdueixi una data/hora vàlides."
+
+#: newforms/fields.py:321
+msgid "Enter a valid value."
+msgstr "Introdueixi un valor vàlid."
+
+#: newforms/fields.py:379
+msgid "No file was submitted."
+msgstr "No s'ha enviat cap fitxer."
+
+#: newforms/fields.py:381
+#: oldforms/__init__.py:688
+msgid "The submitted file is empty."
+msgstr "El fitxer enviat està buit."
+
+#: newforms/fields.py:419
+#: newforms/fields.py:444
+msgid "Enter a valid URL."
+msgstr "Introdueixi una URL vàlida."
+
+#: newforms/fields.py:446
+msgid "This URL appears to be a broken link."
+msgstr "Aquesta URL sembla ser un enllaç trencat."
+
+#: newforms/fields.py:501
+#: newforms/models.py:180
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Esculli una opció vàlida; Aquesta opció no és una de les opcions disponibles."
+
+#: newforms/fields.py:517
+#: newforms/fields.py:593
+#: newforms/models.py:197
+msgid "Enter a list of values."
+msgstr "Introdueixi una llista de valors."
+
+#: newforms/fields.py:523
+#: newforms/models.py:203
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr "Esculli una opció vàlida; %s' no és una de les opcions vàlides."
+
+#: newforms/fields.py:644
+msgid "Enter a valid IPv4 address."
+msgstr "Introdueixi una adreça IPv4 vàlida."
+
 #: oldforms/__init__.py:408
 #, python-format
 msgid "Ensure your text is less than %s character."
@@ -3039,11 +3430,6 @@
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr "Esculli una opció vàlida; %(data)s' no està dintre de %(choices)s."
 
-#: oldforms/__init__.py:688
-#: newforms/fields.py:381
-msgid "The submitted file is empty."
-msgstr "El fitxer enviat està buit."
-
 #: oldforms/__init__.py:744
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Introdueixi un número enter entre -32,768 i 32,767."
@@ -3056,21 +3442,56 @@
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Introdueixi un número entre 0 i 32,767."
 
-#: views/generic/create_update.py:43
+#: template/defaultfilters.py:541
+msgid "yes,no,maybe"
+msgstr "si,no,potser"
+
+#: template/defaultfilters.py:570
 #, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "El/La %(verbose_name)s s'ha creat amb èxit."
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d byte"
+msgstr[1] "%(size)d bytes"
 
-#: views/generic/create_update.py:117
+#: template/defaultfilters.py:572
 #, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "El/La %(verbose_name)s s'ha actualtzat amb èxit."
+msgid "%.1f KB"
+msgstr "%.1f KB"
 
-#: views/generic/create_update.py:184
+#: template/defaultfilters.py:574
 #, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "El %(verbose_name)s s'ha eliminat."
+msgid "%.1f MB"
+msgstr "%.1f MB"
 
+#: template/defaultfilters.py:575
+#, python-format
+msgid "%.1f GB"
+msgstr "%.1f GB"
+
+#: utils/dateformat.py:41
+msgid "p.m."
+msgstr "p.m."
+
+#: utils/dateformat.py:42
+msgid "a.m."
+msgstr "a.m."
+
+#: utils/dateformat.py:47
+msgid "PM"
+msgstr "PM"
+
+#: utils/dateformat.py:48
+msgid "AM"
+msgstr "AM"
+
+#: utils/dateformat.py:97
+msgid "midnight"
+msgstr "mitja nit"
+
+#: utils/dateformat.py:99
+msgid "noon"
+msgstr "mig dia"
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Dilluns"
@@ -3260,76 +3681,56 @@
 msgid "or"
 msgstr "o"
 
-#: utils/timesince.py:12
+#: utils/timesince.py:21
 msgid "year"
 msgid_plural "years"
 msgstr[0] "any"
 msgstr[1] "anys"
 
-#: utils/timesince.py:13
+#: utils/timesince.py:22
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mes"
 msgstr[1] "mesos"
 
-#: utils/timesince.py:14
+#: utils/timesince.py:23
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "setmana"
 msgstr[1] "setmanes"
 
-#: utils/timesince.py:15
+#: utils/timesince.py:24
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dies"
 
-#: utils/timesince.py:16
+#: utils/timesince.py:25
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "hores"
 
-#: utils/timesince.py:17
+#: utils/timesince.py:26
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
 msgstr[1] "minuts"
 
-#: utils/timesince.py:39
+#: utils/timesince.py:46
+msgid "minutes"
+msgstr "minuts"
+
+#: utils/timesince.py:51
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:45
+#: utils/timesince.py:57
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: utils/dateformat.py:41
-msgid "p.m."
-msgstr "p.m."
-
-#: utils/dateformat.py:42
-msgid "a.m."
-msgstr "a.m."
-
-#: utils/dateformat.py:47
-msgid "PM"
-msgstr "PM"
-
-#: utils/dateformat.py:48
-msgid "AM"
-msgstr "AM"
-
-#: utils/dateformat.py:97
-msgid "midnight"
-msgstr "mitja nit"
-
-#: utils/dateformat.py:99
-msgid "noon"
-msgstr "mig dia"
-
 #: utils/translation/trans_real.py:391
 msgid "DATE_FORMAT"
 msgstr "F j, Y"
@@ -3350,124 +3751,21 @@
 msgid "MONTH_DAY_FORMAT"
 msgstr "j de/d' F del Y"
 
-#: template/defaultfilters.py:532
-msgid "yes,no,maybe"
-msgstr "si,no,potser"
-
-#: template/defaultfilters.py:561
+#: views/generic/create_update.py:43
 #, python-format
-msgid "%(size)d byte"
-msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d byte"
-msgstr[1] "%(size)d bytes"
+msgid "The %(verbose_name)s was created successfully."
+msgstr "El/La %(verbose_name)s s'ha creat amb èxit."
 
-#: template/defaultfilters.py:563
+#: views/generic/create_update.py:117
 #, python-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
+msgid "The %(verbose_name)s was updated successfully."
+msgstr "El/La %(verbose_name)s s'ha actualtzat amb èxit."
 
-#: template/defaultfilters.py:565
+#: views/generic/create_update.py:184
 #, python-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
+msgid "The %(verbose_name)s was deleted."
+msgstr "El %(verbose_name)s s'ha eliminat."
 
-#: template/defaultfilters.py:566
-#, python-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: newforms/fields.py:123
-#, python-format
-msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
-msgstr "Asseguris de que el valor té com a màxim %(max)d caràcters (en té %(length)d)."
-
-#: newforms/fields.py:125
-#, python-format
-msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
-msgstr "Asseguris de que el valor té com a mínim %(min)d caràcters (en té %(length)d)."
-
-#: newforms/fields.py:151
-#: newforms/fields.py:174
-#: newforms/fields.py:204
-#, python-format
-msgid "Ensure this value is less than or equal to %s."
-msgstr "Aquest valor ha de ser menor o igual a %s."
-
-#: newforms/fields.py:153
-#: newforms/fields.py:176
-#: newforms/fields.py:206
-#, python-format
-msgid "Ensure this value is greater than or equal to %s."
-msgstr "Asseguris de que aquest valor sigui superior o igual a %s."
-
-#: newforms/fields.py:172
-#: newforms/fields.py:199
-msgid "Enter a number."
-msgstr "Introdueixi un número."
-
-#: newforms/fields.py:208
-#, python-format
-msgid "Ensure that there are no more than %s digits in total."
-msgstr "Asseguris de que no hi ha més de %s dígits en total."
-
-#: newforms/fields.py:210
-#, python-format
-msgid "Ensure that there are no more than %s decimal places."
-msgstr "Asseguris de que no hi ha més de %s decimals."
-
-#: newforms/fields.py:212
-#, python-format
-msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr "Asseguris de que no hia ha més de %s dígits decimals."
-
-#: newforms/fields.py:245
-#: newforms/fields.py:629
-msgid "Enter a valid date."
-msgstr "Introdueixi una data vàlida."
-
-#: newforms/fields.py:272
-#: newforms/fields.py:631
-msgid "Enter a valid time."
-msgstr "Introdueixi una hora vàlida."
-
-#: newforms/fields.py:308
-msgid "Enter a valid date/time."
-msgstr "Introdueixi una data/hora vàlides."
-
-#: newforms/fields.py:321
-msgid "Enter a valid value."
-msgstr "Introdueixi un valor vàlid."
-
-#: newforms/fields.py:379
-msgid "No file was submitted."
-msgstr "No s'ha enviat cap fitxer."
-
-#: newforms/fields.py:419
-#: newforms/fields.py:444
-msgid "Enter a valid URL."
-msgstr "Introdueixi una URL vàlida."
-
-#: newforms/fields.py:446
-msgid "This URL appears to be a broken link."
-msgstr "Aquesta URL sembla ser un enllaç trencat."
-
-#: newforms/fields.py:497
-#: newforms/models.py:180
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Esculli una opció vàlida; Aquesta opció no és una de les opcions disponibles."
-
-#: newforms/fields.py:513
-#: newforms/fields.py:589
-#: newforms/models.py:197
-msgid "Enter a list of values."
-msgstr "Introdueixi una llista de valors."
-
-#: newforms/fields.py:519
-#: newforms/models.py:203
-#, python-format
-msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Esculli una opció vàlida; %s' no és una de les opcions vàlides."
-
 #~ msgid ""
 #~ "This comment was posted by a user who has posted fewer than %(count)s "
 #~ "comment:\n"
Index: django/conf/locale/es/LC_MESSAGES/django.po
===================================================================
--- django/conf/locale/es/LC_MESSAGES/django.po	(revision 6564)
+++ django/conf/locale/es/LC_MESSAGES/django.po	(working copy)
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-14 12:41+0200\n"
-"PO-Revision-Date: 2007-09-14 14:32+0100\n"
+"POT-Creation-Date: 2007-10-20 14:55+0200\n"
+"PO-Revision-Date: 2007-10-20 15:38+0100\n"
 "Last-Translator: Marc Garcia <marc.garcia@accopensys.com>\n"
 "Language-Team: Castellano <Django-I18N@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -15,91 +15,6 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: db/models/manipulators.py:309
-#, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."
-msgstr "%(object)s de este %(type)s ya existen en este %(field)s."
-
-#: db/models/manipulators.py:310
-#: core/validators.py:283
-#: contrib/admin/views/main.py:342
-#: contrib/admin/views/main.py:344
-#: contrib/admin/views/main.py:346
-msgid "and"
-msgstr "y"
-
-#: db/models/fields/related.py:55
-#, python-format
-msgid "Please enter a valid %s."
-msgstr "Por favor, introduzca un %s válido."
-
-#: db/models/fields/related.py:658
-msgid "Separate multiple IDs with commas."
-msgstr "Separe múltiples IDs con comas."
-
-#: db/models/fields/related.py:660
-msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr "Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar más de uno."
-
-#: db/models/fields/related.py:707
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
-msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
-msgstr[0] "Por favor, introduzca IDs de %(self)s válidos. El valor %(value)r no es válido."
-msgstr[1] "Por favor, introduzca IDs de %(self)s válidos. Los valores %(value)r no son válidos."
-
-#: db/models/fields/__init__.py:52
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "Ya existe %(optname)s con este %(fieldname)s."
-
-#: db/models/fields/__init__.py:159
-#: db/models/fields/__init__.py:316
-#: db/models/fields/__init__.py:724
-#: db/models/fields/__init__.py:735
-#: oldforms/__init__.py:373
-#: newforms/fields.py:93
-#: newforms/fields.py:509
-#: newforms/fields.py:585
-#: newforms/fields.py:596
-#: newforms/models.py:193
-msgid "This field is required."
-msgstr "Este campo es obligatorio."
-
-#: db/models/fields/__init__.py:414
-msgid "This value must be an integer."
-msgstr "Este valor debe ser un entero."
-
-#: db/models/fields/__init__.py:449
-msgid "This value must be either True or False."
-msgstr "Este valor debe ser Verdadero o Falso."
-
-#: db/models/fields/__init__.py:470
-msgid "This field cannot be null."
-msgstr "Este campo no puede estar vacío."
-
-#: db/models/fields/__init__.py:504
-#: core/validators.py:156
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Introduzca una fecha válida en formato AAAA-MM-DD."
-
-#: db/models/fields/__init__.py:573
-#: core/validators.py:165
-msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr "Introduzca una fecha/hora válida en formato AAAA-MM-DD HH:MM."
-
-#: db/models/fields/__init__.py:634
-msgid "This value must be a decimal number."
-msgstr "Este valor debe ser un entero."
-
-#: db/models/fields/__init__.py:744
-msgid "Enter a valid filename."
-msgstr "Introduzca un nombre de fichero válido"
-
-#: db/models/fields/__init__.py:887
-msgid "This value must be either None, True or False."
-msgstr "Este valor debe ser Verdadero o Falso."
-
 #: conf/global_settings.py:39
 msgid "Arabic"
 msgstr "Árabe"
@@ -161,758 +76,701 @@
 msgstr "Francés"
 
 #: conf/global_settings.py:54
+msgid "Gaeilge"
+msgstr "Gaeilge"
+
+#: conf/global_settings.py:55
 msgid "Galician"
 msgstr "Gallego"
 
-#: conf/global_settings.py:55
+#: conf/global_settings.py:56
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: conf/global_settings.py:56
+#: conf/global_settings.py:57
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: conf/global_settings.py:57
+#: conf/global_settings.py:58
 msgid "Croatian"
 msgstr "Croata"
 
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
 msgid "Icelandic"
 msgstr "Islandés"
 
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
 msgid "Italian"
 msgstr "Italiano"
 
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
 msgid "Japanese"
 msgstr "Japonés"
 
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
 msgid "Korean"
 msgstr "Koreano"
 
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
 msgid "Khmer"
 msgstr "Khmer"
 
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
 msgid "Kannada"
 msgstr "Kannada"
 
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
 msgid "Latvian"
 msgstr "Latvio"
 
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
 msgid "Dutch"
 msgstr "Alemán"
 
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
 msgid "Norwegian"
 msgstr "Noruego"
 
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
 msgid "Polish"
 msgstr "Polaco"
 
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
 msgid "Portugese"
 msgstr "Portugés"
 
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
 msgid "Brazilian"
 msgstr "Brasileño"
 
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
 msgid "Romanian"
 msgstr "Rumano"
 
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
 msgid "Russian"
 msgstr "Ruso"
 
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
 msgid "Serbian"
 msgstr "Serbio"
 
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
 msgid "Swedish"
 msgstr "Sueco"
 
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
 msgid "Tamil"
 msgstr "Tamil"
 
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
 msgid "Telugu"
 msgstr "Telugu"
 
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
 msgid "Turkish"
 msgstr "Turco"
 
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
 msgid "Ukrainian"
 msgstr "Ucraniano"
 
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
 msgid "Simplified Chinese"
 msgstr "Chino simplificado"
 
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
 msgid "Traditional Chinese"
 msgstr "Chino tradicional"
 
-#: core/validators.py:72
-msgid "This value must contain only letters, numbers and underscores."
-msgstr "Este valor debe contener sólo letras, números y guiones bajos."
+#: contrib/admin/filterspecs.py:42
+#, python-format
+msgid ""
+"<h3>By %s:</h3>\n"
+"<ul>\n"
+msgstr ""
+"<h3>Por %s:</h3>\n"
+"<ul>\n"
 
-#: core/validators.py:76
-msgid "This value must contain only letters, numbers, underscores, dashes or slashes."
-msgstr "Este valor debe contener letras, números, guiones bajos o barras solamente."
+#: contrib/admin/filterspecs.py:72
+#: contrib/admin/filterspecs.py:90
+#: contrib/admin/filterspecs.py:145
+#: contrib/admin/filterspecs.py:171
+msgid "All"
+msgstr "Todo"
 
-#: core/validators.py:80
-msgid "This value must contain only letters, numbers, underscores or hyphens."
-msgstr "Este valor debe contener sólo letras, números, guiones bajos o medios."
+#: contrib/admin/filterspecs.py:111
+msgid "Any date"
+msgstr "Cualquier fecha"
 
-#: core/validators.py:84
-msgid "Uppercase letters are not allowed here."
-msgstr "No se admiten letras mayúsculas."
+#: contrib/admin/filterspecs.py:112
+msgid "Today"
+msgstr "Hoy"
 
-#: core/validators.py:88
-msgid "Lowercase letters are not allowed here."
-msgstr "No se admiten letras minúsculas."
+#: contrib/admin/filterspecs.py:115
+msgid "Past 7 days"
+msgstr "Últimos 7 días"
 
-#: core/validators.py:95
-msgid "Enter only digits separated by commas."
-msgstr "Introduzca sólo dígitos separados por comas."
+#: contrib/admin/filterspecs.py:117
+msgid "This month"
+msgstr "Este mes"
 
-#: core/validators.py:107
-msgid "Enter valid e-mail addresses separated by commas."
-msgstr "Introduzca direcciones de correo válidas separadas por comas."
+#: contrib/admin/filterspecs.py:119
+msgid "This year"
+msgstr "Este año"
 
-#: core/validators.py:111
-msgid "Please enter a valid IP address."
-msgstr "Por favor introduzca una dirección IP válida."
+#: contrib/admin/filterspecs.py:145
+#: newforms/widgets.py:205
+#: oldforms/__init__.py:591
+msgid "Yes"
+msgstr "Sí"
 
-#: core/validators.py:115
-msgid "Empty values are not allowed here."
-msgstr "No se admiten valores vacíos."
+#: contrib/admin/filterspecs.py:145
+#: newforms/widgets.py:205
+#: oldforms/__init__.py:591
+msgid "No"
+msgstr "No"
 
-#: core/validators.py:119
-msgid "Non-numeric characters aren't allowed here."
-msgstr "No se admiten caracteres no numéricos."
+#: contrib/admin/filterspecs.py:152
+#: newforms/widgets.py:205
+#: oldforms/__init__.py:591
+msgid "Unknown"
+msgstr "Desconocido"
 
-#: core/validators.py:123
-msgid "This value can't be comprised solely of digits."
-msgstr "Este valor no puede comprender sólo dígitos."
+#: contrib/admin/models.py:17
+msgid "action time"
+msgstr "hora de acción"
 
-#: core/validators.py:128
-#: newforms/fields.py:149
-msgid "Enter a whole number."
-msgstr "Introduzca un número entero."
+#: contrib/admin/models.py:20
+msgid "object id"
+msgstr "id de objeto"
 
-#: core/validators.py:132
-msgid "Only alphabetical characters are allowed here."
-msgstr "Sólo se admiten caracteres alfabéticos."
+#: contrib/admin/models.py:21
+msgid "object repr"
+msgstr "repr de objeto"
 
-#: core/validators.py:147
-msgid "Year must be 1900 or later."
-msgstr "El año debe ser 1900 o posterior."
+#: contrib/admin/models.py:22
+msgid "action flag"
+msgstr "marca de acción"
 
-#: core/validators.py:151
-#, python-format
-msgid "Invalid date: %s"
-msgstr "Fecha no válida: %s"
+#: contrib/admin/models.py:23
+msgid "change message"
+msgstr "mensaje de cambio"
 
-#: core/validators.py:161
-msgid "Enter a valid time in HH:MM format."
-msgstr "Introduzca una hora válida en formato HH:MM."
+#: contrib/admin/models.py:26
+msgid "log entry"
+msgstr "entrada de registro"
 
-#: core/validators.py:170
-#: newforms/fields.py:343
-msgid "Enter a valid e-mail address."
-msgstr "Introduzca una dirección de correo electrónico válida"
+#: contrib/admin/models.py:27
+msgid "log entries"
+msgstr "entradas de registro"
 
-#: core/validators.py:182
-#: core/validators.py:469
-#: oldforms/__init__.py:686
-#: newforms/fields.py:377
-msgid "No file was submitted. Check the encoding type on the form."
-msgstr "No se ha enviado ningún fichero. Compruebe el tipo de codificación en el formulario."
+#: contrib/admin/templates/admin/404.html:4
+#: contrib/admin/templates/admin/404.html:8
+msgid "Page not found"
+msgstr "Página no encontrada"
 
-#: core/validators.py:193
-#: newforms/fields.py:405
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Envíe una imagen válida. El fichero que ha enviado no era una imagen o se trataba de una imagen corrupta."
+#: contrib/admin/templates/admin/404.html:10
+msgid "We're sorry, but the requested page could not be found."
+msgstr "Lo sentimos, pero no se encuentra la página solicitada."
 
-#: core/validators.py:200
-#, python-format
-msgid "The URL %s does not point to a valid image."
-msgstr "La URL %s no apunta a una imagen válida."
+#: contrib/admin/templates/admin/500.html:4
+#: contrib/admin/templates/admin/base.html:37
+#: contrib/admin/templates/admin/change_form.html:12
+#: contrib/admin/templates/admin/change_list.html:5
+#: contrib/admin/templates/admin/delete_confirmation.html:5
+#: contrib/admin/templates/admin/invalid_setup.html:4
+#: contrib/admin/templates/admin/object_history.html:4
+#: contrib/admin/templates/admin/auth/user/change_password.html:11
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+#: contrib/admin/templates/registration/logged_out.html:4
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_reset_done.html:4
+#: contrib/admin/templates/registration/password_reset_form.html:4
+msgid "Home"
+msgstr "Inicio"
 
-#: core/validators.py:204
-#, python-format
-msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr "Los números de teléfono deben guardar el formato XXX-XXX-XXXX. \"%s\" no es válido."
+#: contrib/admin/templates/admin/500.html:4
+msgid "Server error"
+msgstr "Error del servidor"
 
-#: core/validators.py:212
-#, python-format
-msgid "The URL %s does not point to a valid QuickTime video."
-msgstr "La URL %s no apunta a un vídeo QuickTime válido."
+#: contrib/admin/templates/admin/500.html:6
+msgid "Server error (500)"
+msgstr "Error del servidor (500)"
 
-#: core/validators.py:216
-msgid "A valid URL is required."
-msgstr "Se precisa una URL válida."
+#: contrib/admin/templates/admin/500.html:9
+msgid "Server Error <em>(500)</em>"
+msgstr "Error de servidor <em>(500)</em>"
 
-#: core/validators.py:230
-#, python-format
-msgid ""
-"Valid HTML is required. Specific errors are:\n"
-"%s"
-msgstr ""
-"Se precisa HTML válido. Los errores específicos son:\n"
-"%s"
+#: contrib/admin/templates/admin/500.html:10
+msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
+msgstr "Ha ocurrido un error. Se ha informado a los administradores del sitio mediante correo electrónico y debería arreglarse en breve. Gracias por su paciencia."
 
-#: core/validators.py:237
-#, python-format
-msgid "Badly formed XML: %s"
-msgstr "XML mal formado: %s"
+#: contrib/admin/templates/admin/base.html:26
+msgid "Welcome,"
+msgstr "Bienvenido,"
 
-#: core/validators.py:254
-#, python-format
-msgid "Invalid URL: %s"
-msgstr "URL no válida: %s"
+#: contrib/admin/templates/admin/base.html:28
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Documentation"
+msgstr "Documentación"
 
-#: core/validators.py:259
-#: core/validators.py:261
-#, python-format
-msgid "The URL %s is a broken link."
-msgstr "La URL %s es un enlace roto."
+#: contrib/admin/templates/admin/base.html:29
+#: contrib/admin/templates/admin/auth/user/change_password.html:14
+#: contrib/admin/templates/admin/auth/user/change_password.html:45
+msgid "Change password"
+msgstr "Cambiar clave"
 
-#: core/validators.py:267
-msgid "Enter a valid U.S. state abbreviation."
-msgstr "Introduzca una abreviatura válida de estado de los EEUU."
+#: contrib/admin/templates/admin/base.html:30
+#: contrib/comments/templates/comments/form.html:6
+msgid "Log out"
+msgstr "Terminar sesión"
 
-#: core/validators.py:281
-#, python-format
-msgid "Watch your mouth! The word %s is not allowed here."
-msgid_plural "Watch your mouth! The words %s are not allowed here."
-msgstr[0] "¡Cuida tu vocabulario! Aquí no admitimos la palabra %s."
-msgstr[1] "¡Cuida tu vocabulario! Aquí no admitimos las palabras %s."
+#: contrib/admin/templates/admin/base_site.html:4
+msgid "Django site admin"
+msgstr "Sitio de administración de Django"
 
-#: core/validators.py:288
-#, python-format
-msgid "This field must match the '%s' field."
-msgstr "Este campo debe concordar con el campo '%s'."
+#: contrib/admin/templates/admin/base_site.html:7
+msgid "Django administration"
+msgstr "Administración de Django"
 
-#: core/validators.py:307
-msgid "Please enter something for at least one field."
-msgstr "Por favor, introduzca algo en al menos un campo."
+#: contrib/admin/templates/admin/change_form.html:14
+#: contrib/admin/templates/admin/index.html:28
+msgid "Add"
+msgstr "Agregar"
 
-#: core/validators.py:316
-#: core/validators.py:327
-msgid "Please enter both fields or leave them both empty."
-msgstr "Por favor, rellene ambos campos o deje ambos vacíos."
+#: contrib/admin/templates/admin/change_form.html:20
+#: contrib/admin/templates/admin/object_history.html:4
+msgid "History"
+msgstr "Histórico"
 
-#: core/validators.py:335
-#, python-format
-msgid "This field must be given if %(field)s is %(value)s"
-msgstr "Se debe proporcionar este campo si %(field)s es %(value)s"
+#: contrib/admin/templates/admin/change_form.html:21
+msgid "View on site"
+msgstr "Ver en el sitio"
 
-#: core/validators.py:348
-#, python-format
-msgid "This field must be given if %(field)s is not %(value)s"
-msgstr "Se debe proporcionar este campo si %(field)s no es %(value)s"
+#: contrib/admin/templates/admin/change_form.html:31
+#: contrib/admin/templates/admin/auth/user/change_password.html:23
+msgid "Please correct the error below."
+msgid_plural "Please correct the errors below."
+msgstr[0] "Por favor, corrija el siguiente error."
+msgstr[1] "Por favor, corrija los siguientes errores."
 
-#: core/validators.py:367
-msgid "Duplicate values are not allowed."
-msgstr "No se admiten valores duplicados."
+#: contrib/admin/templates/admin/change_form.html:49
+msgid "Ordering"
+msgstr "Ordenación"
 
-#: core/validators.py:382
-#, python-format
-msgid "This value must be between %(lower)s and %(upper)s."
-msgstr "Este valor debe estar entre %(lower)s y %(upper)s."
+#: contrib/admin/templates/admin/change_form.html:52
+msgid "Order:"
+msgstr "Orden:"
 
-#: core/validators.py:384
+#: contrib/admin/templates/admin/change_list.html:11
 #, python-format
-msgid "This value must be at least %s."
-msgstr "Este valor debe ser como mínimo %s."
+msgid "Add %(name)s"
+msgstr "Agregar %(name)s"
 
-#: core/validators.py:386
-#, python-format
-msgid "This value must be no more than %s."
-msgstr "Este valor no debe ser mayor que %s."
+#: contrib/admin/templates/admin/delete_confirmation.html:8
+#: contrib/admin/templates/admin/submit_line.html:3
+msgid "Delete"
+msgstr "Eliminar"
 
-#: core/validators.py:422
+#: contrib/admin/templates/admin/delete_confirmation.html:13
 #, python-format
-msgid "This value must be a power of %s."
-msgstr "Este valor debe ser una potencia de %s."
+msgid "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
+msgstr "Eliminar el %(object_name)s '%(escaped_object)s' provocaría la eliminación de objetos relacionados, pero su cuenta no tiene permiso para borrar los siguientes tipos de objetos:"
 
-#: core/validators.py:432
-msgid "Please enter a valid decimal number."
-msgstr "Por favor, introduzca un número decimal válido."
-
-#: core/validators.py:439
+#: contrib/admin/templates/admin/delete_confirmation.html:20
 #, python-format
-msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural "Please enter a valid decimal number with at most %s total digits."
-msgstr[0] "Por favor, introduzca un número decimal válido con a lo más %s dígito en total."
-msgstr[1] "Por favor, introduzca un número decimal válido con a lo más %s dígitos en total."
+msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:"
+msgstr "¿Está seguro de que quiere borrar los %(object_name)s \"%(escaped_object)s\"? Se borrarán los siguientes objetos relacionados:"
 
-#: core/validators.py:442
-#, python-format
-msgid "Please enter a valid decimal number with a whole part of at most %s digit."
-msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits."
-msgstr[0] "Por favor, introduzca un número decimal válido con a lo más %s dígito en su parte entera."
-msgstr[1] "Por favor, introduzca un número decimal válido con a lo más %s dígitos en su parte entera."
+#: contrib/admin/templates/admin/delete_confirmation.html:25
+msgid "Yes, I'm sure"
+msgstr "Sí, estoy seguro"
 
-#: core/validators.py:445
+#: contrib/admin/templates/admin/filter.html:2
 #, python-format
-msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural "Please enter a valid decimal number with at most %s decimal places."
-msgstr[0] "Por favor, introduzca un número decimal válido con a lo más %s dígito decimal."
-msgstr[1] "Por favor, introduzca un número decimal válido con a lo más %s dígitos decimales."
+msgid " By %(filter_title)s "
+msgstr " Por %(filter_title)s "
 
-#: core/validators.py:453
-msgid "Please enter a valid floating point number."
-msgstr "Por favor, introduzca un número decimal válido."
+#: contrib/admin/templates/admin/filters.html:4
+msgid "Filter"
+msgstr "Filtro"
 
-#: core/validators.py:462
+#: contrib/admin/templates/admin/index.html:17
 #, python-format
-msgid "Make sure your uploaded file is at least %s bytes big."
-msgstr "Asegúrese de que el fichero que envía tiene al menos %s bytes."
+msgid "Models available in the %(name)s application."
+msgstr "Modelos disponibles en la aplicación %(name)s."
 
-#: core/validators.py:463
+#: contrib/admin/templates/admin/index.html:18
 #, python-format
-msgid "Make sure your uploaded file is at most %s bytes big."
-msgstr "Asegúrese de que el fichero que envía tiene como máximo %s bytes."
+msgid "%(name)s"
+msgstr "%(name)s"
 
-#: core/validators.py:480
-msgid "The format for this field is wrong."
-msgstr "El formato de este campo es incorrecto."
+#: contrib/admin/templates/admin/index.html:34
+msgid "Change"
+msgstr "Modificar"
 
-#: core/validators.py:495
-msgid "This field is invalid."
-msgstr "Este campo no es válido."
+#: contrib/admin/templates/admin/index.html:44
+msgid "You don't have permission to edit anything."
+msgstr "No tiene permiso para editar nada."
 
-#: core/validators.py:531
-#, python-format
-msgid "Could not retrieve anything from %s."
-msgstr "No pude obtener nada de %s."
+#: contrib/admin/templates/admin/index.html:52
+msgid "Recent Actions"
+msgstr "Acciones recientes"
 
-#: core/validators.py:534
-#, python-format
-msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
-msgstr "La URL %(url)s devolvió la cabecera Content-Type '%(contenttype)s', que no es válida."
+#: contrib/admin/templates/admin/index.html:53
+msgid "My Actions"
+msgstr "Mis acciones"
 
-#: core/validators.py:567
-#, python-format
-msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
-msgstr "Por favor, cierre la etiqueta %(tag)s de la línea %(line)s. (La línea empieza por \"%(start)s\".)"
+#: contrib/admin/templates/admin/index.html:57
+msgid "None available"
+msgstr "Ninguno disponible"
 
-#: core/validators.py:571
-#, python-format
-msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
-msgstr "Parte del texto que comienza en la línea %(line)s no está permitido en ese contexto. (La línea empieza por \"%(start)s\".)"
+#: contrib/admin/templates/admin/invalid_setup.html:8
+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 "Algo va mal con la instalación de la base de datos. Asegúrate que las tablas necesarias han sido creadas, y que la base de datos puede ser leída por el usuario apropiado."
 
-#: core/validators.py:576
-#, python-format
-msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
-msgstr "El \"%(attr)s\" de la línea %(line)s no es un atributo válido. (La línea empieza por \"%(start)s\".)"
+#: contrib/admin/templates/admin/login.html:17
+#: contrib/comments/templates/comments/form.html:6
+#: contrib/comments/templates/comments/form.html:8
+msgid "Username:"
+msgstr "Usuario:"
 
-#: core/validators.py:581
-#, python-format
-msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
-msgstr "La \"<%(tag)s>\" de la línea %(line)s no es una etiqueta válida. (La línea empieza por \"%(start)s\".)"
+#: contrib/admin/templates/admin/login.html:20
+#: contrib/comments/templates/comments/form.html:8
+msgid "Password:"
+msgstr "Clave:"
 
-#: core/validators.py:585
-#, python-format
-msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
-msgstr "A una etiqueta de la línea %(line)s le faltan uno o más atributos requeridos. (La línea empieza por \"%(start)s\".)"
+#: contrib/admin/templates/admin/login.html:25
+#: contrib/admin/views/decorators.py:24
+msgid "Log in"
+msgstr "Identificarse"
 
-#: core/validators.py:590
-#, python-format
-msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
-msgstr "El atributo \"%(attr)s\" de la línea %(line)s tiene un valor que no es válido. (La línea empieza por \"%(start)s\".)"
+#: contrib/admin/templates/admin/object_history.html:17
+msgid "Date/time"
+msgstr "Fecha/hora"
 
-#: contrib/auth/forms.py:17
-#: contrib/auth/forms.py:138
-msgid "The two password fields didn't match."
-msgstr "Las dos contraseñas no coinciden."
+#: contrib/admin/templates/admin/object_history.html:18
+msgid "User"
+msgstr "Usuario"
 
-#: contrib/auth/forms.py:25
-msgid "A user with that username already exists."
-msgstr "Ya existe  un usuario con este nombre."
+#: contrib/admin/templates/admin/object_history.html:19
+msgid "Action"
+msgstr "Acción"
 
-#: contrib/auth/forms.py:53
-msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
-msgstr "Tu navegador de internet parece no tener las cookies habilitadas. Las cookies se necesitan para poder ingresar."
+#: contrib/admin/templates/admin/object_history.html:25
+msgid "DATE_WITH_TIME_FULL"
+msgstr "j M Y P"
 
-#: contrib/auth/forms.py:60
-#: contrib/admin/views/decorators.py:10
-msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
-msgstr "Por favor, introduzca un correcto nombre de usuario y contraseña. Note que ambos campos son sensibles a mayúsculas/minúsculas."
+#: contrib/admin/templates/admin/object_history.html:35
+msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
+msgstr "Este objeto no tiene histórico de cambios. Probablemente no fue añadido usando este sitio de administración."
 
-#: contrib/auth/forms.py:62
-msgid "This account is inactive."
-msgstr "Esta cuenta está inactiva."
+#: contrib/admin/templates/admin/pagination.html:10
+msgid "Show all"
+msgstr "Mostrarlo todo"
 
-#: contrib/auth/forms.py:84
-msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?"
-msgstr "Esta dirección de correo electrónico no tiene una cuenta de usuario asociada. ¿Está seguro de que se ha registrado?"
+#: contrib/admin/templates/admin/search_form.html:8
+msgid "Go"
+msgstr "Buscar"
 
-#: contrib/auth/forms.py:117
-msgid "The two 'new password' fields didn't match."
-msgstr "Las contraseñas introducidas en los campos 'nueva contraseña' no coinciden."
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "1 result"
+msgid_plural "%(counter)s results"
+msgstr[0] "1 resultado"
+msgstr[1] "%(counter)s resultados"
 
-#: contrib/auth/forms.py:124
-msgid "Your old password was entered incorrectly. Please enter it again."
-msgstr "Tu contraseña antigua es incorrecta. Por favor, vuelve a introducirla correctamente."
+#: contrib/admin/templates/admin/search_form.html:10
+#, python-format
+msgid "%(full_result_count)s total"
+msgstr "%(full_result_count)s total"
 
-#: contrib/auth/models.py:53
-#: contrib/auth/models.py:73
-msgid "name"
-msgstr "nombre"
+#: contrib/admin/templates/admin/submit_line.html:4
+msgid "Save as new"
+msgstr "Grabar como nuevo"
 
-#: contrib/auth/models.py:55
-msgid "codename"
-msgstr "nombre en código"
+#: contrib/admin/templates/admin/submit_line.html:5
+msgid "Save and add another"
+msgstr "Grabar y añadir otro"
 
-#: contrib/auth/models.py:58
-msgid "permission"
-msgstr "permiso"
+#: contrib/admin/templates/admin/submit_line.html:6
+msgid "Save and continue editing"
+msgstr "Grabar y continuar editando"
 
-#: contrib/auth/models.py:59
-#: contrib/auth/models.py:74
-msgid "permissions"
-msgstr "permisos"
+#: contrib/admin/templates/admin/submit_line.html:7
+msgid "Save"
+msgstr "Grabar"
 
-#: contrib/auth/models.py:77
-msgid "group"
-msgstr "grupo"
+#: contrib/admin/templates/admin/auth/user/add_form.html:6
+msgid "First, enter a username and password. Then, you'll be able to edit more user options."
+msgstr "Primero introduzca un nombre de usuario y una contraseña. Luego podrá editar el resto de opciones del usuario."
 
-#: contrib/auth/models.py:78
-#: contrib/auth/models.py:121
-msgid "groups"
-msgstr "grupos"
+#: contrib/admin/templates/admin/auth/user/add_form.html:12
+msgid "Username"
+msgstr "Nombre de usuario"
 
-#: contrib/auth/models.py:111
-msgid "username"
-msgstr "nombre de usuario"
+#: contrib/admin/templates/admin/auth/user/add_form.html:18
+#: contrib/admin/templates/admin/auth/user/change_password.html:33
+msgid "Password"
+msgstr "Contraseña"
 
-#: contrib/auth/models.py:111
-msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
-msgstr "Requerido. 30 caracteres o menos. Sólo caracteres alfanuméricos (letras, dígitos y guiones bajos)."
+#: contrib/admin/templates/admin/auth/user/add_form.html:23
+#: contrib/admin/templates/admin/auth/user/change_password.html:38
+msgid "Password (again)"
+msgstr "Contraseña (de nuevo)"
 
-#: contrib/auth/models.py:112
-msgid "first name"
-msgstr "nombre"
+#: contrib/admin/templates/admin/auth/user/add_form.html:24
+#: contrib/admin/templates/admin/auth/user/change_password.html:39
+msgid "Enter the same password as above, for verification."
+msgstr "Introduzca la misma contraseña que arriba, para verificación"
 
-#: contrib/auth/models.py:113
-msgid "last name"
-msgstr "apellidos"
+#: contrib/admin/templates/admin/auth/user/change_password.html:27
+#, python-format
+msgid "Enter a new password for the user <strong>%(username)s</strong>."
+msgstr "Introduzca una nueva contraseña para el usuario <strong>%(username)s</strong>."
 
-#: contrib/auth/models.py:114
-msgid "e-mail address"
-msgstr "dirección de correo"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:3
+msgid "Bookmarklets"
+msgstr "Bookmarklets"
 
-#: contrib/auth/models.py:115
-msgid "password"
-msgstr "clave"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:4
+msgid "Documentation bookmarklets"
+msgstr "Bookmarklets de documentación"
 
-#: contrib/auth/models.py:115
-msgid "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."
-msgstr "Use'[algo]$[sal]$[hash hexadecimal]' o use <a href=\"password/\">el formulario para cambiar la contraseña</a>."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:8
+msgid ""
+"\n"
+"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
+"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
+"select the bookmarklet from any page in the site.  Note that some of these\n"
+"bookmarklets require you to be viewing the site from a computer designated\n"
+"as \"internal\" (talk to your system administrator if you aren't sure if\n"
+"your computer is \"internal\").</p>\n"
+msgstr ""
+"\n"
+"<p class=\"help\">Para instalar bookmarklets, arrastre el enlace a su barra\n"
+"de favoritos, o pulse con el botón derecho el enlace y añádalo a sus favoritos.\n"
+"Ahora puede escoger el bookmarklet desde cualquier página en el sitio.\n"
+"Observer que algunos de estos bookmarklets precisan que esté viendo\n"
+"el sitio desde un computador señalado como \"interno\" (hable\n"
+"con su administrador de sistemas si no está seguro de si el suyo lo es).</p>\n"
 
-#: contrib/auth/models.py:116
-msgid "staff status"
-msgstr "es staff"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:18
+msgid "Documentation for this page"
+msgstr "Documentación de esta página"
 
-#: contrib/auth/models.py:116
-msgid "Designates whether the user can log into this admin site."
-msgstr "Indica si el usuario puede entrar en este sitio de administración."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:19
+msgid "Jumps you from any page to the documentation for the view that generates that page."
+msgstr "Le lleva desde cualquier página a la documentación de la vista que la genera."
 
-#: contrib/auth/models.py:117
-msgid "active"
-msgstr "activo"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:21
+msgid "Show object ID"
+msgstr "Mostrar ID de objeto"
 
-#: contrib/auth/models.py:117
-msgid "Designates whether this user can log into the Django admin. Unselect this instead of deleting accounts."
-msgstr "Indica si el usuario puede entrar en este sitio de administración. Desmarque esto en lugar de borrar la cuenta."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:22
+msgid "Shows the content-type and unique ID for pages that represent a single object."
+msgstr "Muestra el tipo de contenido e ID unívoco de las páginas que representan un único objeto."
 
-#: contrib/auth/models.py:118
-msgid "superuser status"
-msgstr "es superusuario"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:24
+msgid "Edit this object (current window)"
+msgstr "Editar este objeto (ventana actual)"
 
-#: contrib/auth/models.py:118
-msgid "Designates that this user has all permissions without explicitly assigning them."
-msgstr "Indica que este usuario tiene todos los permisos sin asignárselos explícitamente."
+#: contrib/admin/templates/admin_doc/bookmarklets.html:25
+msgid "Jumps to the admin page for pages that represent a single object."
+msgstr "Le lleva a la página de administración de páginas que representan un único objeto."
 
-#: contrib/auth/models.py:119
-msgid "last login"
-msgstr "Último registro"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:27
+msgid "Edit this object (new window)"
+msgstr "Editar este objeto (nueva ventana)"
 
-#: contrib/auth/models.py:120
-msgid "date joined"
-msgstr "fecha de creación"
+#: contrib/admin/templates/admin_doc/bookmarklets.html:28
+msgid "As above, but opens the admin page in a new window."
+msgstr "Como antes, pero abre la página de administración en una nueva ventana."
 
-#: contrib/auth/models.py:122
-msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
-msgstr "Además de los permisos asignados manualmente, este usuario también tendrá todos los permisos de los grupos en los que esté."
+#: contrib/admin/templates/registration/logged_out.html:8
+msgid "Thanks for spending some quality time with the Web site today."
+msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy."
 
-#: contrib/auth/models.py:123
-msgid "user permissions"
-msgstr "permisos"
+#: contrib/admin/templates/registration/logged_out.html:10
+msgid "Log in again"
+msgstr "Identificarse de nuevo"
 
-#: contrib/auth/models.py:127
-msgid "user"
-msgstr "usuario"
+#: contrib/admin/templates/registration/password_change_done.html:3
+#: contrib/admin/templates/registration/password_change_form.html:3
+#: contrib/admin/templates/registration/password_change_form.html:5
+#: contrib/admin/templates/registration/password_change_form.html:9
+msgid "Password change"
+msgstr "Cambio de clave"
 
-#: contrib/auth/models.py:128
-msgid "users"
-msgstr "usuarios"
+#: contrib/admin/templates/registration/password_change_done.html:5
+#: contrib/admin/templates/registration/password_change_done.html:9
+msgid "Password change successful"
+msgstr "Cambio de clave exitoso"
 
-#: contrib/auth/models.py:134
-msgid "Personal info"
-msgstr "Información personal"
+#: contrib/admin/templates/registration/password_change_done.html:11
+msgid "Your password was changed."
+msgstr "Su clave ha sido cambiada."
 
-#: contrib/auth/models.py:135
-msgid "Permissions"
-msgstr "Permisos"
+#: contrib/admin/templates/registration/password_change_form.html:11
+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 "Por favor, introduzca su clave antigua, por seguridad, y después introduzca la nueva clave dos veces para verificar que la ha escrito correctamente."
 
-#: contrib/auth/models.py:136
-msgid "Important dates"
-msgstr "Fechas importantes"
+#: contrib/admin/templates/registration/password_change_form.html:16
+msgid "Old password:"
+msgstr "Clave antigua:"
 
-#: contrib/auth/models.py:137
-msgid "Groups"
-msgstr "Grupos"
+#: contrib/admin/templates/registration/password_change_form.html:18
+msgid "New password:"
+msgstr "Clave nueva:"
 
-#: contrib/auth/models.py:288
-msgid "message"
-msgstr "mensaje"
+#: contrib/admin/templates/registration/password_change_form.html:20
+msgid "Confirm password:"
+msgstr "Confirme clave:"
 
-#: contrib/auth/views.py:47
-msgid "Logged out"
-msgstr "Sesión terminada"
+#: contrib/admin/templates/registration/password_change_form.html:22
+msgid "Change my password"
+msgstr "Cambiar mi clave"
 
-#: contrib/admin/models.py:17
-msgid "action time"
-msgstr "hora de acción"
+#: 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
+msgid "Password reset"
+msgstr "Recuperar clave"
 
-#: contrib/admin/models.py:20
-msgid "object id"
-msgstr "id de objeto"
+#: contrib/admin/templates/registration/password_reset_done.html:6
+#: contrib/admin/templates/registration/password_reset_done.html:10
+msgid "Password reset successful"
+msgstr "Recuperación de clave exitosa"
 
-#: contrib/admin/models.py:21
-msgid "object repr"
-msgstr "repr de objeto"
+#: contrib/admin/templates/registration/password_reset_done.html:12
+msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
+msgstr "Le hemos enviado una clave nueva a la dirección que ha suministrado. Debería recibirla en breve."
 
-#: contrib/admin/models.py:22
-msgid "action flag"
-msgstr "marca de acción"
+#: contrib/admin/templates/registration/password_reset_email.html:2
+msgid "You're receiving this e-mail because you requested a password reset"
+msgstr "Está recibiendo este mensaje debido a que solicitó recuperar la clave"
 
-#: contrib/admin/models.py:23
-msgid "change message"
-msgstr "mensaje de cambio"
+#: contrib/admin/templates/registration/password_reset_email.html:3
+#, python-format
+msgid "for your user account at %(site_name)s"
+msgstr "de su cuenta de usuario en %(site_name)s."
 
-#: contrib/admin/models.py:26
-msgid "log entry"
-msgstr "entrada de registro"
-
-#: contrib/admin/models.py:27
-msgid "log entries"
-msgstr "entradas de registro"
-
-#: contrib/admin/filterspecs.py:42
+#: contrib/admin/templates/registration/password_reset_email.html:5
 #, python-format
-msgid ""
-"<h3>By %s:</h3>\n"
-"<ul>\n"
-msgstr ""
-"<h3>Por %s:</h3>\n"
-"<ul>\n"
+msgid "Your new password is: %(new_password)s"
+msgstr "Su nueva clave es: %(new_password)s"
 
-#: contrib/admin/filterspecs.py:72
-#: contrib/admin/filterspecs.py:90
-#: contrib/admin/filterspecs.py:145
-#: contrib/admin/filterspecs.py:171
-msgid "All"
-msgstr "Todo"
+#: contrib/admin/templates/registration/password_reset_email.html:7
+msgid "Feel free to change this password by going to this page:"
+msgstr "Puede cambiarla accediendo a esta página:"
 
-#: contrib/admin/filterspecs.py:111
-msgid "Any date"
-msgstr "Cualquier fecha"
+#: contrib/admin/templates/registration/password_reset_email.html:11
+msgid "Your username, in case you've forgotten:"
+msgstr "Su nombre de usuario, en caso de haberlo olvidado:"
 
-#: contrib/admin/filterspecs.py:112
-msgid "Today"
-msgstr "Hoy"
+#: contrib/admin/templates/registration/password_reset_email.html:13
+msgid "Thanks for using our site!"
+msgstr "¡Gracias por usar nuestro sitio!"
 
-#: contrib/admin/filterspecs.py:115
-msgid "Past 7 days"
-msgstr "Últimos 7 días"
+#: contrib/admin/templates/registration/password_reset_email.html:15
+#, python-format
+msgid "The %(site_name)s team"
+msgstr "El equipo de %(site_name)s"
 
-#: contrib/admin/filterspecs.py:117
-msgid "This month"
-msgstr "Este mes"
+#: contrib/admin/templates/registration/password_reset_form.html:12
+msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
+msgstr "¿Ha olvidado su clave? Introduzca su dirección de correo electrónico, y crearemos una nueva que le enviaremos por correo."
 
-#: contrib/admin/filterspecs.py:119
-msgid "This year"
-msgstr "Este año"
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "E-mail address:"
+msgstr "Dirección de correo electrónico:"
 
-#: contrib/admin/filterspecs.py:145
-#: oldforms/__init__.py:591
-#: newforms/widgets.py:188
-msgid "Yes"
-msgstr "Sí"
+#: contrib/admin/templates/registration/password_reset_form.html:16
+msgid "Reset my password"
+msgstr "Recuperar mi clave"
 
-#: contrib/admin/filterspecs.py:145
-#: oldforms/__init__.py:591
-#: newforms/widgets.py:188
-msgid "No"
-msgstr "No"
+#: contrib/admin/templates/widget/date_time.html:3
+msgid "Date:"
+msgstr "Fecha:"
 
-#: contrib/admin/filterspecs.py:152
-#: oldforms/__init__.py:591
-#: newforms/widgets.py:188
-msgid "Unknown"
-msgstr "Desconocido"
+#: contrib/admin/templates/widget/date_time.html:4
+msgid "Time:"
+msgstr "Hora:"
 
-#: contrib/admin/views/decorators.py:24
-#: contrib/admin/templates/admin/login.html:25
-msgid "Log in"
-msgstr "Identificarse"
+#: contrib/admin/templates/widget/file.html:2
+msgid "Currently:"
+msgstr "Actualmente:"
 
-#: contrib/admin/views/decorators.py:62
-msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
-msgstr "Por favor, identifíquese de nuevo, porque su sesión ha caducado. No se preocupe: se ha guardado su envío."
+#: contrib/admin/templates/widget/file.html:3
+msgid "Change:"
+msgstr "Modificar:"
 
-#: contrib/admin/views/decorators.py:69
-msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
-msgstr "Parece que su navegador no está configurado para aceptar cookies. Actívelas por favor, recargue esta página, e inténtelo de nuevo."
+#: contrib/admin/templatetags/admin_list.py:254
+msgid "All dates"
+msgstr "Todas las fechas"
 
-#: contrib/admin/views/decorators.py:83
-msgid "Usernames cannot contain the '@' character."
-msgstr "Los nombres de usuario no pueden contener el carácter '@'."
-
-#: contrib/admin/views/decorators.py:85
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr "Su dirección de correo no es su nombre de usuario. Pruebe con '%s' en su lugar."
-
-#: contrib/admin/views/main.py:230
-msgid "Site administration"
-msgstr "Sitio administrativo"
-
+#: contrib/admin/views/auth.py:20
 #: contrib/admin/views/main.py:264
-#: contrib/admin/views/auth.py:20
 #, python-format
 msgid "The %(name)s \"%(obj)s\" was added successfully."
 msgstr "Se añadió con éxito el %(name)s \"%(obj)s\"."
 
+#: contrib/admin/views/auth.py:25
 #: contrib/admin/views/main.py:268
 #: contrib/admin/views/main.py:354
-#: contrib/admin/views/auth.py:25
 msgid "You may edit it again below."
 msgstr "Puede editarlo de nuevo abajo."
 
-#: contrib/admin/views/main.py:278
-#: contrib/admin/views/main.py:363
-#, python-format
-msgid "You may add another %s below."
-msgstr "Puede agregar otro %s abajo."
+#: contrib/admin/views/auth.py:31
+msgid "Add user"
+msgstr "Añadir usuario"
 
-#: contrib/admin/views/main.py:296
-#, python-format
-msgid "Add %s"
-msgstr "Agregar %s"
+#: contrib/admin/views/auth.py:58
+msgid "Password changed successfully."
+msgstr "La clave se ha cambiado exitosamente."
 
-#: contrib/admin/views/main.py:342
+#: contrib/admin/views/auth.py:65
 #, python-format
-msgid "Added %s."
-msgstr "Agregado %s."
+msgid "Change password: %s"
+msgstr "Cambiar clave: %s"
 
-#: contrib/admin/views/main.py:344
-#, python-format
-msgid "Changed %s."
-msgstr "Modificado %s."
+#: contrib/admin/views/decorators.py:10
+#: contrib/auth/forms.py:60
+msgid "Please enter a correct username and password. Note that both fields are case-sensitive."
+msgstr "Por favor, introduzca un correcto nombre de usuario y contraseña. Note que ambos campos son sensibles a mayúsculas/minúsculas."
 
-#: contrib/admin/views/main.py:346
-#, python-format
-msgid "Deleted %s."
-msgstr "Borrado %s."
+#: contrib/admin/views/decorators.py:62
+msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved."
+msgstr "Por favor, identifíquese de nuevo, porque su sesión ha caducado. No se preocupe: se ha guardado su envío."
 
-#: contrib/admin/views/main.py:349
-msgid "No fields changed."
-msgstr "No ha cambiado ningún campo."
+#: contrib/admin/views/decorators.py:69
+msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again."
+msgstr "Parece que su navegador no está configurado para aceptar cookies. Actívelas por favor, recargue esta página, e inténtelo de nuevo."
 
-#: contrib/admin/views/main.py:352
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "Se modificó con éxito el %(name)s \"%(obj)s."
+#: contrib/admin/views/decorators.py:83
+msgid "Usernames cannot contain the '@' character."
+msgstr "Los nombres de usuario no pueden contener el carácter '@'."
 
-#: contrib/admin/views/main.py:360
+#: contrib/admin/views/decorators.py:85
 #, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
-msgstr "Se agregó con éxito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo."
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr "Su dirección de correo no es su nombre de usuario. Pruebe con '%s' en su lugar."
 
-#: contrib/admin/views/main.py:398
-#, python-format
-msgid "Change %s"
-msgstr "Modificar %s"
-
-#: contrib/admin/views/main.py:483
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Uno o más %(fieldname)s en %(name)s: %(obj)s"
-
-#: contrib/admin/views/main.py:488
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Uno o más %(fieldname)s en %(name)s:"
-
-#: contrib/admin/views/main.py:520
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"."
-
-#: contrib/admin/views/main.py:523
-msgid "Are you sure?"
-msgstr "¿Está seguro?"
-
-#: contrib/admin/views/main.py:545
-#, python-format
-msgid "Change history: %s"
-msgstr "Modificar histórico: %s"
-
-#: contrib/admin/views/main.py:579
-#, python-format
-msgid "Select %s"
-msgstr "Escoja %s"
-
-#: contrib/admin/views/main.py:579
-#, python-format
-msgid "Select %s to change"
-msgstr "Escoja %s para modificar"
-
-#: contrib/admin/views/main.py:780
-msgid "Database error"
-msgstr "Erorr en la base de datos"
-
 #: contrib/admin/views/doc.py:47
 #: contrib/admin/views/doc.py:49
 #: contrib/admin/views/doc.py:51
@@ -1065,667 +923,257 @@
 msgid "%s does not appear to be a urlpattern object"
 msgstr "%s no parece ser un objeto urlpattern"
 
-#: contrib/admin/views/auth.py:31
-msgid "Add user"
-msgstr "Añadir usuario"
+#: contrib/admin/views/main.py:230
+msgid "Site administration"
+msgstr "Sitio administrativo"
 
-#: contrib/admin/views/auth.py:58
-msgid "Password changed successfully."
-msgstr "La clave se ha cambiado exitosamente."
-
-#: contrib/admin/views/auth.py:65
+#: contrib/admin/views/main.py:278
+#: contrib/admin/views/main.py:363
 #, python-format
-msgid "Change password: %s"
-msgstr "Cambiar clave: %s"
+msgid "You may add another %s below."
+msgstr "Puede agregar otro %s abajo."
 
-#: contrib/admin/templatetags/admin_list.py:254
-msgid "All dates"
-msgstr "Todas las fechas"
-
-#: contrib/admin/templates/admin/pagination.html:10
-msgid "Show all"
-msgstr "Mostrarlo todo"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
-msgid "Documentation"
-msgstr "Documentación"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin/auth/user/change_password.html:15
-#: contrib/admin/templates/admin/auth/user/change_password.html:46
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
-msgid "Change password"
-msgstr "Cambiar clave"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:3
-#: contrib/admin/templates/admin/change_form.html:10
-#: contrib/admin/templates/admin/change_list.html:5
-#: contrib/admin/templates/admin/object_history.html:3
-#: contrib/admin/templates/admin/base.html:25
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/admin_doc/template_filter_index.html:5
-#: contrib/admin/templates/admin_doc/bookmarklets.html:4
-#: contrib/admin/templates/admin_doc/template_tag_index.html:5
-#: contrib/admin/templates/admin_doc/index.html:4
-#: contrib/admin/templates/admin_doc/model_detail.html:3
-#: contrib/admin/templates/admin_doc/missing_docutils.html:4
-#: contrib/admin/templates/admin_doc/template_detail.html:4
-#: contrib/admin/templates/admin_doc/view_index.html:5
-#: contrib/admin/templates/admin_doc/model_index.html:5
-#: contrib/admin/templates/admin_doc/view_detail.html:4
-#: contrib/admin/templates/registration/password_change_form.html:3
-#: contrib/admin/templates/registration/password_change_done.html:3
-#: contrib/comments/templates/comments/form.html:6
-msgid "Log out"
-msgstr "Terminar sesión"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:6
-#: contrib/admin/templates/admin/change_form.html:13
-#: contrib/admin/templates/admin/change_list.html:6
-#: contrib/admin/templates/admin/object_history.html:5
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/base.html:30
-#: contrib/admin/templates/admin/auth/user/change_password.html:12
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_done.html:4
-msgid "Home"
-msgstr "Inicio"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:9
-#: contrib/admin/templates/admin/submit_line.html:3
-msgid "Delete"
-msgstr "Eliminar"
-
-#: contrib/admin/templates/admin/delete_confirmation.html:14
+#: contrib/admin/views/main.py:296
 #, python-format
-msgid "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
-msgstr "Eliminar el %(object_name)s '%(escaped_object)s' provocaría la eliminación de objetos relacionados, pero su cuenta no tiene permiso para borrar los siguientes tipos de objetos:"
+msgid "Add %s"
+msgstr "Agregar %s"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:21
+#: contrib/admin/views/main.py:342
 #, python-format
-msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:"
-msgstr "¿Está seguro de que quiere borrar los %(object_name)s \"%(escaped_object)s\"? Se borrarán los siguientes objetos relacionados:"
+msgid "Added %s."
+msgstr "Agregado %s."
 
-#: contrib/admin/templates/admin/delete_confirmation.html:26
-msgid "Yes, I'm sure"
-msgstr "Sí, estoy seguro"
+#: contrib/admin/views/main.py:342
+#: contrib/admin/views/main.py:344
+#: contrib/admin/views/main.py:346
+#: core/validators.py:283
+#: db/models/manipulators.py:309
+msgid "and"
+msgstr "y"
 
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
-msgid "Page not found"
-msgstr "Página no encontrada"
+#: contrib/admin/views/main.py:344
+#, python-format
+msgid "Changed %s."
+msgstr "Modificado %s."
 
-#: contrib/admin/templates/admin/404.html:10
-msgid "We're sorry, but the requested page could not be found."
-msgstr "Lo sentimos, pero no se encuentra la página solicitada."
-
-#: contrib/admin/templates/admin/change_form.html:15
-#: contrib/admin/templates/admin/index.html:28
-msgid "Add"
-msgstr "Agregar"
-
-#: contrib/admin/templates/admin/change_form.html:21
-#: contrib/admin/templates/admin/object_history.html:5
-msgid "History"
-msgstr "Histórico"
-
-#: contrib/admin/templates/admin/change_form.html:22
-msgid "View on site"
-msgstr "Ver en el sitio"
-
-#: contrib/admin/templates/admin/change_form.html:32
-#: contrib/admin/templates/admin/auth/user/change_password.html:24
-msgid "Please correct the error below."
-msgid_plural "Please correct the errors below."
-msgstr[0] "Por favor, corrija el siguiente error."
-msgstr[1] "Por favor, corrija los siguientes errores."
-
-#: contrib/admin/templates/admin/change_form.html:50
-msgid "Ordering"
-msgstr "Ordenación"
-
-#: contrib/admin/templates/admin/change_form.html:53
-msgid "Order:"
-msgstr "Orden:"
-
-#: contrib/admin/templates/admin/filter.html:2
+#: contrib/admin/views/main.py:346
 #, python-format
-msgid " By %(filter_title)s "
-msgstr " Por %(filter_title)s "
+msgid "Deleted %s."
+msgstr "Borrado %s."
 
-#: contrib/admin/templates/admin/submit_line.html:4
-msgid "Save as new"
-msgstr "Grabar como nuevo"
+#: contrib/admin/views/main.py:349
+msgid "No fields changed."
+msgstr "No ha cambiado ningún campo."
 
-#: contrib/admin/templates/admin/submit_line.html:5
-msgid "Save and add another"
-msgstr "Grabar y añadir otro"
-
-#: contrib/admin/templates/admin/submit_line.html:6
-msgid "Save and continue editing"
-msgstr "Grabar y continuar editando"
-
-#: contrib/admin/templates/admin/submit_line.html:7
-msgid "Save"
-msgstr "Grabar"
-
-#: contrib/admin/templates/admin/change_list.html:12
+#: contrib/admin/views/main.py:352
 #, python-format
-msgid "Add %(name)s"
-msgstr "Agregar %(name)s"
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "Se modificó con éxito el %(name)s \"%(obj)s."
 
-#: contrib/admin/templates/admin/index.html:17
+#: contrib/admin/views/main.py:360
 #, python-format
-msgid "Models available in the %(name)s application."
-msgstr "Modelos disponibles en la aplicación %(name)s."
+msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr "Se agregó con éxito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo."
 
-#: contrib/admin/templates/admin/index.html:18
+#: contrib/admin/views/main.py:398
 #, python-format
-msgid "%(name)s"
-msgstr "%(name)s"
+msgid "Change %s"
+msgstr "Modificar %s"
 
-#: contrib/admin/templates/admin/index.html:34
-msgid "Change"
-msgstr "Modificar"
-
-#: contrib/admin/templates/admin/index.html:44
-msgid "You don't have permission to edit anything."
-msgstr "No tiene permiso para editar nada."
-
-#: contrib/admin/templates/admin/index.html:52
-msgid "Recent Actions"
-msgstr "Acciones recientes"
-
-#: contrib/admin/templates/admin/index.html:53
-msgid "My Actions"
-msgstr "Mis acciones"
-
-#: contrib/admin/templates/admin/index.html:57
-msgid "None available"
-msgstr "Ninguno disponible"
-
-#: contrib/admin/templates/admin/base_site.html:4
-msgid "Django site admin"
-msgstr "Sitio de administración de Django"
-
-#: contrib/admin/templates/admin/base_site.html:7
-msgid "Django administration"
-msgstr "Administración de Django"
-
-#: contrib/admin/templates/admin/object_history.html:18
-msgid "Date/time"
-msgstr "Fecha/hora"
-
-#: contrib/admin/templates/admin/object_history.html:19
-msgid "User"
-msgstr "Usuario"
-
-#: contrib/admin/templates/admin/object_history.html:20
-msgid "Action"
-msgstr "Acción"
-
-#: contrib/admin/templates/admin/object_history.html:26
-msgid "DATE_WITH_TIME_FULL"
-msgstr "j M Y P"
-
-#: contrib/admin/templates/admin/object_history.html:36
-msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
-msgstr "Este objeto no tiene histórico de cambios. Probablemente no fue añadido usando este sitio de administración."
-
-#: contrib/admin/templates/admin/500.html:4
-msgid "Server error"
-msgstr "Error del servidor"
-
-#: contrib/admin/templates/admin/500.html:6
-msgid "Server error (500)"
-msgstr "Error del servidor (500)"
-
-#: contrib/admin/templates/admin/500.html:9
-msgid "Server Error <em>(500)</em>"
-msgstr "Error de servidor <em>(500)</em>"
-
-#: contrib/admin/templates/admin/500.html:10
-msgid "There's been an error. It's been reported to the site administrators via e-mail and should be fixed shortly. Thanks for your patience."
-msgstr "Ha ocurrido un error. Se ha informado a los administradores del sitio mediante correo electrónico y debería arreglarse en breve. Gracias por su paciencia."
-
-#: contrib/admin/templates/admin/invalid_setup.html:8
-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 "Algo va mal con la instalación de la base de datos. Asegúrate que las tablas necesarias han sido creadas, y que la base de datos puede ser leída por el usuario apropiado."
-
-#: contrib/admin/templates/admin/search_form.html:8
-msgid "Go"
-msgstr "Buscar"
-
-#: contrib/admin/templates/admin/search_form.html:10
+#: contrib/admin/views/main.py:483
 #, python-format
-msgid "1 result"
-msgid_plural "%(counter)s results"
-msgstr[0] "1 resultado"
-msgstr[1] "%(counter)s resultados"
+msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
+msgstr "Uno o más %(fieldname)s en %(name)s: %(obj)s"
 
-#: contrib/admin/templates/admin/search_form.html:10
+#: contrib/admin/views/main.py:488
 #, python-format
-msgid "%(full_result_count)s total"
-msgstr "%(full_result_count)s total"
+msgid "One or more %(fieldname)s in %(name)s:"
+msgstr "Uno o más %(fieldname)s en %(name)s:"
 
-#: contrib/admin/templates/admin/filters.html:4
-msgid "Filter"
-msgstr "Filtro"
-
-#: contrib/admin/templates/admin/login.html:17
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/comments/templates/comments/form.html:8
-msgid "Username:"
-msgstr "Usuario:"
-
-#: contrib/admin/templates/admin/login.html:20
-#: contrib/comments/templates/comments/form.html:8
-msgid "Password:"
-msgstr "Clave:"
-
-#: contrib/admin/templates/admin/base.html:25
-msgid "Welcome,"
-msgstr "Bienvenido,"
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:6
-msgid "First, enter a username and password. Then, you'll be able to edit more user options."
-msgstr "Primero introduzca un nombre de usuario y una contraseña. Luego podrá editar el resto de opciones del usuario."
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:12
-msgid "Username"
-msgstr "Nombre de usuario"
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:18
-#: contrib/admin/templates/admin/auth/user/change_password.html:34
-msgid "Password"
-msgstr "Contraseña"
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:23
-#: contrib/admin/templates/admin/auth/user/change_password.html:39
-msgid "Password (again)"
-msgstr "Contraseña (de nuevo)"
-
-#: contrib/admin/templates/admin/auth/user/add_form.html:24
-#: contrib/admin/templates/admin/auth/user/change_password.html:40
-msgid "Enter the same password as above, for verification."
-msgstr "Introduzca la misma contraseña que arriba, para verificación"
-
-#: contrib/admin/templates/admin/auth/user/change_password.html:28
+#: contrib/admin/views/main.py:520
 #, python-format
-msgid "Enter a new password for the user <strong>%(username)s</strong>."
-msgstr "Introduzca una nueva contraseña para el usuario <strong>%(username)s</strong>."
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"."
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:3
-msgid "Bookmarklets"
-msgstr "Bookmarklets"
+#: contrib/admin/views/main.py:523
+msgid "Are you sure?"
+msgstr "¿Está seguro?"
 
-#: contrib/admin/templates/admin_doc/bookmarklets.html:5
-msgid "Documentation bookmarklets"
-msgstr "Bookmarklets de documentación"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:9
-msgid ""
-"\n"
-"<p class=\"help\">To install bookmarklets, drag the link to your bookmarks\n"
-"toolbar, or right-click the link and add it to your bookmarks. Now you can\n"
-"select the bookmarklet from any page in the site.  Note that some of these\n"
-"bookmarklets require you to be viewing the site from a computer designated\n"
-"as \"internal\" (talk to your system administrator if you aren't sure if\n"
-"your computer is \"internal\").</p>\n"
-msgstr ""
-"\n"
-"<p class=\"help\">Para instalar bookmarklets, arrastre el enlace a su barra\n"
-"de favoritos, o pulse con el botón derecho el enlace y añádalo a sus favoritos.\n"
-"Ahora puede escoger el bookmarklet desde cualquier página en el sitio.\n"
-"Observer que algunos de estos bookmarklets precisan que esté viendo\n"
-"el sitio desde un computador señalado como \"interno\" (hable\n"
-"con su administrador de sistemas si no está seguro de si el suyo lo es).</p>\n"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:19
-msgid "Documentation for this page"
-msgstr "Documentación de esta página"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:20
-msgid "Jumps you from any page to the documentation for the view that generates that page."
-msgstr "Le lleva desde cualquier página a la documentación de la vista que la genera."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:22
-msgid "Show object ID"
-msgstr "Mostrar ID de objeto"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:23
-msgid "Shows the content-type and unique ID for pages that represent a single object."
-msgstr "Muestra el tipo de contenido e ID unívoco de las páginas que representan un único objeto."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:25
-msgid "Edit this object (current window)"
-msgstr "Editar este objeto (ventana actual)"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:26
-msgid "Jumps to the admin page for pages that represent a single object."
-msgstr "Le lleva a la página de administración de páginas que representan un único objeto."
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:28
-msgid "Edit this object (new window)"
-msgstr "Editar este objeto (nueva ventana)"
-
-#: contrib/admin/templates/admin_doc/bookmarklets.html:29
-msgid "As above, but opens the admin page in a new window."
-msgstr "Como antes, pero abre la página de administración en una nueva ventana."
-
-#: contrib/admin/templates/widget/date_time.html:3
-msgid "Date:"
-msgstr "Fecha:"
-
-#: contrib/admin/templates/widget/date_time.html:4
-msgid "Time:"
-msgstr "Hora:"
-
-#: contrib/admin/templates/widget/file.html:2
-msgid "Currently:"
-msgstr "Actualmente:"
-
-#: contrib/admin/templates/widget/file.html:3
-msgid "Change:"
-msgstr "Modificar:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:6
-#: contrib/admin/templates/registration/password_reset_form.html:10
-#: contrib/admin/templates/registration/password_reset_done.html:4
-msgid "Password reset"
-msgstr "Recuperar clave"
-
-#: contrib/admin/templates/registration/password_reset_form.html:12
-msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
-msgstr "¿Ha olvidado su clave? Introduzca su dirección de correo electrónico, y crearemos una nueva que le enviaremos por correo."
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "E-mail address:"
-msgstr "Dirección de correo electrónico:"
-
-#: contrib/admin/templates/registration/password_reset_form.html:16
-msgid "Reset my password"
-msgstr "Recuperar mi clave"
-
-#: contrib/admin/templates/registration/password_reset_email.html:2
-msgid "You're receiving this e-mail because you requested a password reset"
-msgstr "Está recibiendo este mensaje debido a que solicitó recuperar la clave"
-
-#: contrib/admin/templates/registration/password_reset_email.html:3
+#: contrib/admin/views/main.py:545
 #, python-format
-msgid "for your user account at %(site_name)s"
-msgstr "de su cuenta de usuario en %(site_name)s."
+msgid "Change history: %s"
+msgstr "Modificar histórico: %s"
 
-#: contrib/admin/templates/registration/password_reset_email.html:5
+#: contrib/admin/views/main.py:579
 #, python-format
-msgid "Your new password is: %(new_password)s"
-msgstr "Su nueva clave es: %(new_password)s"
+msgid "Select %s"
+msgstr "Escoja %s"
 
-#: contrib/admin/templates/registration/password_reset_email.html:7
-msgid "Feel free to change this password by going to this page:"
-msgstr "Puede cambiarla accediendo a esta página:"
-
-#: contrib/admin/templates/registration/password_reset_email.html:11
-msgid "Your username, in case you've forgotten:"
-msgstr "Su nombre de usuario, en caso de haberlo olvidado:"
-
-#: contrib/admin/templates/registration/password_reset_email.html:13
-msgid "Thanks for using our site!"
-msgstr "¡Gracias por usar nuestro sitio!"
-
-#: contrib/admin/templates/registration/password_reset_email.html:15
+#: contrib/admin/views/main.py:579
 #, python-format
-msgid "The %(site_name)s team"
-msgstr "El equipo de %(site_name)s"
+msgid "Select %s to change"
+msgstr "Escoja %s para modificar"
 
-#: contrib/admin/templates/registration/logged_out.html:8
-msgid "Thanks for spending some quality time with the Web site today."
-msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy."
+#: contrib/admin/views/main.py:780
+msgid "Database error"
+msgstr "Erorr en la base de datos"
 
-#: contrib/admin/templates/registration/logged_out.html:10
-msgid "Log in again"
-msgstr "Identificarse de nuevo"
+#: contrib/auth/forms.py:17
+#: contrib/auth/forms.py:138
+msgid "The two password fields didn't match."
+msgstr "Las dos contraseñas no coinciden."
 
-#: contrib/admin/templates/registration/password_reset_done.html:6
-#: contrib/admin/templates/registration/password_reset_done.html:10
-msgid "Password reset successful"
-msgstr "Recuperación de clave exitosa"
+#: contrib/auth/forms.py:25
+msgid "A user with that username already exists."
+msgstr "Ya existe  un usuario con este nombre."
 
-#: contrib/admin/templates/registration/password_reset_done.html:12
-msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
-msgstr "Le hemos enviado una clave nueva a la dirección que ha suministrado. Debería recibirla en breve."
+#: contrib/auth/forms.py:53
+msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in."
+msgstr "Tu navegador de internet parece no tener las cookies habilitadas. Las cookies se necesitan para poder ingresar."
 
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_change_form.html:6
-#: contrib/admin/templates/registration/password_change_form.html:10
-#: contrib/admin/templates/registration/password_change_done.html:4
-msgid "Password change"
-msgstr "Cambio de clave"
+#: contrib/auth/forms.py:62
+msgid "This account is inactive."
+msgstr "Esta cuenta está inactiva."
 
-#: contrib/admin/templates/registration/password_change_form.html:12
-msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
-msgstr "Por favor, introduzca su clave antigua, por seguridad, y después introduzca la nueva clave dos veces para verificar que la ha escrito correctamente."
+#: contrib/auth/forms.py:84
+msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?"
+msgstr "Esta dirección de correo electrónico no tiene una cuenta de usuario asociada. ¿Está seguro de que se ha registrado?"
 
-#: contrib/admin/templates/registration/password_change_form.html:17
-msgid "Old password:"
-msgstr "Clave antigua:"
+#: contrib/auth/forms.py:117
+msgid "The two 'new password' fields didn't match."
+msgstr "Las contraseñas introducidas en los campos 'nueva contraseña' no coinciden."
 
-#: contrib/admin/templates/registration/password_change_form.html:19
-msgid "New password:"
-msgstr "Clave nueva:"
+#: contrib/auth/forms.py:124
+msgid "Your old password was entered incorrectly. Please enter it again."
+msgstr "Tu contraseña antigua es incorrecta. Por favor, vuelve a introducirla correctamente."
 
-#: contrib/admin/templates/registration/password_change_form.html:21
-msgid "Confirm password:"
-msgstr "Confirme clave:"
+#: contrib/auth/models.py:73
+#: contrib/auth/models.py:93
+msgid "name"
+msgstr "nombre"
 
-#: contrib/admin/templates/registration/password_change_form.html:23
-msgid "Change my password"
-msgstr "Cambiar mi clave"
+#: contrib/auth/models.py:75
+msgid "codename"
+msgstr "nombre en código"
 
-#: contrib/admin/templates/registration/password_change_done.html:6
-#: contrib/admin/templates/registration/password_change_done.html:10
-msgid "Password change successful"
-msgstr "Cambio de clave exitoso"
+#: contrib/auth/models.py:78
+msgid "permission"
+msgstr "permiso"
 
-#: contrib/admin/templates/registration/password_change_done.html:12
-msgid "Your password was changed."
-msgstr "Su clave ha sido cambiada."
+#: contrib/auth/models.py:79
+#: contrib/auth/models.py:94
+msgid "permissions"
+msgstr "permisos"
 
-#: contrib/sites/models.py:33
-msgid "domain name"
-msgstr "nombre de dominio"
+#: contrib/auth/models.py:97
+msgid "group"
+msgstr "grupo"
 
-#: contrib/sites/models.py:34
-msgid "display name"
-msgstr "nombre para mostrar"
+#: contrib/auth/models.py:98
+#: contrib/auth/models.py:141
+msgid "groups"
+msgstr "grupos"
 
-#: contrib/sites/models.py:38
-msgid "site"
-msgstr "sitio"
+#: contrib/auth/models.py:131
+msgid "username"
+msgstr "nombre de usuario"
 
-#: contrib/sites/models.py:39
-msgid "sites"
-msgstr "sitios"
+#: contrib/auth/models.py:131
+msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)."
+msgstr "Requerido. 30 caracteres o menos. Sólo caracteres alfanuméricos (letras, dígitos y guiones bajos)."
 
-#: contrib/humanize/templatetags/humanize.py:20
-msgid "th"
-msgstr "th"
+#: contrib/auth/models.py:132
+msgid "first name"
+msgstr "nombre"
 
-#: contrib/humanize/templatetags/humanize.py:20
-msgid "st"
-msgstr "st"
+#: contrib/auth/models.py:133
+msgid "last name"
+msgstr "apellidos"
 
-#: contrib/humanize/templatetags/humanize.py:20
-msgid "nd"
-msgstr "nd"
+#: contrib/auth/models.py:134
+msgid "e-mail address"
+msgstr "dirección de correo"
 
-#: contrib/humanize/templatetags/humanize.py:20
-msgid "rd"
-msgstr "rd"
+#: contrib/auth/models.py:135
+msgid "password"
+msgstr "clave"
 
-#: contrib/humanize/templatetags/humanize.py:50
-#, python-format
-msgid "%(value).1f million"
-msgid_plural "%(value).1f million"
-msgstr[0] "%(value).1f millón"
-msgstr[1] "%(value).1f millión"
+#: contrib/auth/models.py:135
+msgid "Use '[algo]$[salt]$[hexdigest]' or use the <a href=\"password/\">change password form</a>."
+msgstr "Use'[algo]$[sal]$[hash hexadecimal]' o use <a href=\"password/\">el formulario para cambiar la contraseña</a>."
 
-#: contrib/humanize/templatetags/humanize.py:53
-#, python-format
-msgid "%(value).1f billion"
-msgid_plural "%(value).1f billion"
-msgstr[0] "%(value).1f billión"
-msgstr[1] "%(value).1f billión"
+#: contrib/auth/models.py:136
+msgid "staff status"
+msgstr "es staff"
 
-#: contrib/humanize/templatetags/humanize.py:56
-#, python-format
-msgid "%(value).1f trillion"
-msgid_plural "%(value).1f trillion"
-msgstr[0] "%(value).1f trillión"
-msgstr[1] "%(value).1f trillión"
+#: contrib/auth/models.py:136
+msgid "Designates whether the user can log into this admin site."
+msgstr "Indica si el usuario puede entrar en este sitio de administración."
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "one"
-msgstr "uno"
+#: contrib/auth/models.py:137
+msgid "active"
+msgstr "activo"
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "two"
-msgstr "dos"
+#: contrib/auth/models.py:137
+msgid "Designates whether this user can log into the Django admin. Unselect this instead of deleting accounts."
+msgstr "Indica si el usuario puede entrar en este sitio de administración. Desmarque esto en lugar de borrar la cuenta."
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "three"
-msgstr "tres"
+#: contrib/auth/models.py:138
+msgid "superuser status"
+msgstr "es superusuario"
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "four"
-msgstr "cuatro"
+#: contrib/auth/models.py:138
+msgid "Designates that this user has all permissions without explicitly assigning them."
+msgstr "Indica que este usuario tiene todos los permisos sin asignárselos explícitamente."
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "five"
-msgstr "cinco"
+#: contrib/auth/models.py:139
+msgid "last login"
+msgstr "Último registro"
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "six"
-msgstr "seis"
+#: contrib/auth/models.py:140
+msgid "date joined"
+msgstr "fecha de creación"
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "seven"
-msgstr "siete"
+#: contrib/auth/models.py:142
+msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
+msgstr "Además de los permisos asignados manualmente, este usuario también tendrá todos los permisos de los grupos en los que esté."
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "eight"
-msgstr "ocho"
+#: contrib/auth/models.py:143
+msgid "user permissions"
+msgstr "permisos"
 
-#: contrib/humanize/templatetags/humanize.py:71
-msgid "nine"
-msgstr "nueve"
+#: contrib/auth/models.py:147
+msgid "user"
+msgstr "usuario"
 
-#: contrib/humanize/templatetags/humanize.py:90
-msgid "today"
-msgstr "hoy"
+#: contrib/auth/models.py:148
+msgid "users"
+msgstr "usuarios"
 
-#: contrib/humanize/templatetags/humanize.py:92
-msgid "tomorrow"
-msgstr "mañana"
+#: contrib/auth/models.py:154
+msgid "Personal info"
+msgstr "Información personal"
 
-#: contrib/humanize/templatetags/humanize.py:94
-msgid "yesterday"
-msgstr "ayer"
+#: contrib/auth/models.py:155
+msgid "Permissions"
+msgstr "Permisos"
 
-#: contrib/flatpages/models.py:8
-msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr "Ejemplo: '/about/contact/'. Asegúrese de que pone barras al principio y al final."
+#: contrib/auth/models.py:156
+msgid "Important dates"
+msgstr "Fechas importantes"
 
-#: contrib/flatpages/models.py:9
-msgid "title"
-msgstr "título"
+#: contrib/auth/models.py:157
+msgid "Groups"
+msgstr "Grupos"
 
-#: contrib/flatpages/models.py:10
-msgid "content"
-msgstr "contenido"
+#: contrib/auth/models.py:316
+msgid "message"
+msgstr "mensaje"
 
-#: contrib/flatpages/models.py:11
-msgid "enable comments"
-msgstr "admitir comentarios"
+#: contrib/auth/views.py:47
+msgid "Logged out"
+msgstr "Sesión terminada"
 
-#: contrib/flatpages/models.py:12
-msgid "template name"
-msgstr "nombre de plantilla"
-
-#: contrib/flatpages/models.py:13
-msgid "Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'."
-msgstr "Ejemplo: 'flatpages/contact_page.html'. Si no es proporcionado, el sistema usará 'flatpages/default.html'."
-
-#: contrib/flatpages/models.py:14
-msgid "registration required"
-msgstr "debe estar registrado"
-
-#: contrib/flatpages/models.py:14
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr "Si está marcado, sólo los usuarios registrados podrán ver la página."
-
-#: contrib/flatpages/models.py:18
-msgid "flat page"
-msgstr "página estática"
-
-#: contrib/flatpages/models.py:19
-msgid "flat pages"
-msgstr "páginas estáticas"
-
-#: contrib/redirects/models.py:7
-msgid "redirect from"
-msgstr "redirigir desde"
-
-#: contrib/redirects/models.py:8
-msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
-msgstr "Esta ruta debería ser absoluta, excluyendo el nombre de dominio. Ejeplo: '/events/search/'."
-
-#: contrib/redirects/models.py:9
-msgid "redirect to"
-msgstr "redirigir a"
-
-#: contrib/redirects/models.py:10
-msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
-msgstr "Esto puede ser bien una ruta absoluta (como antes) o una URL completa que empiece con 'http://'."
-
-#: contrib/redirects/models.py:13
-msgid "redirect"
-msgstr "redirección"
-
-#: contrib/redirects/models.py:14
-msgid "redirects"
-msgstr "redirecciones"
-
 #: contrib/comments/models.py:67
 #: contrib/comments/models.py:169
 msgid "object ID"
@@ -1905,18 +1353,42 @@
 msgid "Moderator deletion by %r"
 msgstr "Eliminación del moderador %r"
 
-#: contrib/comments/views/karma.py:20
-msgid "Anonymous users cannot vote"
-msgstr "Los usuarios anónimos no pueden votar"
+#: contrib/comments/templates/comments/form.html:8
+msgid "Forgotten your password?"
+msgstr "¿Has olvidado tu contraseña?"
 
-#: contrib/comments/views/karma.py:24
-msgid "Invalid comment ID"
-msgstr "ID de comentario no válido"
+#: contrib/comments/templates/comments/form.html:12
+msgid "Ratings"
+msgstr "Calificaciones"
 
-#: contrib/comments/views/karma.py:26
-msgid "No voting for yourself"
-msgstr "No puedes votarte tú mismo"
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Required"
+msgstr "Requerido"
 
+#: contrib/comments/templates/comments/form.html:12
+#: contrib/comments/templates/comments/form.html:23
+msgid "Optional"
+msgstr "Opcional"
+
+#: contrib/comments/templates/comments/form.html:23
+msgid "Post a photo"
+msgstr "Postea una fotografía"
+
+#: contrib/comments/templates/comments/form.html:28
+#: contrib/comments/templates/comments/freeform.html:5
+msgid "Comment:"
+msgstr "Comentario:"
+
+#: contrib/comments/templates/comments/form.html:35
+#: contrib/comments/templates/comments/freeform.html:10
+msgid "Preview comment"
+msgstr "Previsualizar comentario"
+
+#: contrib/comments/templates/comments/freeform.html:4
+msgid "Your name:"
+msgstr "Tu nombre:"
+
 #: contrib/comments/views/comments.py:28
 msgid "This rating is required because you've entered at least one other rating."
 msgstr "Se precisa esta puntuación porque ha introducido al menos otra más."
@@ -1951,67 +1423,180 @@
 "\n"
 "%(text)s"
 
-#: contrib/comments/views/comments.py:189
-#: contrib/comments/views/comments.py:281
+#: contrib/comments/views/comments.py:190
+#: contrib/comments/views/comments.py:283
 msgid "Only POSTs are allowed"
 msgstr "Sólo se admite POST"
 
-#: contrib/comments/views/comments.py:193
-#: contrib/comments/views/comments.py:285
+#: contrib/comments/views/comments.py:194
+#: contrib/comments/views/comments.py:287
 msgid "One or more of the required fields wasn't submitted"
 msgstr "No se proporcionó uno o más de los siguientes campos requeridos"
 
-#: contrib/comments/views/comments.py:197
-#: contrib/comments/views/comments.py:287
+#: contrib/comments/views/comments.py:198
+#: contrib/comments/views/comments.py:289
 msgid "Somebody tampered with the comment form (security violation)"
 msgstr "Alguien está jugando con el formulario de comentarios (violación de seguridad)"
 
-#: contrib/comments/views/comments.py:207
-#: contrib/comments/views/comments.py:293
+#: contrib/comments/views/comments.py:208
+#: contrib/comments/views/comments.py:295
 msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid"
 msgstr "El formulario de comentarios tiene un parámetro 'target' no válido (el ID de objeto era inválido)"
 
-#: contrib/comments/views/comments.py:258
-#: contrib/comments/views/comments.py:322
+#: contrib/comments/views/comments.py:259
+#: contrib/comments/views/comments.py:324
 msgid "The comment form didn't provide either 'preview' or 'post'"
 msgstr "El formulario de comentario no proporcionó 'previsualizar' ni 'enviar'"
 
-#: contrib/comments/templates/comments/form.html:8
-msgid "Forgotten your password?"
-msgstr "¿Has olvidado tu contraseña?"
+#: contrib/comments/views/karma.py:21
+msgid "Anonymous users cannot vote"
+msgstr "Los usuarios anónimos no pueden votar"
 
-#: contrib/comments/templates/comments/form.html:12
-msgid "Ratings"
-msgstr "Calificaciones"
+#: contrib/comments/views/karma.py:25
+msgid "Invalid comment ID"
+msgstr "ID de comentario no válido"
 
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Required"
-msgstr "Requerido"
+#: contrib/comments/views/karma.py:27
+msgid "No voting for yourself"
+msgstr "No puedes votarte tú mismo"
 
-#: contrib/comments/templates/comments/form.html:12
-#: contrib/comments/templates/comments/form.html:23
-msgid "Optional"
-msgstr "Opcional"
+#: contrib/contenttypes/models.py:37
+msgid "python model class name"
+msgstr "nombre de módulo python"
 
-#: contrib/comments/templates/comments/form.html:23
-msgid "Post a photo"
-msgstr "Postea una fotografía"
+#: contrib/contenttypes/models.py:40
+msgid "content type"
+msgstr "tipo de contenido"
 
-#: contrib/comments/templates/comments/form.html:28
-#: contrib/comments/templates/comments/freeform.html:5
-msgid "Comment:"
-msgstr "Comentario:"
+#: contrib/contenttypes/models.py:41
+msgid "content types"
+msgstr "tipos de contenido"
 
-#: contrib/comments/templates/comments/form.html:35
-#: contrib/comments/templates/comments/freeform.html:10
-msgid "Preview comment"
-msgstr "Previsualizar comentario"
+#: contrib/flatpages/models.py:8
+msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr "Ejemplo: '/about/contact/'. Asegúrese de que pone barras al principio y al final."
 
-#: contrib/comments/templates/comments/freeform.html:4
-msgid "Your name:"
-msgstr "Tu nombre:"
+#: contrib/flatpages/models.py:9
+msgid "title"
+msgstr "título"
 
+#: contrib/flatpages/models.py:10
+msgid "content"
+msgstr "contenido"
+
+#: contrib/flatpages/models.py:11
+msgid "enable comments"
+msgstr "admitir comentarios"
+
+#: contrib/flatpages/models.py:12
+msgid "template name"
+msgstr "nombre de plantilla"
+
+#: contrib/flatpages/models.py:13
+msgid "Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'."
+msgstr "Ejemplo: 'flatpages/contact_page.html'. Si no es proporcionado, el sistema usará 'flatpages/default.html'."
+
+#: contrib/flatpages/models.py:14
+msgid "registration required"
+msgstr "debe estar registrado"
+
+#: contrib/flatpages/models.py:14
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr "Si está marcado, sólo los usuarios registrados podrán ver la página."
+
+#: contrib/flatpages/models.py:18
+msgid "flat page"
+msgstr "página estática"
+
+#: contrib/flatpages/models.py:19
+msgid "flat pages"
+msgstr "páginas estáticas"
+
+#: contrib/humanize/templatetags/humanize.py:20
+msgid "th"
+msgstr "th"
+
+#: contrib/humanize/templatetags/humanize.py:20
+msgid "st"
+msgstr "st"
+
+#: contrib/humanize/templatetags/humanize.py:20
+msgid "nd"
+msgstr "nd"
+
+#: contrib/humanize/templatetags/humanize.py:20
+msgid "rd"
+msgstr "rd"
+
+#: contrib/humanize/templatetags/humanize.py:50
+#, python-format
+msgid "%(value).1f million"
+msgid_plural "%(value).1f million"
+msgstr[0] "%(value).1f millón"
+msgstr[1] "%(value).1f millión"
+
+#: contrib/humanize/templatetags/humanize.py:53
+#, python-format
+msgid "%(value).1f billion"
+msgid_plural "%(value).1f billion"
+msgstr[0] "%(value).1f billión"
+msgstr[1] "%(value).1f billión"
+
+#: contrib/humanize/templatetags/humanize.py:56
+#, python-format
+msgid "%(value).1f trillion"
+msgid_plural "%(value).1f trillion"
+msgstr[0] "%(value).1f trillión"
+msgstr[1] "%(value).1f trillión"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "one"
+msgstr "uno"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "two"
+msgstr "dos"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "three"
+msgstr "tres"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "four"
+msgstr "cuatro"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "five"
+msgstr "cinco"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "six"
+msgstr "seis"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "seven"
+msgstr "siete"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "eight"
+msgstr "ocho"
+
+#: contrib/humanize/templatetags/humanize.py:71
+msgid "nine"
+msgstr "nueve"
+
+#: contrib/humanize/templatetags/humanize.py:90
+msgid "today"
+msgstr "hoy"
+
+#: contrib/humanize/templatetags/humanize.py:92
+msgid "tomorrow"
+msgstr "mañana"
+
+#: contrib/humanize/templatetags/humanize.py:94
+msgid "yesterday"
+msgstr "ayer"
+
 #: contrib/localflavor/ar/forms.py:30
 #: contrib/localflavor/ar/forms.py:38
 msgid "Enter a postal code in the format NNNN or ANNNNAAA."
@@ -2019,6 +1604,8 @@
 
 #: contrib/localflavor/ar/forms.py:61
 #: contrib/localflavor/br/forms.py:103
+#: contrib/localflavor/pe/forms.py:34
+#: contrib/localflavor/pe/forms.py:57
 msgid "This field requires only numbers."
 msgstr "Este campo sólo acepta números."
 
@@ -2066,14 +1653,13 @@
 msgid "Invalid CNPJ number."
 msgstr "Número CNPJ inválido"
 
-#: contrib/localflavor/ch/forms.py:18
-#: contrib/localflavor/no/forms.py:14
-msgid "Enter a zip code in the format XXXX."
-msgstr "Introduzca un código postal en el formato XXXX."
+#: contrib/localflavor/ca/forms.py:19
+msgid "Enter a postal code in the format XXX XXX."
+msgstr "Introduzca un código postal en el formato XXX XXX."
 
-#: contrib/localflavor/ch/forms.py:90
-msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format."
-msgstr "Introduzca una identificación suiza válida o un número de pasaporte en el formato X1234567<0 or 1234567890."
+#: contrib/localflavor/ca/forms.py:81
+msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXXX format."
+msgstr "Introduzca un Número Seguro Social de Canada válido en el formato XXX-XXX-XXXX."
 
 #: contrib/localflavor/ch/ch_states.py:5
 msgid "Aargau"
@@ -2179,6 +1765,15 @@
 msgid "Zurich"
 msgstr "Zurich"
 
+#: contrib/localflavor/ch/forms.py:18
+#: contrib/localflavor/no/forms.py:14
+msgid "Enter a zip code in the format XXXX."
+msgstr "Introduzca un código postal en el formato XXXX."
+
+#: contrib/localflavor/ch/forms.py:90
+msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format."
+msgstr "Introduzca una identificación suiza válida o un número de pasaporte en el formato X1234567<0 or 1234567890."
+
 #: contrib/localflavor/cl/forms.py:32
 msgid "Enter valid a Chilean RUT. The format is XX.XXX.XXX-X."
 msgstr "Introduzca un RUT chileno válido. El formato es XX.XXX.XXX-X."
@@ -2187,16 +1782,6 @@
 msgid "Enter valid a Chilean RUT"
 msgstr "Introduzca un RUT chileno válido"
 
-#: contrib/localflavor/de/forms.py:16
-#: contrib/localflavor/fi/forms.py:14
-#: contrib/localflavor/fr/forms.py:17
-msgid "Enter a zip code in the format XXXXX."
-msgstr "Introduzca un código postal en el formato XXXXX."
-
-#: contrib/localflavor/de/forms.py:60
-msgid "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format."
-msgstr "Introduzca un número de tarjeta de identidad de Alemania válida en el formato XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
-
 #: contrib/localflavor/de/de_states.py:5
 msgid "Baden-Wuerttemberg"
 msgstr "Baden-Wuerttemberg"
@@ -2261,11 +1846,335 @@
 msgid "Thuringia"
 msgstr "Thuringia"
 
+#: contrib/localflavor/de/forms.py:16
+#: contrib/localflavor/fi/forms.py:14
+#: contrib/localflavor/fr/forms.py:17
+msgid "Enter a zip code in the format XXXXX."
+msgstr "Introduzca un código postal en el formato XXXXX."
+
+#: contrib/localflavor/de/forms.py:60
+msgid "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format."
+msgstr "Introduzca un número de tarjeta de identidad de Alemania válida en el formato XXXXXXXXXXX-XXXXXXX-XXXXXXX-X."
+
+#: contrib/localflavor/es/es_provinces.py:5
+msgid "Arava"
+msgstr "Álava"
+
+#: contrib/localflavor/es/es_provinces.py:6
+msgid "Albacete"
+msgstr "Albacete"
+
+#: contrib/localflavor/es/es_provinces.py:7
+msgid "Alacant"
+msgstr "Alicante"
+
+#: contrib/localflavor/es/es_provinces.py:8
+msgid "Almeria"
+msgstr "Almería"
+
+#: contrib/localflavor/es/es_provinces.py:9
+msgid "Avila"
+msgstr "Ávila"
+
+#: contrib/localflavor/es/es_provinces.py:10
+msgid "Badajoz"
+msgstr "Badajoz"
+
+#: contrib/localflavor/es/es_provinces.py:11
+msgid "Illes Balears"
+msgstr "Islas Baleares"
+
+#: contrib/localflavor/es/es_provinces.py:12
+msgid "Barcelona"
+msgstr "Barcelona"
+
+#: contrib/localflavor/es/es_provinces.py:13
+msgid "Burgos"
+msgstr "Burgos"
+
+#: contrib/localflavor/es/es_provinces.py:14
+msgid "Caceres"
+msgstr "Cáceres"
+
+#: contrib/localflavor/es/es_provinces.py:15
+msgid "Cadiz"
+msgstr "Cádiz"
+
+#: contrib/localflavor/es/es_provinces.py:16
+msgid "Castello"
+msgstr "Castellón"
+
+#: contrib/localflavor/es/es_provinces.py:17
+msgid "Ciudad Real"
+msgstr "Ciudad Real"
+
+#: contrib/localflavor/es/es_provinces.py:18
+msgid "Cordoba"
+msgstr "Córdoba"
+
+#: contrib/localflavor/es/es_provinces.py:19
+msgid "A Coruna"
+msgstr "La Coruña"
+
+#: contrib/localflavor/es/es_provinces.py:20
+msgid "Cuenca"
+msgstr "Cuenca"
+
+#: contrib/localflavor/es/es_provinces.py:21
+msgid "Girona"
+msgstr "Gerona"
+
+#: contrib/localflavor/es/es_provinces.py:22
+msgid "Granada"
+msgstr "Granada"
+
+#: contrib/localflavor/es/es_provinces.py:23
+msgid "Guadalajara"
+msgstr "Guadalajara"
+
+#: contrib/localflavor/es/es_provinces.py:24
+msgid "Guipuzkoa"
+msgstr "Guipúzcoa"
+
+#: contrib/localflavor/es/es_provinces.py:25
+msgid "Huelva"
+msgstr "Huelva"
+
+#: contrib/localflavor/es/es_provinces.py:26
+msgid "Huesca"
+msgstr "Huesca"
+
+#: contrib/localflavor/es/es_provinces.py:27
+msgid "Jaen"
+msgstr "Jaén"
+
+#: contrib/localflavor/es/es_provinces.py:28
+msgid "Leon"
+msgstr "León"
+
+#: contrib/localflavor/es/es_provinces.py:29
+msgid "Lleida"
+msgstr "Lérida"
+
+#: 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
+msgid "Lugo"
+msgstr "Lugo"
+
+#: 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
+msgid "Malaga"
+msgstr "Málaga"
+
+#: contrib/localflavor/es/es_provinces.py:34
+msgid "Murcia"
+msgstr "Murcia"
+
+#: contrib/localflavor/es/es_provinces.py:35
+msgid "Navarre"
+msgstr "Navarra"
+
+#: contrib/localflavor/es/es_provinces.py:36
+msgid "Ourense"
+msgstr "Orense"
+
+#: contrib/localflavor/es/es_provinces.py:37
+msgid "Asturias"
+msgstr "Asturias"
+
+#: contrib/localflavor/es/es_provinces.py:38
+msgid "Palencia"
+msgstr "Palencia"
+
+#: contrib/localflavor/es/es_provinces.py:39
+msgid "Las Palmas"
+msgstr "Las Palmas"
+
+#: contrib/localflavor/es/es_provinces.py:40
+msgid "Pontevedra"
+msgstr "Pontevedra"
+
+#: contrib/localflavor/es/es_provinces.py:41
+msgid "Salamanca"
+msgstr "Salamanca"
+
+#: 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
+msgid "Cantabria"
+msgstr "Cantabria"
+
+#: contrib/localflavor/es/es_provinces.py:44
+msgid "Segovia"
+msgstr "Segovia"
+
+#: contrib/localflavor/es/es_provinces.py:45
+msgid "Seville"
+msgstr "Sevilla"
+
+#: contrib/localflavor/es/es_provinces.py:46
+msgid "Soria"
+msgstr "Soria"
+
+#: contrib/localflavor/es/es_provinces.py:47
+msgid "Tarragona"
+msgstr "Tarragona"
+
+#: contrib/localflavor/es/es_provinces.py:48
+msgid "Teruel"
+msgstr "Teruel"
+
+#: contrib/localflavor/es/es_provinces.py:49
+msgid "Toledo"
+msgstr "Toledo"
+
+#: contrib/localflavor/es/es_provinces.py:50
+msgid "Valencia"
+msgstr "Valencia"
+
+#: contrib/localflavor/es/es_provinces.py:51
+msgid "Valladolid"
+msgstr "Valladolid"
+
+#: contrib/localflavor/es/es_provinces.py:52
+msgid "Bizkaia"
+msgstr "Vizcaya"
+
+#: contrib/localflavor/es/es_provinces.py:53
+msgid "Zamora"
+msgstr "Zamora"
+
+#: contrib/localflavor/es/es_provinces.py:54
+msgid "Zaragoza"
+msgstr "Zaragoza"
+
+#: contrib/localflavor/es/es_provinces.py:55
+msgid "Ceuta"
+msgstr "Ceuta"
+
+#: contrib/localflavor/es/es_provinces.py:56
+msgid "Melilla"
+msgstr "Melilla"
+
+#: contrib/localflavor/es/es_regions.py:5
+msgid "Andalusia"
+msgstr "Andalucía"
+
+#: contrib/localflavor/es/es_regions.py:6
+msgid "Aragon"
+msgstr "Aragón"
+
+#: contrib/localflavor/es/es_regions.py:7
+msgid "Principality of Asturias"
+msgstr "Principado de Asturias"
+
+#: contrib/localflavor/es/es_regions.py:8
+msgid "Balearic Islands"
+msgstr "Islas Baleares"
+
+#: contrib/localflavor/es/es_regions.py:9
+msgid "Basque Country"
+msgstr "País Vasco"
+
+#: contrib/localflavor/es/es_regions.py:10
+msgid "Canary Islands"
+msgstr "Canarias"
+
+#: contrib/localflavor/es/es_regions.py:12
+msgid "Castile-La Mancha"
+msgstr "Castilla-La Mancha"
+
+#: contrib/localflavor/es/es_regions.py:13
+msgid "Castile and Leon"
+msgstr "Castilla y León"
+
+#: contrib/localflavor/es/es_regions.py:14
+msgid "Catalonia"
+msgstr "Cataluña"
+
+#: contrib/localflavor/es/es_regions.py:15
+msgid "Extremadura"
+msgstr "Extremadura"
+
+#: contrib/localflavor/es/es_regions.py:16
+msgid "Galicia"
+msgstr "Galicia"
+
+#: contrib/localflavor/es/es_regions.py:19
+msgid "Region of Murcia"
+msgstr "Región de Murcia"
+
+#: contrib/localflavor/es/es_regions.py:20
+msgid "Foral Community of Navarre"
+msgstr "Comunidad Foral de Navarra"
+
+#: contrib/localflavor/es/es_regions.py:21
+msgid "Valencian Community"
+msgstr "Comunidad Valenciana"
+
+#: contrib/localflavor/es/forms.py:22
+msgid "Enter a valid postal code in the range and format 01XXX - 52XXX."
+msgstr "Introduzca un código postal en el rango y formato 01XXX - 52XXX."
+
+#: contrib/localflavor/es/forms.py:39
+msgid "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX."
+msgstr "Introduzca un número de teléfono válido en el formato 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX."
+
+#: contrib/localflavor/es/forms.py:73
+#: contrib/localflavor/es/forms.py:108
+#: db/models/fields/related.py:55
+#, python-format
+msgid "Please enter a valid %s."
+msgstr "Por favor, introduzca un %s válido."
+
+#: contrib/localflavor/es/forms.py:91
+msgid "Invalid checksum for NIF."
+msgstr "El NIF es incorrecto."
+
+#: contrib/localflavor/es/forms.py:97
+msgid "Invalid checksum for NIE."
+msgstr "El NIE es incorrecto."
+
+#: contrib/localflavor/es/forms.py:106
+msgid "Invalid checksum for CIF."
+msgstr "El CIF es incorrecto."
+
+#: contrib/localflavor/es/forms.py:136
+msgid "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX."
+msgstr "Introduzca un número de cuenta bancaria en el formato XXXX-XXXX-XX-XXXXXXXXXX."
+
+#: contrib/localflavor/es/forms.py:150
+msgid "Invalid checksum for bank account number."
+msgstr "El número de cuenta bancaria es incorrecto."
+
 #: contrib/localflavor/fi/forms.py:40
 #: contrib/localflavor/fi/forms.py:45
 msgid "Enter a valid Finnish social security number."
 msgstr "Introduzca un número de seguro social finlandés válido."
 
+#: contrib/localflavor/in_/forms.py:16
+msgid "Enter a zip code in the format XXXXXXX."
+msgstr "Introduzca un código postal en el formato XXXXXXX."
+
+#: contrib/localflavor/is_/forms.py:17
+msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
+msgstr "Introduzca un número de identificación de Islandia válido. El formato es XXXXXX-XXXX."
+
+#: contrib/localflavor/is_/forms.py:31
+msgid "The Icelandic identification number is not valid."
+msgstr "El número de identificación de Islandia no es válido."
+
 #: contrib/localflavor/it/forms.py:16
 msgid "Enter a valid zip code."
 msgstr "Introduzca un código postal válido."
@@ -2534,19 +2443,39 @@
 msgid "Enter a valid Norwegian social security number."
 msgstr "Introduzca un número de seguro social de Noruega válido."
 
-#: contrib/localflavor/pl/forms.py:53
+#: contrib/localflavor/pe/forms.py:36
+msgid "This field requires 8 digits."
+msgstr "Este campo necesita 8 dígitos."
+
+#: contrib/localflavor/pe/forms.py:59
+msgid "This field requires 11 digits."
+msgstr "Este campo necesita 11 dígitos."
+
+#: contrib/localflavor/pl/forms.py:41
 msgid "National Identification Number consists of 11 digits."
 msgstr "Número de Identificación Nacional consiste en 11 dígitos"
 
-#: contrib/localflavor/pl/forms.py:59
+#: contrib/localflavor/pl/forms.py:47
 msgid "Wrong checksum for the National Identification Number."
 msgstr "El Número de Identificación Nacional es incorrecto."
 
-#: contrib/localflavor/pl/forms.py:71
+#: contrib/localflavor/pl/forms.py:72
 msgid "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX."
 msgstr "Introduzca un número de impuesto (NIP) en el formato XXX-XXX-XX-XX or XX-XX-XXX-XXX."
 
-#: contrib/localflavor/pl/forms.py:82
+#: contrib/localflavor/pl/forms.py:78
+msgid "Wrong checksum for the Tax Number (NIP)."
+msgstr "El Número de Identificación Tributaria (NIP) es incorrecto."
+
+#: contrib/localflavor/pl/forms.py:107
+msgid "National Business Register Number (REGON) consists of 7 or 9 digits."
+msgstr "El Número Nacional de Registro de Negocios (REGON) consiste en 11 dígitos"
+
+#: contrib/localflavor/pl/forms.py:113
+msgid "Wrong checksum for the National Business Register Number (REGON)."
+msgstr "El Número Nacional de Registro de Negocios (REGON) es incorrecto."
+
+#: contrib/localflavor/pl/forms.py:148
 msgid "Enter a postal code in the format XX-XXX."
 msgstr "Introduzca un código postal en el formato XX-XXX."
 
@@ -2978,50 +2907,512 @@
 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format."
 msgstr "Introduzca un Número Seguro Social de EEUU válido en el formato XXX-XX-XXXX"
 
-#: contrib/localflavor/in_/forms.py:16
-msgid "Enter a zip code in the format XXXXXXX."
-msgstr "Introduzca un código postal en el formato XXXXXXX."
+#: contrib/redirects/models.py:7
+msgid "redirect from"
+msgstr "redirigir desde"
 
-#: contrib/localflavor/is_/forms.py:17
-msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX."
-msgstr "Introduzca un número de identificación de Islandia válido. El formato es XXXXXX-XXXX."
+#: contrib/redirects/models.py:8
+msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
+msgstr "Esta ruta debería ser absoluta, excluyendo el nombre de dominio. Ejeplo: '/events/search/'."
 
-#: contrib/localflavor/is_/forms.py:31
-msgid "The Icelandic identification number is not valid."
-msgstr "El número de identificación de Islandia no es válido."
+#: contrib/redirects/models.py:9
+msgid "redirect to"
+msgstr "redirigir a"
 
-#: contrib/sessions/models.py:68
+#: contrib/redirects/models.py:10
+msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
+msgstr "Esto puede ser bien una ruta absoluta (como antes) o una URL completa que empiece con 'http://'."
+
+#: contrib/redirects/models.py:13
+msgid "redirect"
+msgstr "redirección"
+
+#: contrib/redirects/models.py:14
+msgid "redirects"
+msgstr "redirecciones"
+
+#: contrib/sessions/models.py:80
 msgid "session key"
 msgstr "clave de sesión"
 
-#: contrib/sessions/models.py:69
+#: contrib/sessions/models.py:81
 msgid "session data"
 msgstr "datos de sesión"
 
-#: contrib/sessions/models.py:70
+#: contrib/sessions/models.py:82
 msgid "expire date"
 msgstr "fecha de caducidad"
 
-#: contrib/sessions/models.py:74
+#: contrib/sessions/models.py:87
 msgid "session"
 msgstr "sesión"
 
-#: contrib/sessions/models.py:75
+#: contrib/sessions/models.py:88
 msgid "sessions"
 msgstr "sesiones"
 
-#: contrib/contenttypes/models.py:37
-msgid "python model class name"
-msgstr "nombre de módulo python"
+#: contrib/sites/models.py:32
+msgid "domain name"
+msgstr "nombre de dominio"
 
-#: contrib/contenttypes/models.py:40
-msgid "content type"
-msgstr "tipo de contenido"
+#: contrib/sites/models.py:33
+msgid "display name"
+msgstr "nombre para mostrar"
 
-#: contrib/contenttypes/models.py:41
-msgid "content types"
-msgstr "tipos de contenido"
+#: contrib/sites/models.py:37
+msgid "site"
+msgstr "sitio"
 
+#: contrib/sites/models.py:38
+msgid "sites"
+msgstr "sitios"
+
+#: core/validators.py:72
+msgid "This value must contain only letters, numbers and underscores."
+msgstr "Este valor debe contener sólo letras, números y guiones bajos."
+
+#: core/validators.py:76
+msgid "This value must contain only letters, numbers, underscores, dashes or slashes."
+msgstr "Este valor debe contener letras, números, guiones bajos o barras solamente."
+
+#: core/validators.py:80
+msgid "This value must contain only letters, numbers, underscores or hyphens."
+msgstr "Este valor debe contener sólo letras, números, guiones bajos o medios."
+
+#: core/validators.py:84
+msgid "Uppercase letters are not allowed here."
+msgstr "No se admiten letras mayúsculas."
+
+#: core/validators.py:88
+msgid "Lowercase letters are not allowed here."
+msgstr "No se admiten letras minúsculas."
+
+#: core/validators.py:95
+msgid "Enter only digits separated by commas."
+msgstr "Introduzca sólo dígitos separados por comas."
+
+#: core/validators.py:107
+msgid "Enter valid e-mail addresses separated by commas."
+msgstr "Introduzca direcciones de correo válidas separadas por comas."
+
+#: core/validators.py:111
+msgid "Please enter a valid IP address."
+msgstr "Por favor introduzca una dirección IP válida."
+
+#: core/validators.py:115
+msgid "Empty values are not allowed here."
+msgstr "No se admiten valores vacíos."
+
+#: core/validators.py:119
+msgid "Non-numeric characters aren't allowed here."
+msgstr "No se admiten caracteres no numéricos."
+
+#: core/validators.py:123
+msgid "This value can't be comprised solely of digits."
+msgstr "Este valor no puede comprender sólo dígitos."
+
+#: core/validators.py:128
+#: newforms/fields.py:149
+msgid "Enter a whole number."
+msgstr "Introduzca un número entero."
+
+#: core/validators.py:132
+msgid "Only alphabetical characters are allowed here."
+msgstr "Sólo se admiten caracteres alfabéticos."
+
+#: core/validators.py:147
+msgid "Year must be 1900 or later."
+msgstr "El año debe ser 1900 o posterior."
+
+#: core/validators.py:151
+#, python-format
+msgid "Invalid date: %s"
+msgstr "Fecha no válida: %s"
+
+#: core/validators.py:156
+#: db/models/fields/__init__.py:505
+msgid "Enter a valid date in YYYY-MM-DD format."
+msgstr "Introduzca una fecha válida en formato AAAA-MM-DD."
+
+#: core/validators.py:161
+msgid "Enter a valid time in HH:MM format."
+msgstr "Introduzca una hora válida en formato HH:MM."
+
+#: core/validators.py:165
+#: db/models/fields/__init__.py:579
+msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
+msgstr "Introduzca una fecha/hora válida en formato AAAA-MM-DD HH:MM."
+
+#: core/validators.py:170
+#: newforms/fields.py:343
+msgid "Enter a valid e-mail address."
+msgstr "Introduzca una dirección de correo electrónico válida"
+
+#: core/validators.py:182
+#: core/validators.py:474
+#: newforms/fields.py:377
+#: oldforms/__init__.py:686
+msgid "No file was submitted. Check the encoding type on the form."
+msgstr "No se ha enviado ningún fichero. Compruebe el tipo de codificación en el formulario."
+
+#: core/validators.py:193
+#: newforms/fields.py:405
+msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
+msgstr "Envíe una imagen válida. El fichero que ha enviado no era una imagen o se trataba de una imagen corrupta."
+
+#: core/validators.py:200
+#, python-format
+msgid "The URL %s does not point to a valid image."
+msgstr "La URL %s no apunta a una imagen válida."
+
+#: core/validators.py:204
+#, python-format
+msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
+msgstr "Los números de teléfono deben guardar el formato XXX-XXX-XXXX. \"%s\" no es válido."
+
+#: core/validators.py:212
+#, python-format
+msgid "The URL %s does not point to a valid QuickTime video."
+msgstr "La URL %s no apunta a un vídeo QuickTime válido."
+
+#: core/validators.py:216
+msgid "A valid URL is required."
+msgstr "Se precisa una URL válida."
+
+#: core/validators.py:230
+#, python-format
+msgid ""
+"Valid HTML is required. Specific errors are:\n"
+"%s"
+msgstr ""
+"Se precisa HTML válido. Los errores específicos son:\n"
+"%s"
+
+#: core/validators.py:237
+#, python-format
+msgid "Badly formed XML: %s"
+msgstr "XML mal formado: %s"
+
+#: core/validators.py:254
+#, python-format
+msgid "Invalid URL: %s"
+msgstr "URL no válida: %s"
+
+#: core/validators.py:259
+#: core/validators.py:261
+#, python-format
+msgid "The URL %s is a broken link."
+msgstr "La URL %s es un enlace roto."
+
+#: core/validators.py:267
+msgid "Enter a valid U.S. state abbreviation."
+msgstr "Introduzca una abreviatura válida de estado de los EEUU."
+
+#: core/validators.py:281
+#, python-format
+msgid "Watch your mouth! The word %s is not allowed here."
+msgid_plural "Watch your mouth! The words %s are not allowed here."
+msgstr[0] "¡Cuida tu vocabulario! Aquí no admitimos la palabra %s."
+msgstr[1] "¡Cuida tu vocabulario! Aquí no admitimos las palabras %s."
+
+#: core/validators.py:288
+#, python-format
+msgid "This field must match the '%s' field."
+msgstr "Este campo debe concordar con el campo '%s'."
+
+#: core/validators.py:307
+msgid "Please enter something for at least one field."
+msgstr "Por favor, introduzca algo en al menos un campo."
+
+#: core/validators.py:316
+#: core/validators.py:327
+msgid "Please enter both fields or leave them both empty."
+msgstr "Por favor, rellene ambos campos o deje ambos vacíos."
+
+#: core/validators.py:335
+#, python-format
+msgid "This field must be given if %(field)s is %(value)s"
+msgstr "Se debe proporcionar este campo si %(field)s es %(value)s"
+
+#: core/validators.py:348
+#, python-format
+msgid "This field must be given if %(field)s is not %(value)s"
+msgstr "Se debe proporcionar este campo si %(field)s no es %(value)s"
+
+#: core/validators.py:367
+msgid "Duplicate values are not allowed."
+msgstr "No se admiten valores duplicados."
+
+#: core/validators.py:382
+#, python-format
+msgid "This value must be between %(lower)s and %(upper)s."
+msgstr "Este valor debe estar entre %(lower)s y %(upper)s."
+
+#: core/validators.py:384
+#, python-format
+msgid "This value must be at least %s."
+msgstr "Este valor debe ser como mínimo %s."
+
+#: core/validators.py:386
+#, python-format
+msgid "This value must be no more than %s."
+msgstr "Este valor no debe ser mayor que %s."
+
+#: core/validators.py:427
+#, python-format
+msgid "This value must be a power of %s."
+msgstr "Este valor debe ser una potencia de %s."
+
+#: core/validators.py:437
+msgid "Please enter a valid decimal number."
+msgstr "Por favor, introduzca un número decimal válido."
+
+#: core/validators.py:444
+#, python-format
+msgid "Please enter a valid decimal number with at most %s total digit."
+msgid_plural "Please enter a valid decimal number with at most %s total digits."
+msgstr[0] "Por favor, introduzca un número decimal válido con a lo más %s dígito en total."
+msgstr[1] "Por favor, introduzca un número decimal válido con a lo más %s dígitos en total."
+
+#: core/validators.py:447
+#, python-format
+msgid "Please enter a valid decimal number with a whole part of at most %s digit."
+msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits."
+msgstr[0] "Por favor, introduzca un número decimal válido con a lo más %s dígito en su parte entera."
+msgstr[1] "Por favor, introduzca un número decimal válido con a lo más %s dígitos en su parte entera."
+
+#: core/validators.py:450
+#, python-format
+msgid "Please enter a valid decimal number with at most %s decimal place."
+msgid_plural "Please enter a valid decimal number with at most %s decimal places."
+msgstr[0] "Por favor, introduzca un número decimal válido con a lo más %s dígito decimal."
+msgstr[1] "Por favor, introduzca un número decimal válido con a lo más %s dígitos decimales."
+
+#: core/validators.py:458
+msgid "Please enter a valid floating point number."
+msgstr "Por favor, introduzca un número decimal válido."
+
+#: core/validators.py:467
+#, python-format
+msgid "Make sure your uploaded file is at least %s bytes big."
+msgstr "Asegúrese de que el fichero que envía tiene al menos %s bytes."
+
+#: core/validators.py:468
+#, python-format
+msgid "Make sure your uploaded file is at most %s bytes big."
+msgstr "Asegúrese de que el fichero que envía tiene como máximo %s bytes."
+
+#: core/validators.py:485
+msgid "The format for this field is wrong."
+msgstr "El formato de este campo es incorrecto."
+
+#: core/validators.py:500
+msgid "This field is invalid."
+msgstr "Este campo no es válido."
+
+#: core/validators.py:536
+#, python-format
+msgid "Could not retrieve anything from %s."
+msgstr "No pude obtener nada de %s."
+
+#: core/validators.py:539
+#, python-format
+msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgstr "La URL %(url)s devolvió la cabecera Content-Type '%(contenttype)s', que no es válida."
+
+#: core/validators.py:572
+#, python-format
+msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
+msgstr "Por favor, cierre la etiqueta %(tag)s de la línea %(line)s. (La línea empieza por \"%(start)s\".)"
+
+#: core/validators.py:576
+#, python-format
+msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
+msgstr "Parte del texto que comienza en la línea %(line)s no está permitido en ese contexto. (La línea empieza por \"%(start)s\".)"
+
+#: core/validators.py:581
+#, python-format
+msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
+msgstr "El \"%(attr)s\" de la línea %(line)s no es un atributo válido. (La línea empieza por \"%(start)s\".)"
+
+#: core/validators.py:586
+#, python-format
+msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
+msgstr "La \"<%(tag)s>\" de la línea %(line)s no es una etiqueta válida. (La línea empieza por \"%(start)s\".)"
+
+#: core/validators.py:590
+#, python-format
+msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
+msgstr "A una etiqueta de la línea %(line)s le faltan uno o más atributos requeridos. (La línea empieza por \"%(start)s\".)"
+
+#: core/validators.py:595
+#, python-format
+msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
+msgstr "El atributo \"%(attr)s\" de la línea %(line)s tiene un valor que no es válido. (La línea empieza por \"%(start)s\".)"
+
+#: db/models/manipulators.py:308
+#, python-format
+msgid "%(object)s with this %(type)s already exists for the given %(field)s."
+msgstr "%(object)s de este %(type)s ya existen en este %(field)s."
+
+#: db/models/fields/__init__.py:52
+#, python-format
+msgid "%(optname)s with this %(fieldname)s already exists."
+msgstr "Ya existe %(optname)s con este %(fieldname)s."
+
+#: db/models/fields/__init__.py:159
+#: db/models/fields/__init__.py:316
+#: db/models/fields/__init__.py:731
+#: db/models/fields/__init__.py:742
+#: newforms/fields.py:93
+#: newforms/fields.py:513
+#: newforms/fields.py:589
+#: newforms/fields.py:600
+#: newforms/models.py:193
+#: oldforms/__init__.py:373
+msgid "This field is required."
+msgstr "Este campo es obligatorio."
+
+#: db/models/fields/__init__.py:414
+msgid "This value must be an integer."
+msgstr "Este valor debe ser un entero."
+
+#: db/models/fields/__init__.py:450
+msgid "This value must be either True or False."
+msgstr "Este valor debe ser Verdadero o Falso."
+
+#: db/models/fields/__init__.py:471
+msgid "This field cannot be null."
+msgstr "Este campo no puede estar vacío."
+
+#: db/models/fields/__init__.py:640
+msgid "This value must be a decimal number."
+msgstr "Este valor debe ser un entero."
+
+#: db/models/fields/__init__.py:751
+msgid "Enter a valid filename."
+msgstr "Introduzca un nombre de fichero válido"
+
+#: db/models/fields/__init__.py:900
+msgid "This value must be either None, True or False."
+msgstr "Este valor debe ser Verdadero o Falso."
+
+#: db/models/fields/related.py:658
+msgid "Separate multiple IDs with commas."
+msgstr "Separe múltiples IDs con comas."
+
+#: db/models/fields/related.py:660
+msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr "Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar más de uno."
+
+#: db/models/fields/related.py:707
+#, python-format
+msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
+msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid."
+msgstr[0] "Por favor, introduzca IDs de %(self)s válidos. El valor %(value)r no es válido."
+msgstr[1] "Por favor, introduzca IDs de %(self)s válidos. Los valores %(value)r no son válidos."
+
+#: newforms/fields.py:123
+#, python-format
+msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
+msgstr "Asegúrese de que su texto tiene a lo más %(max)d caracteres (actualmente tiene %(length)d)."
+
+#: newforms/fields.py:125
+#, python-format
+msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
+msgstr "Asegúrese de que su texto tiene al menos %(min)d caracteres (actualmente tiene %(length)d)."
+
+#: newforms/fields.py:151
+#: newforms/fields.py:174
+#: newforms/fields.py:204
+#, python-format
+msgid "Ensure this value is less than or equal to %s."
+msgstr "Asegúrese de que este valor es menor o igual a %s."
+
+#: newforms/fields.py:153
+#: newforms/fields.py:176
+#: newforms/fields.py:206
+#, python-format
+msgid "Ensure this value is greater than or equal to %s."
+msgstr "Asegúrese de que este valor es mayor o igual a %s."
+
+#: newforms/fields.py:172
+#: newforms/fields.py:199
+msgid "Enter a number."
+msgstr "Introduzca un número."
+
+#: newforms/fields.py:208
+#, python-format
+msgid "Ensure that there are no more than %s digits in total."
+msgstr "Asegúrese de que no hay más de %s dígitos en total."
+
+#: newforms/fields.py:210
+#, python-format
+msgid "Ensure that there are no more than %s decimal places."
+msgstr "Asegúrese de que no hay más de %s decimales."
+
+#: newforms/fields.py:212
+#, python-format
+msgid "Ensure that there are no more than %s digits before the decimal point."
+msgstr "Asegúrese de que no hay más de %s dígitos antes del punto decimal."
+
+#: newforms/fields.py:245
+#: newforms/fields.py:633
+msgid "Enter a valid date."
+msgstr "Introduzca una fecha válida."
+
+#: newforms/fields.py:272
+#: newforms/fields.py:635
+msgid "Enter a valid time."
+msgstr "Introduzca una hora válida."
+
+#: newforms/fields.py:308
+msgid "Enter a valid date/time."
+msgstr "Introduzca una fecha/hora válida."
+
+#: newforms/fields.py:321
+msgid "Enter a valid value."
+msgstr "Introduzca un valor correcto."
+
+#: newforms/fields.py:379
+msgid "No file was submitted."
+msgstr "No se ha enviado ningún fichero"
+
+#: newforms/fields.py:381
+#: oldforms/__init__.py:688
+msgid "The submitted file is empty."
+msgstr "El fichero enviado está vacío."
+
+#: newforms/fields.py:419
+#: newforms/fields.py:444
+msgid "Enter a valid URL."
+msgstr "Introduzca una URL válida."
+
+#: newforms/fields.py:446
+msgid "This URL appears to be a broken link."
+msgstr "La URL parece ser un enlace roto."
+
+#: newforms/fields.py:501
+#: newforms/models.py:180
+msgid "Select a valid choice. That choice is not one of the available choices."
+msgstr "Escoja una opción válida. Esa opción no está entre las aceptadas."
+
+#: newforms/fields.py:517
+#: newforms/fields.py:593
+#: newforms/models.py:197
+msgid "Enter a list of values."
+msgstr "Introduzca una lista de valores."
+
+#: newforms/fields.py:523
+#: newforms/models.py:203
+#, python-format
+msgid "Select a valid choice. %s is not one of the available choices."
+msgstr "Escoja una opción válida; '%s' no es una de las opciones disponibles."
+
+#: newforms/fields.py:644
+msgid "Enter a valid IPv4 address."
+msgstr "Introduzca una dirección IPv4 válida."
+
 #: oldforms/__init__.py:408
 #, python-format
 msgid "Ensure your text is less than %s character."
@@ -3040,11 +3431,6 @@
 msgid "Select a valid choice; '%(data)s' is not in %(choices)s."
 msgstr "Escoja una opción válida; '%(data)s' no está en %(choices)s."
 
-#: oldforms/__init__.py:688
-#: newforms/fields.py:381
-msgid "The submitted file is empty."
-msgstr "El fichero enviado está vacío."
-
 #: oldforms/__init__.py:744
 msgid "Enter a whole number between -32,768 and 32,767."
 msgstr "Introduzca un número entero entre -32,768 y 32,767."
@@ -3057,21 +3443,56 @@
 msgid "Enter a whole number between 0 and 32,767."
 msgstr "Introduzca un número entero entre 0 y 32,767."
 
-#: views/generic/create_update.py:43
+#: template/defaultfilters.py:541
+msgid "yes,no,maybe"
+msgstr "sí,no,tal vez"
+
+#: template/defaultfilters.py:570
 #, python-format
-msgid "The %(verbose_name)s was created successfully."
-msgstr "El %(verbose_name)s se ha creado correctamente."
+msgid "%(size)d byte"
+msgid_plural "%(size)d bytes"
+msgstr[0] "%(size)d byte"
+msgstr[1] "%(size)d bytes"
 
-#: views/generic/create_update.py:117
+#: template/defaultfilters.py:572
 #, python-format
-msgid "The %(verbose_name)s was updated successfully."
-msgstr "Se actualizó con éxito el %(verbose_name)s."
+msgid "%.1f KB"
+msgstr "%.1f KB"
 
-#: views/generic/create_update.py:184
+#: template/defaultfilters.py:574
 #, python-format
-msgid "The %(verbose_name)s was deleted."
-msgstr "El %(verbose_name)s ha sido eliminado."
+msgid "%.1f MB"
+msgstr "%.1f MB"
 
+#: template/defaultfilters.py:575
+#, python-format
+msgid "%.1f GB"
+msgstr "%.1f GB"
+
+#: utils/dateformat.py:41
+msgid "p.m."
+msgstr "p.m"
+
+#: utils/dateformat.py:42
+msgid "a.m."
+msgstr "a.m"
+
+#: utils/dateformat.py:47
+msgid "PM"
+msgstr "PM"
+
+#: utils/dateformat.py:48
+msgid "AM"
+msgstr "AM"
+
+#: utils/dateformat.py:97
+msgid "midnight"
+msgstr "media noche"
+
+#: utils/dateformat.py:99
+msgid "noon"
+msgstr "medio día"
+
 #: utils/dates.py:6
 msgid "Monday"
 msgstr "Lunes"
@@ -3261,76 +3682,56 @@
 msgid "or"
 msgstr "o"
 
-#: utils/timesince.py:12
+#: utils/timesince.py:21
 msgid "year"
 msgid_plural "years"
 msgstr[0] "año"
 msgstr[1] "años"
 
-#: utils/timesince.py:13
+#: utils/timesince.py:22
 msgid "month"
 msgid_plural "months"
 msgstr[0] "mes"
 msgstr[1] "meses"
 
-#: utils/timesince.py:14
+#: utils/timesince.py:23
 msgid "week"
 msgid_plural "weeks"
 msgstr[0] "semana"
 msgstr[1] "semanas"
 
-#: utils/timesince.py:15
+#: utils/timesince.py:24
 msgid "day"
 msgid_plural "days"
 msgstr[0] "día"
 msgstr[1] "días"
 
-#: utils/timesince.py:16
+#: utils/timesince.py:25
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "hora"
 msgstr[1] "horas"
 
-#: utils/timesince.py:17
+#: utils/timesince.py:26
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minuto"
 msgstr[1] "minutos"
 
-#: utils/timesince.py:39
+#: utils/timesince.py:46
+msgid "minutes"
+msgstr "minutos"
+
+#: utils/timesince.py:51
 #, python-format
 msgid "%(number)d %(type)s"
 msgstr "%(number)d %(type)s"
 
-#: utils/timesince.py:45
+#: utils/timesince.py:57
 #, python-format
 msgid ", %(number)d %(type)s"
 msgstr ", %(number)d %(type)s"
 
-#: utils/dateformat.py:41
-msgid "p.m."
-msgstr "p.m"
-
-#: utils/dateformat.py:42
-msgid "a.m."
-msgstr "a.m"
-
-#: utils/dateformat.py:47
-msgid "PM"
-msgstr "PM"
-
-#: utils/dateformat.py:48
-msgid "AM"
-msgstr "AM"
-
-#: utils/dateformat.py:97
-msgid "midnight"
-msgstr "media noche"
-
-#: utils/dateformat.py:99
-msgid "noon"
-msgstr "medio día"
-
 #: utils/translation/trans_real.py:391
 msgid "DATE_FORMAT"
 msgstr "j N Y"
@@ -3351,121 +3752,18 @@
 msgid "MONTH_DAY_FORMAT"
 msgstr "j \\de F"
 
-#: template/defaultfilters.py:532
-msgid "yes,no,maybe"
-msgstr "sí,no,tal vez"
-
-#: template/defaultfilters.py:561
+#: views/generic/create_update.py:43
 #, python-format
-msgid "%(size)d byte"
-msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d byte"
-msgstr[1] "%(size)d bytes"
+msgid "The %(verbose_name)s was created successfully."
+msgstr "El %(verbose_name)s se ha creado correctamente."
 
-#: template/defaultfilters.py:563
+#: views/generic/create_update.py:117
 #, python-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
+msgid "The %(verbose_name)s was updated successfully."
+msgstr "Se actualizó con éxito el %(verbose_name)s."
 
-#: template/defaultfilters.py:565
+#: views/generic/create_update.py:184
 #, python-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
+msgid "The %(verbose_name)s was deleted."
+msgstr "El %(verbose_name)s ha sido eliminado."
 
-#: template/defaultfilters.py:566
-#, python-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: newforms/fields.py:123
-#, python-format
-msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
-msgstr "Asegúrese de que su texto tiene a lo más %(max)d caracteres (actualmente tiene %(length)d)."
-
-#: newforms/fields.py:125
-#, python-format
-msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
-msgstr "Asegúrese de que su texto tiene al menos %(min)d caracteres (actualmente tiene %(length)d)."
-
-#: newforms/fields.py:151
-#: newforms/fields.py:174
-#: newforms/fields.py:204
-#, python-format
-msgid "Ensure this value is less than or equal to %s."
-msgstr "Asegúrese de que este valor es menor o igual a %s."
-
-#: newforms/fields.py:153
-#: newforms/fields.py:176
-#: newforms/fields.py:206
-#, python-format
-msgid "Ensure this value is greater than or equal to %s."
-msgstr "Asegúrese de que este valor es mayor o igual a %s."
-
-#: newforms/fields.py:172
-#: newforms/fields.py:199
-msgid "Enter a number."
-msgstr "Introduzca un número."
-
-#: newforms/fields.py:208
-#, python-format
-msgid "Ensure that there are no more than %s digits in total."
-msgstr "Asegúrese de que no hay más de %s dígitos en total."
-
-#: newforms/fields.py:210
-#, python-format
-msgid "Ensure that there are no more than %s decimal places."
-msgstr "Asegúrese de que no hay más de %s decimales."
-
-#: newforms/fields.py:212
-#, python-format
-msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr "Asegúrese de que no hay más de %s dígitos antes del punto decimal."
-
-#: newforms/fields.py:245
-#: newforms/fields.py:629
-msgid "Enter a valid date."
-msgstr "Introduzca una fecha válida."
-
-#: newforms/fields.py:272
-#: newforms/fields.py:631
-msgid "Enter a valid time."
-msgstr "Introduzca una hora válida."
-
-#: newforms/fields.py:308
-msgid "Enter a valid date/time."
-msgstr "Introduzca una fecha/hora válida."
-
-#: newforms/fields.py:321
-msgid "Enter a valid value."
-msgstr "Introduzca un valor correcto."
-
-#: newforms/fields.py:379
-msgid "No file was submitted."
-msgstr "No se ha enviado ningún fichero"
-
-#: newforms/fields.py:419
-#: newforms/fields.py:444
-msgid "Enter a valid URL."
-msgstr "Introduzca una URL válida."
-
-#: newforms/fields.py:446
-msgid "This URL appears to be a broken link."
-msgstr "La URL parece ser un enlace roto."
-
-#: newforms/fields.py:497
-#: newforms/models.py:180
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Escoja una opción válida. Esa opción no está entre las aceptadas."
-
-#: newforms/fields.py:513
-#: newforms/fields.py:589
-#: newforms/models.py:197
-msgid "Enter a list of values."
-msgstr "Introduzca una lista de valores."
-
-#: newforms/fields.py:519
-#: newforms/models.py:203
-#, python-format
-msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Escoja una opción válida; '%s' no es una de las opciones disponibles."
-