Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

newforms-admin: Merged from trunk up to [7377].

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7378 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 7822a0639fd029e98e0d6a9d4f2c182f719f8d81 1 parent 1ed6869
@jkocherhans jkocherhans authored
Showing with 1,126 additions and 720 deletions.
  1. +2 −2 django/conf/global_settings.py
  2. BIN  django/conf/locale/ca/LC_MESSAGES/django.mo
  3. +660 −490 django/conf/locale/ca/LC_MESSAGES/django.po
  4. BIN  django/conf/locale/ca/LC_MESSAGES/djangojs.mo
  5. +6 −10 django/conf/locale/ca/LC_MESSAGES/djangojs.po
  6. +6 −6 django/contrib/admin/templatetags/admin_list.py
  7. +4 −4 django/contrib/admin/views/main.py
  8. +7 −1 django/core/management/sql.py
  9. +1 −1  django/core/paginator.py
  10. 0  django/db/backends/ado_mssql/__init__.py
  11. +0 −112 django/db/backends/ado_mssql/base.py
  12. +0 −2  django/db/backends/ado_mssql/client.py
  13. +0 −25 django/db/backends/ado_mssql/creation.py
  14. +0 −13 django/db/backends/ado_mssql/introspection.py
  15. +2 −1  django/db/backends/mysql/base.py
  16. +2 −2 django/db/models/fields/related.py
  17. +2 −2 django/views/generic/list_detail.py
  18. +12 −1 django/views/i18n.py
  19. +68 −0 docs/Makefile
  20. +132 −0 docs/conf.py
  21. +0 −3  docs/db-api.txt
  22. +39 −16 docs/i18n.txt
  23. +128 −0 docs/index.txt
  24. +4 −4 docs/install.txt
  25. +1 −1  docs/modelforms.txt
  26. +13 −14 docs/request_response.txt
  27. +1 −1  docs/settings.txt
  28. +1 −1  docs/syndication_feeds.txt
  29. +1 −1  docs/testing.txt
  30. +1 −1  docs/tutorial04.txt
  31. +1 −1  docs/url_dispatch.txt
  32. +15 −5 tests/regressiontests/forms/fields.py
  33. +17 −0 tests/regressiontests/model_regress/models.py
View
4 django/conf/global_settings.py
@@ -114,7 +114,7 @@
SEND_BROKEN_LINK_EMAILS = False
# Database connection info.
-DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
+DATABASE_ENGINE = '' # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
DATABASE_NAME = '' # Or path to database file if using sqlite3.
DATABASE_USER = '' # Not used with sqlite3.
DATABASE_PASSWORD = '' # Not used with sqlite3.
@@ -287,7 +287,7 @@
SESSION_SAVE_EVERY_REQUEST = False # Whether to save the session data on every request.
SESSION_EXPIRE_AT_BROWSER_CLOSE = False # Whether sessions expire when a user closes his browser.
SESSION_ENGINE = 'django.contrib.sessions.backends.db' # The module to store session data
-SESSION_FILE_PATH = None # Directory to store session files if using the file session module. If set to None the backend will use a sensible default.
+SESSION_FILE_PATH = None # Directory to store session files if using the file session module. If None, the backend will use a sensible default.
#########
# CACHE #
View
BIN  django/conf/locale/ca/LC_MESSAGES/django.mo
Binary file not shown
View
1,150 django/conf/locale/ca/LC_MESSAGES/django.po
@@ -5,10 +5,10 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-29 21:28+0100\n"
-"PO-Revision-Date: 2008-01-22 19:49+0100\n"
-"Last-Translator: Marc Garcia <marc.garcia@accopensys.com>\n"
-"Language-Team: <es@li.org>\n"
+"POT-Creation-Date: 2007-02-15 01:00+0200\n"
+"PO-Revision-Date: 2008-03-29 01:37+0100\n"
+"Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n"
+"Language-Team: Catalan <ca@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -24,7 +24,7 @@ msgstr "Bengalí"
#: conf/global_settings.py:41
msgid "Bulgarian"
-msgstr "Bulgar"
+msgstr "Búlgar"
#: conf/global_settings.py:42
msgid "Catalan"
@@ -63,134 +63,143 @@ msgid "Argentinean Spanish"
msgstr "Castellà Argentí"
#: conf/global_settings.py:51
+#, fuzzy
+msgid "Basque"
+msgstr "Euskadi"
+
+#: conf/global_settings.py:52
msgid "Persian"
msgstr "Persa"
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
msgid "Finnish"
msgstr "Finlandès"
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
msgid "French"
msgstr "Francès"
-#: conf/global_settings.py:54
-msgid "Gaeilge"
-msgstr "Gaeilge"
-
#: conf/global_settings.py:55
-msgid "Galician"
-msgstr "Galleg"
+msgid "Irish"
+msgstr "Irlandès"
#: conf/global_settings.py:56
+msgid "Galician"
+msgstr "Gallec"
+
+#: conf/global_settings.py:57
msgid "Hungarian"
msgstr "Húngar"
-#: conf/global_settings.py:57
+#: conf/global_settings.py:58
msgid "Hebrew"
msgstr "Hebreu"
-#: conf/global_settings.py:58
+#: conf/global_settings.py:59
msgid "Croatian"
msgstr "Croat"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Icelandic"
msgstr "Islandès"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Italian"
msgstr "Italià"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Japanese"
msgstr "Japonès"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
+msgid "Georgian"
+msgstr "Georgià"
+
+#: conf/global_settings.py:64
msgid "Korean"
msgstr "Coreà"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:65
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:66
msgid "Kannada"
msgstr "Canès"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:67
msgid "Latvian"
msgstr "Letó"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:68
msgid "Macedonian"
msgstr "Macedoni"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:69
msgid "Dutch"
msgstr "Holandès"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:70
msgid "Norwegian"
msgstr "Norueg"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:71
msgid "Polish"
msgstr "Polac"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:72
msgid "Portugese"
msgstr "Portuguès"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:73
msgid "Brazilian"
msgstr "Brasileny"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:74
msgid "Romanian"
msgstr "Rumanès"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:75
msgid "Russian"
msgstr "Rús"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:76
msgid "Slovak"
msgstr "Eslovac"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:77
msgid "Slovenian"
msgstr "Esloveni"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:78
msgid "Serbian"
msgstr "Serbi"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:79
msgid "Swedish"
msgstr "Suec"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:80
msgid "Tamil"
msgstr "Tàmil"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:81
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:82
msgid "Turkish"
msgstr "Turc"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:83
msgid "Ukrainian"
msgstr "Ucranià"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:84
msgid "Simplified Chinese"
msgstr "Xinés simplificat"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:85
msgid "Traditional Chinese"
msgstr "Xinés tradicional"
@@ -203,10 +212,8 @@ msgstr ""
"<h3>Per %s:</h3>\n"
"<ul>\n"
-#: contrib/admin/filterspecs.py:74
-#: contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147
-#: contrib/admin/filterspecs.py:173
+#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92
+#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
msgid "All"
msgstr "Tots"
@@ -230,20 +237,17 @@ msgstr "Aquest mes"
msgid "This year"
msgstr "Aquest any"
-#: contrib/admin/filterspecs.py:147
-#: newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
#: oldforms/__init__.py:592
msgid "Yes"
msgstr "Si"
-#: contrib/admin/filterspecs.py:147
-#: newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231
#: oldforms/__init__.py:592
msgid "No"
msgstr "No"
-#: contrib/admin/filterspecs.py:154
-#: newforms/widgets.py:231
+#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231
#: oldforms/__init__.py:592
msgid "Unknown"
msgstr "Desconegut"
@@ -283,7 +287,7 @@ msgstr "No s'ha pogut trobar la pàgina"
#: 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"
+msgstr "Ho sentim, però no s'ha pogut trobar la pàgina sol·licitada"
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/base.html:37
@@ -315,8 +319,12 @@ 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."
+msgid ""
+"There's been an error. It's been reported to the site administrators via e-"
+"mail and should be fixed shortly. Thanks for your patience."
+msgstr ""
+"Ha ocorregut un error. S'ha informat als administradors del lloc per correu "
+"electrònic y hauria d'arreglar-se en breu. Gràcies per la vostra paciència."
#: contrib/admin/templates/admin/base.html:26
msgid "Welcome,"
@@ -344,7 +352,7 @@ msgstr "Lloc administratiu de Django"
#: contrib/admin/templates/admin/base_site.html:7
msgid "Django administration"
-msgstr "Adminisitració de Django"
+msgstr "Administració de Django"
#: contrib/admin/templates/admin/change_form.html:14
#: contrib/admin/templates/admin/index.html:28
@@ -364,8 +372,8 @@ msgstr "Veure en el lloc"
#: 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."
+msgstr[0] "Si us plau, corregiu l'error mostrat a baix."
+msgstr[1] "Si us plau, corregiu els errors mostrats a baix."
#: contrib/admin/templates/admin/change_form.html:49
msgid "Ordering"
@@ -387,13 +395,23 @@ msgstr "Eliminar"
#: contrib/admin/templates/admin/delete_confirmation.html:13
#, 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 ""
+"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 vostre compte no te permissos per a esborrar els "
+"tipus d'objecte següents:"
#: contrib/admin/templates/admin/delete_confirmation.html:20
#, 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 ""
+"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:"
#: contrib/admin/templates/admin/delete_confirmation.html:25
msgid "Yes, I'm sure"
@@ -411,7 +429,7 @@ msgstr "Filtre"
#: contrib/admin/templates/admin/index.html:17
#, python-format
msgid "Models available in the %(name)s application."
-msgstr "Models disponibles en la aplicació %(name)s."
+msgstr "Models disponibles en l'aplicació %(name)s."
#: contrib/admin/templates/admin/index.html:18
#, python-format
@@ -424,7 +442,7 @@ msgstr "Modificar"
#: contrib/admin/templates/admin/index.html:44
msgid "You don't have permission to edit anything."
-msgstr "No permís per editar res."
+msgstr "No teniu permís per editar res."
#: contrib/admin/templates/admin/index.html:52
msgid "Recent Actions"
@@ -439,8 +457,14 @@ msgid "None available"
msgstr "Cap disponible"
#: 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."
+msgid ""
+"Something's wrong with your database installation. Make sure the appropriate "
+"database tables have been created, and make sure the database is readable by "
+"the appropriate user."
+msgstr ""
+"Alguna cosa està malament en la instal·lació de la vostra base de dades. "
+"Assegureu-vos de que s'han creat les taules, i de que la base de dades és "
+"llegible per l'usuari apropiat."
#: contrib/admin/templates/admin/login.html:17
#: contrib/comments/templates/comments/form.html:6
@@ -454,7 +478,7 @@ msgid "Password:"
msgstr "Contrasenya:"
#: contrib/admin/templates/admin/login.html:25
-#: contrib/admin/views/decorators.py:25
+#: contrib/admin/views/decorators.py:31
msgid "Log in"
msgstr "Iniciar sessió"
@@ -475,8 +499,12 @@ msgid "DATE_WITH_TIME_FULL"
msgstr "F j, Y, H:i "
#: 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."
+msgid ""
+"This object doesn't have a change history. It probably wasn't added via this "
+"admin site."
+msgstr ""
+"Aquest objecte no té historial de canvis. Probablement no va ser afegit "
+"utilitzant aquest lloc administratiu."
#: contrib/admin/templates/admin/pagination.html:10
msgid "Show all"
@@ -515,8 +543,12 @@ msgid "Save"
msgstr "Desar"
#: 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."
+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 "
+"de l'usuari."
#: contrib/admin/templates/admin/auth/user/add_form.html:12
msgid "Username"
@@ -535,12 +567,12 @@ msgstr "Contrasenya (de nou)"
#: 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ó."
+msgstr "Introduïu la mateixa contrasenya de dalt, per fer-ne la verificació."
#: 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>"
+msgstr "Introduïu una contrasenya per l'usuari <strong>%(username)s</strong>"
#: contrib/admin/templates/admin_doc/bookmarklets.html:3
msgid "Bookmarklets"
@@ -561,28 +593,38 @@ msgid ""
"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"
+"<p class=\"help\">Per a instal·lar '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"
+"amb el seu administrador de sistemes si no està segur de la condició del "
+"seu).</p>\n"
#: contrib/admin/templates/admin_doc/bookmarklets.html:18
msgid "Documentation for this page"
msgstr "Documentació d'aquesta pàgina"
#: 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."
+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:21
msgid "Show object ID"
msgstr "Mostra el ID de l'objecte"
#: 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."
+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:24
msgid "Edit this object (current window)"
@@ -590,7 +632,9 @@ msgstr "Editar aquest objecte (finestra actual)"
#: 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."
+msgstr ""
+"El porta a la pàgina d'administració de pàgines que representen un únic "
+"objecte."
#: contrib/admin/templates/admin_doc/bookmarklets.html:27
msgid "Edit this object (new window)"
@@ -602,7 +646,7 @@ msgstr "Com abans, però obre la pàgina d'administració en una nova finestra."
#: 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."
+msgstr "Gràcies per destinar el vostre temps en el web durant el dia d'avui."
#: contrib/admin/templates/registration/logged_out.html:10
msgid "Log in again"
@@ -618,15 +662,20 @@ msgstr "Canvi de clau"
#: 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ò"
+msgstr "Canvi de clau exitòs"
#: contrib/admin/templates/registration/password_change_done.html:11
msgid "Your password was changed."
msgstr "La seva clau ha estat canviada."
#: 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."
+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 contrasenya nova dues vegades per verificar que "
+"l'ha escrit correctament."
#: contrib/admin/templates/registration/password_change_form.html:16
msgid "Old password:"
@@ -654,15 +703,21 @@ msgstr "Restablir contrasenya"
#: 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"
+msgstr "Restabliment de contrasenya exitòs"
#: 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."
+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/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."
+msgstr ""
+"Està rebent aquest missatge degut a que va solicitar un restabliment de "
+"contrasenya."
#: contrib/admin/templates/registration/password_reset_email.html:3
#, python-format
@@ -692,8 +747,12 @@ msgid "The %(site_name)s team"
msgstr "L'equip de %(site_name)s"
#: 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."
+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 en crearem una de nova que li enviarem per correu."
#: contrib/admin/templates/registration/password_reset_form.html:16
msgid "E-mail address:"
@@ -723,14 +782,12 @@ msgstr "Modificar:"
msgid "All dates"
msgstr "Totes les dates"
-#: contrib/admin/views/auth.py:20
-#: contrib/admin/views/main.py:267
+#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267
#, 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:271
+#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271
#: contrib/admin/views/main.py:356
msgid "You may edit it again below."
msgstr "Pot editar-lo de nou abaix."
@@ -741,49 +798,59 @@ msgstr "Afegir usuari"
#: contrib/admin/views/auth.py:58
msgid "Password changed successfully."
-msgstr "Canvi de clau exitós"
+msgstr "Clau cambiada exitosament"
#: contrib/admin/views/auth.py:65
#, python-format
msgid "Change password: %s"
msgstr "Canviar clau: %s"
-#: contrib/admin/views/decorators.py:11
-#: 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/decorators.py:17 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/decorators.py:63
-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/decorators.py:69
+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/decorators.py:70
-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/decorators.py:76
+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/decorators.py:84
+#: contrib/admin/views/decorators.py:90
msgid "Usernames cannot contain the '@' character."
msgstr "Els noms d'usuari no poden contenir el caracter '@'."
-#: contrib/admin/views/decorators.py:86
+#: contrib/admin/views/decorators.py:92
#, 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."
+msgstr ""
+"La seva adreça de correu no és el seu nom d'usuari. Provi '%s' en tot cas."
-#: contrib/admin/views/doc.py:48
-#: contrib/admin/views/doc.py:50
+#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50
#: contrib/admin/views/doc.py:52
msgid "tag:"
msgstr "etiqueta:"
-#: contrib/admin/views/doc.py:79
-#: contrib/admin/views/doc.py:81
+#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81
#: contrib/admin/views/doc.py:83
msgid "filter:"
msgstr "filtre:"
-#: contrib/admin/views/doc.py:137
-#: contrib/admin/views/doc.py:139
+#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139
#: contrib/admin/views/doc.py:141
msgid "view:"
msgstr "vista:"
@@ -791,7 +858,7 @@ msgstr "vista:"
#: contrib/admin/views/doc.py:166
#, python-format
msgid "App %r not found"
-msgstr "La aplicació %r no s'ha pogut trobar"
+msgstr "No s'ha pogut trobar l'aplicació %r"
#: contrib/admin/views/doc.py:173
#, python-format
@@ -801,12 +868,10 @@ msgstr "El model %(name)r no s'ha trobat en la aplicació %(label)r"
#: contrib/admin/views/doc.py:185
#, python-format
msgid "the related `%(label)s.%(type)s` object"
-msgstr "el objecte relacionat `%(label)s.%(type)s`"
+msgstr "l'objecte relacionat `%(label)s.%(type)s`"
-#: contrib/admin/views/doc.py:185
-#: contrib/admin/views/doc.py:207
-#: contrib/admin/views/doc.py:221
-#: contrib/admin/views/doc.py:226
+#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207
+#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226
msgid "model:"
msgstr "model:"
@@ -830,12 +895,9 @@ msgstr "nombre de %s"
msgid "Fields on %s objects"
msgstr "Camps en objectes %s"
-#: contrib/admin/views/doc.py:293
-#: contrib/admin/views/doc.py:304
-#: contrib/admin/views/doc.py:306
-#: contrib/admin/views/doc.py:312
-#: contrib/admin/views/doc.py:313
-#: contrib/admin/views/doc.py:315
+#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304
+#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312
+#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315
msgid "Integer"
msgstr "Enter"
@@ -843,8 +905,7 @@ msgstr "Enter"
msgid "Boolean (Either True or False)"
msgstr "Booleà (Verdader o Fals)"
-#: contrib/admin/views/doc.py:295
-#: contrib/admin/views/doc.py:314
+#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (de fins a %(max_length)s)"
@@ -869,8 +930,7 @@ msgstr "Número decimal"
msgid "E-mail address"
msgstr "Adreça de correu electrònic"
-#: contrib/admin/views/doc.py:301
-#: contrib/admin/views/doc.py:302
+#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302
#: contrib/admin/views/doc.py:305
msgid "File path"
msgstr "Ruta del fitxer"
@@ -879,8 +939,7 @@ msgstr "Ruta del fitxer"
msgid "Floating point number"
msgstr "Número amb punt de coma flotant"
-#: contrib/admin/views/doc.py:307
-#: contrib/comments/models.py:85
+#: contrib/admin/views/doc.py:307 contrib/comments/models.py:89
msgid "IP address"
msgstr "Adreça IP"
@@ -904,8 +963,7 @@ msgstr "Texte"
msgid "Time"
msgstr "Hora"
-#: contrib/admin/views/doc.py:318
-#: contrib/flatpages/models.py:7
+#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
@@ -915,7 +973,7 @@ msgstr "Estat dels E.U.A. (dos lletres majúscules)"
#: contrib/admin/views/doc.py:320
msgid "XML text"
-msgstr "Texte XML"
+msgstr "Text XML"
#: contrib/admin/views/doc.py:346
#, python-format
@@ -926,8 +984,7 @@ msgstr "%s no sembla ser un objecte 'urlpattern'"
msgid "Site administration"
msgstr "Lloc administratiu"
-#: contrib/admin/views/main.py:280
-#: contrib/admin/views/main.py:365
+#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365
#, python-format
msgid "You may add another %s below."
msgstr "Pot afegir un altre %s a baix."
@@ -942,10 +999,8 @@ msgstr "Afegir %s"
msgid "Added %s."
msgstr "Agregat %s."
-#: contrib/admin/views/main.py:344
-#: contrib/admin/views/main.py:346
-#: contrib/admin/views/main.py:348
-#: core/validators.py:283
+#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346
+#: contrib/admin/views/main.py:348 core/validators.py:283
#: db/models/manipulators.py:309
msgid "and"
msgstr "i"
@@ -967,12 +1022,14 @@ msgstr "Cap camp canviat."
#: contrib/admin/views/main.py:354
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "S'ha modificat amb èxist el/la %(name)s \"%(obj)s."
+msgstr "S'ha modificat exitosament el/la %(name)s \"%(obj)s."
#: contrib/admin/views/main.py:362
#, 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 ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"S'ha agregat exitosament el/la %(name)s \"%(obj)s\". Pot editar-lo de nou abaix."
#: contrib/admin/views/main.py:400
#, python-format
@@ -996,7 +1053,7 @@ msgstr "El/la %(name)s \"%(obj)s\".ha estat eliminat amb èxit."
#: contrib/admin/views/main.py:527
msgid "Are you sure?"
-msgstr "Està segur?"
+msgstr "Esteu segurs?"
#: contrib/admin/views/main.py:549
#, python-format
@@ -1017,8 +1074,7 @@ msgstr "Seleccioni %s per modificar"
msgid "Database error"
msgstr "Error de/en la base de dades"
-#: contrib/auth/forms.py:17
-#: contrib/auth/forms.py:138
+#: 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."
@@ -1027,16 +1083,24 @@ msgid "A user with that username already exists."
msgstr "Ja existeix un usuari amb aquest nom."
#: 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ó."
+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/auth/forms.py:62
msgid "This account is inactive."
msgstr "Aquest compte està inactiu"
#: 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?"
+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/auth/forms.py:107
#, python-format
@@ -1049,10 +1113,10 @@ msgstr "Els dos camps de nova contrasenya no coincideixen."
#: 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."
+msgstr ""
+"La seva antiga contrasenya no és correcte. Si el plau, introdueixi-la de nou."
-#: contrib/auth/models.py:73
-#: contrib/auth/models.py:93
+#: contrib/auth/models.py:73 contrib/auth/models.py:93
msgid "name"
msgstr "nom"
@@ -1064,8 +1128,7 @@ msgstr "nom en clau"
msgid "permission"
msgstr "permís"
-#: contrib/auth/models.py:79
-#: contrib/auth/models.py:94
+#: contrib/auth/models.py:79 contrib/auth/models.py:94
msgid "permissions"
msgstr "permissos"
@@ -1073,8 +1136,7 @@ msgstr "permissos"
msgid "group"
msgstr "grup"
-#: contrib/auth/models.py:98
-#: contrib/auth/models.py:141
+#: contrib/auth/models.py:98 contrib/auth/models.py:141
msgid "groups"
msgstr "grups"
@@ -1083,8 +1145,12 @@ msgid "username"
msgstr "nom d'usuari"
#: 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)."
+msgid ""
+"Required. 30 characters or fewer. Alphanumeric characters only (letters, "
+"digits and underscores)."
+msgstr ""
+"Obligatori. 30 o menys caracters. Només caracters alfanumèrics (lletres, "
+"dígits i guions baixos)."
#: contrib/auth/models.py:132
msgid "first name"
@@ -1103,8 +1169,12 @@ msgid "password"
msgstr "contrasenya"
#: 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>."
+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/auth/models.py:136
msgid "staff status"
@@ -1119,16 +1189,24 @@ msgid "active"
msgstr "actiu"
#: 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."
+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. Deseleccioni-ho enlloc d'esborrar comptes d'usuari."
#: contrib/auth/models.py:138
msgid "superuser status"
msgstr "estat de superusuari"
#: 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."
+msgid ""
+"Designates that this user has all permissions without explicitly assigning "
+"them."
+msgstr ""
+"Designa que aquest usuari té tots els permissos sense assignar-los "
+"explícitament."
#: contrib/auth/models.py:139
msgid "last login"
@@ -1139,8 +1217,12 @@ msgid "date joined"
msgstr "data de creació"
#: 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."
+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/auth/models.py:143
msgid "user permissions"
@@ -1156,7 +1238,7 @@ msgstr "usuaris"
#: contrib/auth/models.py:154
msgid "Personal info"
-msgstr "Informaciò personal"
+msgstr "Informació personal"
#: contrib/auth/models.py:155
msgid "Permissions"
@@ -1178,85 +1260,84 @@ msgstr "missatge"
msgid "Logged out"
msgstr "Sessió finalitzada"
-#: contrib/comments/models.py:67
-#: contrib/comments/models.py:169
+#: contrib/comments/models.py:71 contrib/comments/models.py:176
msgid "object ID"
msgstr "ID de l'objecte"
-#: contrib/comments/models.py:68
+#: contrib/comments/models.py:72
msgid "headline"
msgstr "encapçalament"
-#: contrib/comments/models.py:69
-#: contrib/comments/models.py:90
-#: contrib/comments/models.py:170
+#: contrib/comments/models.py:73 contrib/comments/models.py:95
+#: contrib/comments/models.py:177
msgid "comment"
msgstr "comentari"
-#: contrib/comments/models.py:70
+#: contrib/comments/models.py:74
msgid "rating #1"
msgstr "qualificació #1"
-#: contrib/comments/models.py:71
+#: contrib/comments/models.py:75
msgid "rating #2"
msgstr "qualificació #2"
-#: contrib/comments/models.py:72
+#: contrib/comments/models.py:76
msgid "rating #3"
msgstr "qualificació #3"
-#: contrib/comments/models.py:73
+#: contrib/comments/models.py:77
msgid "rating #4"
msgstr "qualificació #4"
-#: contrib/comments/models.py:74
+#: contrib/comments/models.py:78
msgid "rating #5"
msgstr "qualificació #5"
-#: contrib/comments/models.py:75
+#: contrib/comments/models.py:79
msgid "rating #6"
msgstr "qualificació #6"
-#: contrib/comments/models.py:76
+#: contrib/comments/models.py:80
msgid "rating #7"
msgstr "qualificació #7"
-#: contrib/comments/models.py:77
+#: contrib/comments/models.py:81
msgid "rating #8"
msgstr "qualificació #8"
-#: contrib/comments/models.py:82
+#: contrib/comments/models.py:86
msgid "is valid rating"
msgstr "és qualificació vàlida"
-#: contrib/comments/models.py:83
-#: contrib/comments/models.py:172
+#: contrib/comments/models.py:87 contrib/comments/models.py:179
msgid "date/time submitted"
msgstr "data/hora d'enviament"
-#: contrib/comments/models.py:84
-#: contrib/comments/models.py:173
+#: contrib/comments/models.py:88 contrib/comments/models.py:180
msgid "is public"
msgstr "és públic"
-#: contrib/comments/models.py:86
+#: contrib/comments/models.py:90
msgid "is removed"
msgstr "està eliminat"
-#: contrib/comments/models.py:86
-msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead."
-msgstr "Marqui aquesta caixa si el comentari no és apropiat. En lloc seu es mostrarà \"Aquest comentari ha estat eliminat\" "
+#: contrib/comments/models.py:90
+msgid ""
+"Check this box if the comment is inappropriate. A \"This comment has been "
+"removed\" message will be displayed instead."
+msgstr ""
+"Marqui aquesta caixa si el comentari no és apropiat. En lloc seu es mostrarà "
+"\"Aquest comentari ha estat eliminat\" "
-#: contrib/comments/models.py:91
+#: contrib/comments/models.py:96
msgid "comments"
msgstr "comentaris"
-#: contrib/comments/models.py:134
-#: contrib/comments/models.py:213
+#: contrib/comments/models.py:140 contrib/comments/models.py:222
msgid "Content object"
msgstr "Objecte Contingut"
-#: contrib/comments/models.py:162
+#: contrib/comments/models.py:168
#, python-format
msgid ""
"Posted by %(user)s at %(date)s\n"
@@ -1271,48 +1352,48 @@ msgstr ""
"\n"
"http://%(domain)s%(url)s"
-#: contrib/comments/models.py:171
+#: contrib/comments/models.py:178
msgid "person's name"
msgstr "nom de la persona"
-#: contrib/comments/models.py:174
+#: contrib/comments/models.py:181
msgid "ip address"
msgstr "adreça ip"
-#: contrib/comments/models.py:176
+#: contrib/comments/models.py:183
msgid "approved by staff"
msgstr "aprovat per el \"staff\""
-#: contrib/comments/models.py:179
+#: contrib/comments/models.py:187
msgid "free comment"
msgstr "comentari lliure"
-#: contrib/comments/models.py:180
+#: contrib/comments/models.py:188
msgid "free comments"
msgstr "comentaris lliures"
-#: contrib/comments/models.py:239
+#: contrib/comments/models.py:250
msgid "score"
msgstr "puntuació"
-#: contrib/comments/models.py:240
+#: contrib/comments/models.py:251
msgid "score date"
msgstr "data de la puntuació"
-#: contrib/comments/models.py:243
+#: contrib/comments/models.py:255
msgid "karma score"
msgstr "puntuació de karma"
-#: contrib/comments/models.py:244
+#: contrib/comments/models.py:256
msgid "karma scores"
msgstr "punts de karma"
-#: contrib/comments/models.py:248
+#: contrib/comments/models.py:260
#, python-format
msgid "%(score)d rating by %(user)s"
msgstr "%(score)d punt/s per %(user)s"
-#: contrib/comments/models.py:264
+#: contrib/comments/models.py:277
#, python-format
msgid ""
"This comment was flagged by %(user)s:\n"
@@ -1323,36 +1404,36 @@ msgstr ""
"\n"
"%(text)s"
-#: contrib/comments/models.py:271
+#: contrib/comments/models.py:285
msgid "flag date"
msgstr "data de la marca"
-#: contrib/comments/models.py:274
+#: contrib/comments/models.py:289
msgid "user flag"
msgstr "marca d'usuari"
-#: contrib/comments/models.py:275
+#: contrib/comments/models.py:290
msgid "user flags"
msgstr "marques d'usuari"
-#: contrib/comments/models.py:279
+#: contrib/comments/models.py:294
#, python-format
msgid "Flag by %r"
msgstr "Marca de %r"
-#: contrib/comments/models.py:284
+#: contrib/comments/models.py:300
msgid "deletion date"
msgstr "data d'eliminació"
-#: contrib/comments/models.py:286
+#: contrib/comments/models.py:303
msgid "moderator deletion"
msgstr "eliminació del moderador"
-#: contrib/comments/models.py:287
+#: contrib/comments/models.py:304
msgid "moderator deletions"
msgstr "eliminacions del moderador"
-#: contrib/comments/models.py:291
+#: contrib/comments/models.py:308
#, python-format
msgid "Moderator deletion by %r"
msgstr "eliminació del moderador per %r"
@@ -1368,7 +1449,7 @@ msgstr "Qualificacions"
#: contrib/comments/templates/comments/form.html:12
#: contrib/comments/templates/comments/form.html:23
msgid "Required"
-msgstr "Requerit"
+msgstr "Obligatori"
#: contrib/comments/templates/comments/form.html:12
#: contrib/comments/templates/comments/form.html:23
@@ -1394,25 +1475,30 @@ 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."
+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."
#: contrib/comments/views/comments.py:112
#, python-format
msgid ""
-"This comment was posted by a user who has posted fewer than %(count)s comment:\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comment:\n"
"\n"
"%(text)s"
msgid_plural ""
-"This comment was posted by a user who has posted fewer than %(count)s comments:\n"
+"This comment was posted by a user who has posted fewer than %(count)s "
+"comments:\n"
"\n"
"%(text)s"
msgstr[0] ""
-"Aquest comentari ha estat publicat per un usuari que ha publicat menys de %(count)s comentari:\n"
+"Aquest comentari va ser enviat per un usuari que ha enviat menys de %"
+"(count)s comentari:\n"
"\n"
"%(text)s"
msgstr[1] ""
-"Aquest comentari ha estat publicat per un usuari que ha publicat menys de %(count)s comentaris:\n"
+"Aquest comentari va ser enviat per un usuari que ha enviat menys de %"
+"(count)s comentaris:\n"
"\n"
"%(text)s"
@@ -1430,27 +1516,33 @@ msgstr ""
#: contrib/comments/views/comments.py:190
#: contrib/comments/views/comments.py:283
msgid "Only POSTs are allowed"
-msgstr "Només s'admed POST"
+msgstr "Només s'admet POST"
#: 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"
+msgstr "Un o més dels caps obligatoris no ha estat sotmès"
#: 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)"
+msgstr ""
+"Algú està jugant amb el formulari de comentaris (violació de seguretat)"
#: 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"
+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: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'"
+msgstr ""
+"El formulari del comentari no ha proveït ni 'previsualitzar' ni 'enviar'"
#: contrib/comments/views/karma.py:21
msgid "Anonymous users cannot vote"
@@ -1464,25 +1556,28 @@ msgstr "ID del comentari invàlid"
msgid "No voting for yourself"
msgstr "No pots votar-te a tu mateix"
-#: contrib/contenttypes/models.py:37
+#: contrib/contenttypes/models.py:67
msgid "python model class name"
msgstr "nom de la classe del model en python"
-#: contrib/contenttypes/models.py:40
+#: contrib/contenttypes/models.py:71
msgid "content type"
msgstr "tipus de contingut"
-#: contrib/contenttypes/models.py:41
+#: contrib/contenttypes/models.py:72
msgid "content types"
msgstr "tipus de continguts"
#: 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."
+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/flatpages/models.py:9
msgid "title"
-msgstr "tìtol"
+msgstr "títol"
#: contrib/flatpages/models.py:10
msgid "content"
@@ -1497,12 +1592,16 @@ 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'."
+msgid ""
+"Example: 'flatpages/contact_page.html'. If this isn't provided, the system "
+"will use 'flatpages/default.html'."
+msgstr ""
+"Exemple: 'flatpages/contact_page.html'. Si no es proporciona, el sistema "
+"utilitzarà 'flatpages/default.htmlt'."
#: contrib/flatpages/models.py:14
msgid "registration required"
-msgstr "s'ha de estar registrat"
+msgstr "cal estar registrat"
#: contrib/flatpages/models.py:14
msgid "If this is checked, only logged-in users will be able to view the page."
@@ -1516,112 +1615,111 @@ msgstr "pàgina estàtica"
msgid "flat pages"
msgstr "pàgines estàtiques"
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
msgstr "rt"
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "st"
msgstr "r"
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "nd"
msgstr "n"
-#: contrib/humanize/templatetags/humanize.py:20
+#: contrib/humanize/templatetags/humanize.py:19
msgid "rd"
msgstr "r"
-#: contrib/humanize/templatetags/humanize.py:52
+#: contrib/humanize/templatetags/humanize.py:51
#, python-format
msgid "%(value).1f million"
msgid_plural "%(value).1f million"
msgstr[0] "%(value).1f milió"
msgstr[1] "%(value).1f milions"
-#: contrib/humanize/templatetags/humanize.py:55
+#: contrib/humanize/templatetags/humanize.py:54
#, python-format
msgid "%(value).1f billion"
msgid_plural "%(value).1f billion"
msgstr[0] "%(value).1f bilió"
msgstr[1] "%(value).1f bilions"
-#: contrib/humanize/templatetags/humanize.py:58
+#: contrib/humanize/templatetags/humanize.py:57
#, python-format
msgid "%(value).1f trillion"
msgid_plural "%(value).1f trillion"
msgstr[0] "%(value).1f trilió"
msgstr[1] "%(value).1f trilions"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "one"
msgstr "un"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "two"
msgstr "dos"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "three"
msgstr "tres"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "four"
-msgstr "cuatre"
+msgstr "quatre"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "five"
msgstr "cinc"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "six"
msgstr "sis"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "seven"
msgstr "set"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "eight"
msgstr "vuit"
-#: contrib/humanize/templatetags/humanize.py:74
+#: contrib/humanize/templatetags/humanize.py:73
msgid "nine"
msgstr "nou"
-#: contrib/humanize/templatetags/humanize.py:94
+#: contrib/humanize/templatetags/humanize.py:93
msgid "today"
msgstr "avui"
-#: contrib/humanize/templatetags/humanize.py:96
+#: contrib/humanize/templatetags/humanize.py:95
msgid "tomorrow"
msgstr "demà"
-#: contrib/humanize/templatetags/humanize.py:98
+#: contrib/humanize/templatetags/humanize.py:97
msgid "yesterday"
msgstr "ahir"
-#: contrib/localflavor/ar/forms.py:28
+#: contrib/localflavor/ar/forms.py:27
msgid "Enter a postal code in the format NNNN or ANNNNAAA."
msgstr "Introdueixi un codi postal en el format NNNN o ANNNNAAA."
-#: contrib/localflavor/ar/forms.py:50
-#: contrib/localflavor/br/forms.py:96
-#: contrib/localflavor/br/forms.py:135
-#: contrib/localflavor/pe/forms.py:23
+#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96
+#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23
#: contrib/localflavor/pe/forms.py:51
msgid "This field requires only numbers."
-msgstr "Aquest camps requereix només números."
+msgstr "Aquest camp precisa només números."
-#: contrib/localflavor/ar/forms.py:51
+#: contrib/localflavor/ar/forms.py:50
msgid "This field requires 7 or 8 digits."
-msgstr "Aquest camp requereix 7 o 8 dígits."
+msgstr "Aquest camp precisa 7 o 8 dígits."
-#: contrib/localflavor/ar/forms.py:80
+#: contrib/localflavor/ar/forms.py:79
msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format."
-msgstr "Introdueixi un número CUIT vàlid en el format XX-XXXXXXXX-X o XXXXXXXXXXXX."
+msgstr ""
+"Introdueixi un número CUIT vàlid en el format XX-XXXXXXXX-X o XXXXXXXXXXXX."
-#: contrib/localflavor/ar/forms.py:81
+#: contrib/localflavor/ar/forms.py:80
msgid "Invalid CUIT."
msgstr "Invàlid CUIT."
@@ -1635,11 +1733,15 @@ msgstr "Introdueixi un codi zip en el format XXXXX-XXX."
#: contrib/localflavor/br/forms.py:30
msgid "Phone numbers must be in XX-XXXX-XXXX format."
-msgstr "El número de telèfon ha de ser en el format XX-XXXX-XXXX."
+msgstr "El número de telèfon ha de estar en el format XX-XXXX-XXXX."
#: contrib/localflavor/br/forms.py:58
-msgid "Select a valid brazilian state. That state is not one of the available states."
-msgstr "Seleccioni un estat brasiler vàlid. Aquest estat no és un dels estats disponibles."
+msgid ""
+"Select a valid brazilian state. That state is not one of the available "
+"states."
+msgstr ""
+"Seleccioni un estat brasiler vàlid. Aquest estat no és un dels estats "
+"disponibles."
#: contrib/localflavor/br/forms.py:94
msgid "Invalid CPF number."
@@ -1647,7 +1749,7 @@ msgstr "Número CPF invàlid."
#: contrib/localflavor/br/forms.py:95
msgid "This field requires at most 11 digits or 14 characters."
-msgstr "Aquest camp requereix com a màxim 11 dígits o 14 caracters."
+msgstr "Aquest camp precisa com a màxim 11 dígits o 14 caracters."
#: contrib/localflavor/br/forms.py:134
msgid "Invalid CNPJ number."
@@ -1655,15 +1757,17 @@ msgstr "Número CNPJ invàlid."
#: contrib/localflavor/br/forms.py:136
msgid "This field requires at least 14 digits"
-msgstr "Aquest camp requereix almenys 14 dígits."
+msgstr "Aquest camp precisa almenys 14 dígits."
#: contrib/localflavor/ca/forms.py:17
msgid "Enter a postal code in the format XXX XXX."
msgstr "Introdueixi un codi postal en el format XXX XXX."
#: contrib/localflavor/ca/forms.py:88
-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 Canadà en el format XXX-XXX-XXXX."
+msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format."
+msgstr ""
+"Introdueixi un número vàlid de la Assegurança Social de Canadà en el format "
+"XXX-XXX-XXX."
#: contrib/localflavor/ch/ch_states.py:5
msgid "Aargau"
@@ -1671,31 +1775,31 @@ msgstr "Argau"
#: contrib/localflavor/ch/ch_states.py:6
msgid "Appenzell Innerrhoden"
-msgstr "Appenzell Innerrhoden"
+msgstr "Appenzell Inner-Rhoden"
#: contrib/localflavor/ch/ch_states.py:7
msgid "Appenzell Ausserrhoden"
-msgstr "Appenzell Ausserrhoden"
+msgstr "Appenzell Ausser-Rhoden"
#: contrib/localflavor/ch/ch_states.py:8
msgid "Basel-Stadt"
-msgstr "Basel-Stadt"
+msgstr "Basel-Ciutat"
#: contrib/localflavor/ch/ch_states.py:9
msgid "Basel-Land"
-msgstr "Basel-Land"
+msgstr "Basel-Camp"
#: contrib/localflavor/ch/ch_states.py:10
msgid "Berne"
-msgstr "Berne"
+msgstr "Berna"
#: contrib/localflavor/ch/ch_states.py:11
msgid "Fribourg"
-msgstr "Fribourg"
+msgstr "Friburg"
#: contrib/localflavor/ch/ch_states.py:12
msgid "Geneva"
-msgstr "Geneva"
+msgstr "Ginebra"
#: contrib/localflavor/ch/ch_states.py:13
msgid "Glarus"
@@ -1711,7 +1815,7 @@ msgstr "Jura"
#: contrib/localflavor/ch/ch_states.py:16
msgid "Lucerne"
-msgstr "Lucerne"
+msgstr "Lucerna"
#: contrib/localflavor/ch/ch_states.py:17
msgid "Neuchatel"
@@ -1767,16 +1871,19 @@ msgstr "Zug"
#: contrib/localflavor/ch/ch_states.py:30
msgid "Zurich"
-msgstr "Zurich"
+msgstr "Zuric"
-#: contrib/localflavor/ch/forms.py:16
-#: contrib/localflavor/no/forms.py:12
+#: contrib/localflavor/ch/forms.py:16 contrib/localflavor/no/forms.py:12
msgid "Enter a zip code in the format XXXX."
msgstr "Introdueixi un codi zip en el format XXXX."
#: contrib/localflavor/ch/forms.py:64
-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."
+msgid ""
+"Enter a valid Swiss identity or passport card number in X1234567<0 or "
+"1234567890 format."
+msgstr ""
+"Introdueixi un número d'identificació o de passaport Suïssos en els formats "
+"1234567890 o X1234567<0."
#: contrib/localflavor/cl/forms.py:29
msgid "Enter a valid Chilean RUT."
@@ -1792,15 +1899,15 @@ msgstr "El RUT Xilè no és vàlid."
#: contrib/localflavor/de/de_states.py:5
msgid "Baden-Wuerttemberg"
-msgstr "Baden-Wuerttemberg"
+msgstr "Baden-Württemberg"
#: contrib/localflavor/de/de_states.py:6
msgid "Bavaria"
-msgstr "Bavaria"
+msgstr "Baviera"
#: contrib/localflavor/de/de_states.py:7
msgid "Berlin"
-msgstr "Berlin"
+msgstr "Berlín"
#: contrib/localflavor/de/de_states.py:8
msgid "Brandenburg"
@@ -1820,19 +1927,19 @@ msgstr "Hessen"
#: contrib/localflavor/de/de_states.py:12
msgid "Mecklenburg-Western Pomerania"
-msgstr "Mecklenburg-Western Pomerania"
+msgstr "Mecklenburg-Pomerània Occidental"
#: contrib/localflavor/de/de_states.py:13
msgid "Lower Saxony"
-msgstr "Lower Saxony"
+msgstr "Baixa Saxònia"
#: contrib/localflavor/de/de_states.py:14
msgid "North Rhine-Westphalia"
-msgstr "North Rhine-Westphalia"
+msgstr "Renània del Nord-Westfàlia"
#: contrib/localflavor/de/de_states.py:15
msgid "Rhineland-Palatinate"
-msgstr "Rhineland-Palatinate"
+msgstr "Renània-Palatinat"
#: contrib/localflavor/de/de_states.py:16
msgid "Saarland"
@@ -1840,29 +1947,32 @@ msgstr "Saarland"
#: contrib/localflavor/de/de_states.py:17
msgid "Saxony"
-msgstr "Saxony"
+msgstr "Saxònia"
#: contrib/localflavor/de/de_states.py:18
msgid "Saxony-Anhalt"
-msgstr "Saxony-Anhalt"
+msgstr "Saxònia-Anhalt"
#: contrib/localflavor/de/de_states.py:19
msgid "Schleswig-Holstein"
-msgstr "Schleswig-Holstein"
+msgstr "Slesvig-Holstein"
#: contrib/localflavor/de/de_states.py:20
msgid "Thuringia"
-msgstr "Thuringia"
+msgstr "Turíngia"
-#: contrib/localflavor/de/forms.py:14
-#: contrib/localflavor/fi/forms.py:12
+#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12
#: contrib/localflavor/fr/forms.py:15
msgid "Enter a zip code in the format XXXXX."
msgstr "Introdueixi un codi zip en el format XXXXX."
#: contrib/localflavor/de/forms.py:41
-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."
+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"
@@ -2136,8 +2246,12 @@ 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."
+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:66
msgid "Please enter a valid NIF, NIE, or CIF."
@@ -2160,8 +2274,11 @@ msgid "Invalid checksum for CIF."
msgstr "Validació invàlida del CIF."
#: contrib/localflavor/es/forms.py:142
-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."
+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:143
msgid "Invalid checksum for bank account number."
@@ -2176,8 +2293,10 @@ 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."
+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:18
msgid "The Icelandic identification number is not valid."
@@ -2195,7 +2314,7 @@ msgstr "Introdueixi un número valid de la Seguretat Social."
msgid "Enter a valid VAT number."
msgstr "Introdueixi un número de IVA (VAT) vàlid."
-#: contrib/localflavor/jp/forms.py:19
+#: contrib/localflavor/jp/forms.py:17
msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX."
msgstr "Introdueixi un codi postal en el format XXXXXXX o XX-XXXX."
@@ -2393,11 +2512,11 @@ msgstr "Aguascalientes"
#: contrib/localflavor/mx/mx_states.py:13
msgid "Baja California"
-msgstr "Baja California"
+msgstr "Baixa California"
#: contrib/localflavor/mx/mx_states.py:14
msgid "Baja California Sur"
-msgstr "Baja California Sur"
+msgstr "Baixa California Sud"
#: contrib/localflavor/mx/mx_states.py:15
msgid "Campeche"
@@ -2421,7 +2540,7 @@ msgstr "Colima"
#: contrib/localflavor/mx/mx_states.py:20
msgid "Distrito Federal"
-msgstr "Distrito Federal"
+msgstr "Districte Federal"
#: contrib/localflavor/mx/mx_states.py:21
msgid "Durango"
@@ -2445,7 +2564,7 @@ msgstr "Jalisco"
#: contrib/localflavor/mx/mx_states.py:26
msgid "Estado de México"
-msgstr "Estado de México"
+msgstr "Estat de Mèxic"
#: contrib/localflavor/mx/mx_states.py:27
msgid "Michoacán"
@@ -2517,15 +2636,15 @@ msgstr "Zacatecas"
#: contrib/localflavor/nl/forms.py:21
msgid "Enter a valid postal code"
-msgstr "Introdueixi un codi postal vàlid."
+msgstr "Introduïu un codi postal vàlid."
#: contrib/localflavor/nl/forms.py:52
msgid "Enter a valid phone number"
-msgstr "Introdueixi un número de telèfon vàlid."
+msgstr "Introduïu un número de telèfon vàlid."
#: contrib/localflavor/nl/forms.py:78
msgid "Enter a valid SoFi number"
-msgstr "Introdueixi un número SoFi vàlid."
+msgstr "Introduïu un número SoFi vàlid."
#: contrib/localflavor/nl/nl_provinces.py:4
msgid "Drente"
@@ -2577,15 +2696,15 @@ msgstr "Zuid-Holland"
#: contrib/localflavor/no/forms.py:33
msgid "Enter a valid Norwegian social security number."
-msgstr "Introdueixi un número de la seguretat social Noruega vàlid."
+msgstr "Introduïu un número de la seguretat social Noruega vàlid."
#: contrib/localflavor/pe/forms.py:24
msgid "This field requires 8 digits."
-msgstr "Aquest camp requereix 8 dígits."
+msgstr "Aquest camp precisa 8 dígits."
#: contrib/localflavor/pe/forms.py:52
msgid "This field requires 11 digits."
-msgstr "Aquest camp requereix 11 dígits."
+msgstr "Aquest camp precisa 11 dígits."
#: contrib/localflavor/pl/forms.py:39
msgid "National Identification Number consists of 11 digits."
@@ -2596,7 +2715,8 @@ msgid "Wrong checksum for the National Identification Number."
msgstr "Validació invàlida del número d'identificació nacional."
#: 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."
+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:73
@@ -2605,7 +2725,8 @@ msgstr "Validació invàlida del número tributari (NIP)."
#: contrib/localflavor/pl/forms.py:112
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."
+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)."
@@ -2613,7 +2734,7 @@ msgstr "Validació invàlida del número nacional de registre de negocis."
#: contrib/localflavor/pl/forms.py:156
msgid "Enter a postal code in the format XX-XXX."
-msgstr "Introdueixi un codi postal en el format XX-XXX."
+msgstr "Introduïu un codi postal en el format XX-XXX."
#: contrib/localflavor/pl/pl_voivodeships.py:8
msgid "Lower Silesia"
@@ -2681,7 +2802,7 @@ msgstr "West Pomerania"
#: contrib/localflavor/sk/forms.py:30
msgid "Enter a postal code in the format XXXXX or XXX XX."
-msgstr "Introdueixi un codi postal en el format XXXXX or XXX XX."
+msgstr "Introduïu un codi postal en el format XXXXX or XXX XX."
#: contrib/localflavor/sk/sk_districts.py:8
msgid "Banska Bystrica"
@@ -3033,7 +3154,7 @@ msgstr "Regió de Zilina"
#: contrib/localflavor/uk/forms.py:21
msgid "Enter a valid postcode."
-msgstr "Introdueixi un codi postal vàlid."
+msgstr "Introdueix un codi postal vàlid."
#: contrib/localflavor/uk/uk_regions.py:11
msgid "Bedfordshire"
@@ -3204,10 +3325,13 @@ msgid "County Armagh"
msgstr "County Armagh"
#: contrib/localflavor/uk/uk_regions.py:57
-#: contrib/localflavor/uk/uk_regions.py:58
msgid "County Down"
msgstr "County Down"
+#: contrib/localflavor/uk/uk_regions.py:58
+msgid "County Fermanagh"
+msgstr "Comptat de Fermanagh"
+
#: contrib/localflavor/uk/uk_regions.py:59
msgid "County Londonderry"
msgstr "County Londonderry"
@@ -3242,11 +3366,11 @@ msgstr "Powys"
#: contrib/localflavor/uk/uk_regions.py:70
msgid "South Glamorgan"
-msgstr "South Glamorgan"
+msgstr "Glamorgan Sud"
#: contrib/localflavor/uk/uk_regions.py:71
msgid "West Glamorgan"
-msgstr "West Glamorgan"
+msgstr "Glamorgan Oest"
#: contrib/localflavor/uk/uk_regions.py:75
msgid "Borders"
@@ -3254,7 +3378,7 @@ msgstr "Borders"
#: contrib/localflavor/uk/uk_regions.py:76
msgid "Central Scotland"
-msgstr "Central Scotland"
+msgstr "Escòcia central"
#: contrib/localflavor/uk/uk_regions.py:77
msgid "Dumfries and Galloway"
@@ -3298,19 +3422,19 @@ msgstr "Western Isles"
#: contrib/localflavor/uk/uk_regions.py:90
msgid "England"
-msgstr "England"
+msgstr "Anglaterra"
#: contrib/localflavor/uk/uk_regions.py:91
msgid "Northern Ireland"
-msgstr "Northern Ireland"
+msgstr "Irlanda del Nord"
#: contrib/localflavor/uk/uk_regions.py:92
msgid "Scotland"
-msgstr "Scotland"
+msgstr "Escòcia"
#: contrib/localflavor/uk/uk_regions.py:93
msgid "Wales"
-msgstr "Wales"
+msgstr "Gal·les"
#: contrib/localflavor/us/forms.py:16
msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX."
@@ -3318,7 +3442,9 @@ msgstr "Introdueixi un codi zip en el format XXXXX o XXXXX-XXXX."
#: contrib/localflavor/us/forms.py:54
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."
+msgstr ""
+"Introdueixi un número vàlid de la Seguretat Social dels E.U.A. en el format "
+"XXX-XX-XXXX."
#: contrib/localflavor/za/forms.py:20
msgid "Enter a valid South African ID number"
@@ -3330,11 +3456,11 @@ msgstr "Introdueixi un codi postal Sud Africà vàlid."
#: contrib/localflavor/za/za_provinces.py:4
msgid "Eastern Cape"
-msgstr "Eastern Cape"
+msgstr "Cap Oriental"
#: contrib/localflavor/za/za_provinces.py:5
msgid "Free State"
-msgstr "Free State"
+msgstr "Estat lliure"
#: contrib/localflavor/za/za_provinces.py:6
msgid "Gauteng"
@@ -3354,31 +3480,39 @@ msgstr "Mpumalanga"
#: contrib/localflavor/za/za_provinces.py:10
msgid "Northern Cape"
-msgstr "Northern Cape"
+msgstr "Cap Nord"
#: contrib/localflavor/za/za_provinces.py:11
msgid "North West"
-msgstr "North West"
+msgstr "Cap Oest"
#: contrib/localflavor/za/za_provinces.py:12
msgid "Western Cape"
-msgstr "Western Cape"
+msgstr "Cap Occidental"
#: 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/'."
+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:// ."
+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 adalt) o una URL completa que comenci "
+"per http:// ."
#: contrib/redirects/models.py:13
msgid "redirect"
@@ -3388,23 +3522,23 @@ msgstr "redreçament"
msgid "redirects"
msgstr "redreçaments"
-#: contrib/sessions/models.py:46
+#: contrib/sessions/models.py:41
msgid "session key"
msgstr "clau de la sessió"
-#: contrib/sessions/models.py:47
+#: contrib/sessions/models.py:42
msgid "session data"
msgstr "dades de la sessió"
-#: contrib/sessions/models.py:48
+#: contrib/sessions/models.py:43
msgid "expire date"
msgstr "data de caducitat"
-#: contrib/sessions/models.py:53
+#: contrib/sessions/models.py:48
msgid "session"
msgstr "sessió"
-#: contrib/sessions/models.py:54
+#: contrib/sessions/models.py:49
msgid "sessions"
msgstr "sessions"
@@ -3426,15 +3560,20 @@ 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."
+msgstr "Aquest valor ha de contenir només lletres, números 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 (/)."
+msgid ""
+"This value must contain only letters, numbers, underscores, dashes or "
+"slashes."
+msgstr ""
+"Aquest valor ha de contenir només lletres, números, guions baixos, guions i "
+"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"
+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."
@@ -3454,7 +3593,7 @@ 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."
+msgstr "Si el plau, introdueixi una adreça IP vàlida."
#: core/validators.py:115
msgid "Empty values are not allowed here."
@@ -3468,14 +3607,13 @@ msgstr "No s'admeten caracters no numèrics."
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:151
+#: core/validators.py:128 newforms/fields.py:152
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í."
+msgstr "Només s'admeten caracters alfabètics aquí."
#: core/validators.py:147
msgid "Year must be 1900 or later."
@@ -3486,8 +3624,7 @@ msgstr "L'any ha de ser posterior al 1900"
msgid "Invalid date: %s"
msgstr "Data invàlida: %s"
-#: core/validators.py:156
-#: db/models/fields/__init__.py:509
+#: core/validators.py:156 db/models/fields/__init__.py:527
msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Introdueixi una data vàlida en el forma AAAA-MM-DD."
@@ -3495,27 +3632,27 @@ msgstr "Introdueixi una data vàlida en el forma AAAA-MM-DD."
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:583
+#: core/validators.py:165 db/models/fields/__init__.py:604
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:402
+#: core/validators.py:170 newforms/fields.py:403
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:432
+#: core/validators.py:182 core/validators.py:474 newforms/fields.py:433