Changeset 6920

Timestamp:

12/14/07 19:38:43 (7 months ago)

Author:

jbronn

Message:

gis: Merged revisions 6672,6686-6688,6690,6693,6707-6708,6726,6730,6753,6755-6762,6764,6776-6777,6779,6782-6919 via svnmerge from trunk; reverted oracle backend base.py due to ikelly's patch in r6905.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/AUTHORS (modified) (8 diffs)
• django/branches/gis/django/conf/global_settings.py (modified) (2 diffs)
• django/branches/gis/django/conf/__init__.py (modified) (3 diffs)
• django/branches/gis/django/conf/locale/ca/LC_MESSAGES/djangojs.mo (modified) (previous)
• django/branches/gis/django/conf/locale/ca/LC_MESSAGES/djangojs.po (modified) (4 diffs)
• django/branches/gis/django/conf/locale/ca/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/gis/django/conf/locale/ca/LC_MESSAGES/django.po (modified) (27 diffs)
• django/branches/gis/django/contrib/admin/templatetags/admin_list.py (modified) (1 diff)
• django/branches/gis/django/contrib/auth/models.py (modified) (1 diff)
• django/branches/gis/django/contrib/auth/tests.py (modified) (1 diff)
• django/branches/gis/django/contrib/contenttypes/generic.py (modified) (9 diffs)
• django/branches/gis/django/contrib/localflavor/mx (copied) (copied from django/trunk/django/contrib/localflavor/mx)
• django/branches/gis/django/contrib/localflavor/mx/forms.py (copied) (copied from django/trunk/django/contrib/localflavor/mx/forms.py)
• django/branches/gis/django/contrib/localflavor/mx/__init__.py (copied) (copied from django/trunk/django/contrib/localflavor/mx/__init__.py)
• django/branches/gis/django/contrib/localflavor/mx/mx_states.py (copied) (copied from django/trunk/django/contrib/localflavor/mx/mx_states.py)
• django/branches/gis/django/contrib/localflavor/uk/forms.py (modified) (2 diffs)
• django/branches/gis/django/contrib/localflavor/uk/uk_regions.py (copied) (copied from django/trunk/django/contrib/localflavor/uk/uk_regions.py)
• django/branches/gis/django/contrib/localflavor/za (copied) (copied from django/trunk/django/contrib/localflavor/za)
• django/branches/gis/django/contrib/localflavor/za/forms.py (copied) (copied from django/trunk/django/contrib/localflavor/za/forms.py)
• django/branches/gis/django/contrib/localflavor/za/__init__.py (copied) (copied from django/trunk/django/contrib/localflavor/za/__init__.py)
• django/branches/gis/django/contrib/localflavor/za/za_provinces.py (copied) (copied from django/trunk/django/contrib/localflavor/za/za_provinces.py)
• django/branches/gis/django/contrib/markup/templatetags/markup.py (modified) (2 diffs)
• django/branches/gis/django/contrib/markup/tests.py (modified) (1 diff)
• django/branches/gis/django/contrib/sessions/backends/base.py (modified) (1 diff)
• django/branches/gis/django/contrib/sessions/backends/file.py (modified) (2 diffs)
• django/branches/gis/django/contrib/sessions/models.py (modified) (1 diff)
• django/branches/gis/django/contrib/sessions/tests.py (modified) (3 diffs)
• django/branches/gis/django/core/cache/backends/filebased.py (modified) (6 diffs)
• django/branches/gis/django/core/cache/backends/locmem.py (modified) (4 diffs)
• django/branches/gis/django/core/cache/backends/simple.py (deleted)
• django/branches/gis/django/core/cache/__init__.py (modified) (2 diffs)
• django/branches/gis/django/core/exceptions.py (modified) (1 diff)
• django/branches/gis/django/core/handlers/base.py (modified) (1 diff)
• django/branches/gis/django/core/handlers/modpython.py (modified) (1 diff)
• django/branches/gis/django/core/handlers/wsgi.py (modified) (1 diff)
• django/branches/gis/django/core/management/commands/loaddata.py (modified) (3 diffs)
• django/branches/gis/django/core/management/commands/syncdb.py (modified) (1 diff)
• django/branches/gis/django/core/management/__init__.py (modified) (13 diffs)
• django/branches/gis/django/core/management/validation.py (modified) (2 diffs)
• django/branches/gis/django/core/serializers/pyyaml.py (modified) (2 diffs)
• django/branches/gis/django/db/backends/oracle/base.py (modified) (5 diffs)
• django/branches/gis/django/db/backends/postgresql_psycopg2/base.py (modified) (2 diffs)
• django/branches/gis/django/db/__init__.py (modified) (1 diff)
• django/branches/gis/django/db/models/base.py (modified) (2 diffs)
• django/branches/gis/django/db/models/fields/__init__.py (modified) (1 diff)
• django/branches/gis/django/db/models/options.py (modified) (3 diffs)
• django/branches/gis/django/db/models/query.py (modified) (1 diff)
• django/branches/gis/django/http/__init__.py (modified) (1 diff)
• django/branches/gis/django/http/utils.py (modified) (3 diffs)
• django/branches/gis/django/middleware/common.py (modified) (3 diffs)
• django/branches/gis/django/newforms/fields.py (modified) (3 diffs)
• django/branches/gis/django/newforms/models.py (modified) (6 diffs)
• django/branches/gis/django/shortcuts/__init__.py (modified) (1 diff)
• django/branches/gis/django/template/context.py (modified) (2 diffs)
• django/branches/gis/django/template/defaultfilters.py (modified) (4 diffs)
• django/branches/gis/django/test/_doctest.py (modified) (1 diff)
• django/branches/gis/django/utils/datastructures.py (modified) (3 diffs)
• django/branches/gis/django/utils/html.py (modified) (7 diffs)
• django/branches/gis/django/utils/maxlength.py (modified) (4 diffs)
• django/branches/gis/django/utils/safestring.py (modified) (2 diffs)
• django/branches/gis/django/views/debug.py (modified) (10 diffs)
• django/branches/gis/django/views/generic/date_based.py (modified) (1 diff)
• django/branches/gis/django/views/generic/list_detail.py (modified) (1 diff)
• django/branches/gis/docs/add_ons.txt (modified) (4 diffs)
• django/branches/gis/docs/authentication.txt (modified) (3 diffs)
• django/branches/gis/docs/cache.txt (modified) (1 diff)
• django/branches/gis/docs/contributing.txt (modified) (3 diffs)
• django/branches/gis/docs/custom_model_fields.txt (modified) (26 diffs)
• django/branches/gis/docs/databases.txt (modified) (1 diff)
• django/branches/gis/docs/email.txt (modified) (1 diff)
• django/branches/gis/docs/form_for_model.txt (copied) (copied from django/trunk/docs/form_for_model.txt)
• django/branches/gis/docs/generic_views.txt (modified) (2 diffs)
• django/branches/gis/docs/install.txt (modified) (1 diff)
• django/branches/gis/docs/localflavor.txt (copied) (copied from django/trunk/docs/localflavor.txt)
• django/branches/gis/docs/middleware.txt (modified) (1 diff)
• django/branches/gis/docs/model-api.txt (modified) (1 diff)
• django/branches/gis/docs/modelforms.txt (copied) (copied from django/trunk/docs/modelforms.txt)
• django/branches/gis/docs/newforms.txt (modified) (7 diffs)
• django/branches/gis/docs/request_response.txt (modified) (2 diffs)
• django/branches/gis/docs/serialization.txt (modified) (2 diffs)
• django/branches/gis/docs/sessions.txt (modified) (1 diff)
• django/branches/gis/docs/settings.txt (modified) (3 diffs)
• django/branches/gis/docs/shortcuts.txt (modified) (1 diff)
• django/branches/gis/docs/syndication_feeds.txt (modified) (4 diffs)
• django/branches/gis/docs/templates_python.txt (modified) (6 diffs)
• django/branches/gis/docs/templates.txt (modified) (10 diffs)
• django/branches/gis/docs/tutorial02.txt (modified) (14 diffs)
• django/branches/gis/tests/modeltests/empty/models.py (modified) (1 diff)
• django/branches/gis/tests/modeltests/field_defaults/models.py (modified) (1 diff)
• django/branches/gis/tests/modeltests/generic_relations/models.py (modified) (5 diffs)
• django/branches/gis/tests/modeltests/get_object_or_404/models.py (modified) (1 diff)
• django/branches/gis/tests/modeltests/invalid_models/models.py (modified) (2 diffs)
• django/branches/gis/tests/modeltests/model_forms/models.py (modified) (21 diffs)
• django/branches/gis/tests/modeltests/select_related/models.py (modified) (1 diff)
• django/branches/gis/tests/modeltests/serializers/models.py (modified) (2 diffs)
• django/branches/gis/tests/modeltests/test_client/models.py (modified) (1 diff)
• django/branches/gis/tests/modeltests/user_commands/models.py (modified) (1 diff)
• django/branches/gis/tests/regressiontests/cache/tests.py (modified) (4 diffs)
• django/branches/gis/tests/regressiontests/defaultfilters/tests.py (modified) (1 diff)
• django/branches/gis/tests/regressiontests/forms/localflavor/za.py (copied) (copied from django/trunk/tests/regressiontests/forms/localflavor/za.py)
• django/branches/gis/tests/regressiontests/forms/tests.py (modified) (2 diffs)
• django/branches/gis/tests/regressiontests/i18n/tests.py (modified) (2 diffs)
• django/branches/gis/tests/regressiontests/maxlength/tests.py (modified) (2 diffs)
• django/branches/gis/tests/regressiontests/middleware (copied) (copied from django/trunk/tests/regressiontests/middleware)
• django/branches/gis/tests/regressiontests/middleware/__init__.py (copied) (copied from django/trunk/tests/regressiontests/middleware/__init__.py)
• django/branches/gis/tests/regressiontests/middleware/tests.py (copied) (copied from django/trunk/tests/regressiontests/middleware/tests.py)
• django/branches/gis/tests/regressiontests/middleware/urls.py (copied) (copied from django/trunk/tests/regressiontests/middleware/urls.py)
• django/branches/gis/tests/regressiontests/model_regress/models.py (modified) (2 diffs)
• django/branches/gis/tests/regressiontests/string_lookup/models.py (modified) (4 diffs)
• django/branches/gis/tests/regressiontests/templates/context.py (copied) (copied from django/trunk/tests/regressiontests/templates/context.py)
• django/branches/gis/tests/regressiontests/templates/tests.py (modified) (2 diffs)
• django/branches/gis/tests/regressiontests/views/views.py (modified) (1 diff)
• django/branches/gis/tests/runtests.py (modified) (1 diff)
• django/branches/gis/tests/urls.py (modified) (1 diff)

django/branches/gis/AUTHORS

@@ -90 +90 @@
-    Pete Crosier <pete.crosier@gmail.com>
-    Matt Croydon <http://www.postneo.com/>
+    Leah Culver <leah@pownce.com>
-    flavio.curella@gmail.com
-    Jure Cuhalev <gandalf@owca.info>
@@ -133 +134 @@
-    gandalf@owca.info
-    Marc Garcia <marc.garcia@accopensys.com>
+    Andy Gayton <andy-django@thecablelounge.com>
-    Baishampayan Ghose
-    Dimitris Glezos <dimitris@glezos.com>
@@ -172 +174 @@
-    Antti Kaihola <http://akaihola.blogspot.com/>
-    Nagy Károly <charlie@rendszergazda.com>
+    Erik Karulf <erik@karulf.com>
-    Ben Dean Kawamura <ben.dean.kawamura@gmail.com>
-    Ian G. Kelly <ian.g.kelly@gmail.com>
@@ -191 +194 @@
-    konrad@gwu.edu
-    knox <christobzr@gmail.com>
+    David Krauth
-    kurtiss@meetro.com
-    lakin.wecker@gmail.com
@@ -205 +209 @@
-    limodou
-    Philip Lindborg <philip.lindborg@gmail.com>
+    Trey Long <trey@ktrl.com>
-    msaelices <msaelices@gmail.com>
-    Matt McClanahan <http://mmcc.cx/>
@@ -252 +257 @@
-    Luke Plant <http://lukeplant.me.uk/>
-    plisk
+    Mihai Preda <mihai_preda@yahoo.com>
-    Daniel Poelzleithner <http://poelzi.org/>
-    polpak@yahoo.com
@@ -263 +269 @@
-    Brian Ray <http://brianray.chipy.org/>
-    remco@diji.biz
+    David Reynolds <david@reynoldsfamily.org.uk>
-    rhettg@gmail.com
-    ricardojbarrios@gmail.com
@@ -282 +289 @@
-    jason.sidabras@gmail.com
-    Jozko Skrablin <jozko.skrablin@gmail.com>
+    Ben Slavin <benjamin.slavin@gmail.com>
-    SmileyChris <smileychris@gmail.com>
-    smurf@smurf.noris.de

django/branches/gis/django/conf/global_settings.py

@@ -254 +254 @@
-URL_VALIDATOR_USER_AGENT = "Django/%s (http://www.djangoproject.com)" % get_version()
-
+# The tablespaces to use for each model when not specified otherwise.
+DEFAULT_TABLESPACE = ''
+DEFAULT_INDEX_TABLESPACE = ''
+
-##############
-# MIDDLEWARE #
@@ -290 +294 @@
-# The cache backend to use.  See the docstring in django.core.cache for the
-# possible values.
-simple
+locmem
-CACHE_MIDDLEWARE_KEY_PREFIX = ''
-CACHE_MIDDLEWARE_SECONDS = 600

django/branches/gis/django/conf/__init__.py

@@ -53 +53 @@
-                raise KeyError
-        except KeyError:
-EnvironmentError, "Environment variable %s is undefined." % ENVIRONMENT_VARIABLE
+ImportError, "Environment variable %s is undefined so settings cannot be imported." % ENVIRONMENT_VARIABLE   # NOTE: This is arguably an EnvironmentError, but that causes problems with Python's interactive help
-
-        self._target = Settings(settings_module)
@@ -64 +64 @@
-        """
-        if self._target != None:
-Environment
+Runtime
-        holder = UserSettingsHolder(default_settings)
-        for name, value in options.items():
@@ -83 +83 @@
-            mod = __import__(self.SETTINGS_MODULE, {}, {}, [''])
-        except ImportError, e:
-Environmen
+Impor
-
-        # Settings that should be converted into tuples if they're mistakenly entered

django/branches/gis/django/conf/locale/ca/LC_MESSAGES/djangojs.po

@@ +1 @@
+# translation of djangojs.po to español
-# translation of djangojs.po to
-# Catalan translation for the django-admin JS files.
-# This file is distributed under the same license as the Django package.
-#
+# Antoni Aloy <antoni.aloy@trespams.com>, 2007.
-msgid ""
-msgstr ""
@@ -8 +10 @@
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-20 18:25+0200\n"
-06-25 17:47+02
-Marc Fargas <telenieko@telenieko
- <es
+12-01 12:06+01
+Antoni Aloy <antoni.aloy@trespams
+español <ca
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-VIM 7.0
+KBabel 1.11.4
-"Plural-Forms:  nplurals=2; plural=(n != 1);\n"
-
@@ -52 +54 @@
-"January February March April May June July August September October November "
-"December"
-
-
+
-
-#: contrib/admin/media/js/dateparse.js:33
@@ -118 +119 @@
-msgid "Hide"
-msgstr "Ocultar"
+

django/branches/gis/django/conf/locale/ca/LC_MESSAGES/django.po

@@ -6 +6 @@
-"Project-Id-Version: django\n"
-"Report-Msgid-Bugs-To: \n"
-1-05 17:33
-1-05 17:34
-Garcia <marc.garcia@accopensys
+2-02 22:26
+2-02 22:32
+Fargas <telenieko@telenieko
-"Language-Team:  <es@li.org>\n"
-"MIME-Version: 1.0\n"
@@ -195 +195 @@
-msgstr "Xinés tradicional"
-
-2
+4
-#, python-format
-msgid ""
@@ -204 +204 @@
-"<ul>\n"
-
-2 contrib/admin/filterspecs.py:90
-5 contrib/admin/filterspecs.py:171
+4 contrib/admin/filterspecs.py:92
+7 contrib/admin/filterspecs.py:173
-msgid "All"
-msgstr "Tots"
-
-1
+3
-msgid "Any date"
-msgstr "Qualsevol data"
-
-2
+4
-msgid "Today"
-msgstr "Avui"
-
-5
+7
-msgid "Past 7 days"
-msgstr "Últims 7 dies"
-
-7
+9
-msgid "This month"
-msgstr "Aquest mes"
-
-19
+21
-msgid "This year"
-msgstr "Aquest any"
-
-5 newforms/widgets.py:22
-1
+7 newforms/widgets.py:23
+2
-msgid "Yes"
-msgstr "Si"
-
-5 newforms/widgets.py:22
-1
+7 newforms/widgets.py:23
+2
-msgid "No"
-msgstr "No"
-
-2 newforms/widgets.py:22
-1
+4 newforms/widgets.py:23
+2
-msgid "Unknown"
-msgstr "Desconegut"
-
-7
+8
-msgid "action time"
-msgstr "moment de l'acció"
-
-0
+1
-msgid "object id"
-msgstr "id del objecte"
-
-1
+2
-msgid "object repr"
-msgstr "'repr' de l'objecte"
-
-2
+3
-msgid "action flag"
-msgstr "marca de l'acció"
-
-3
+4
-msgid "change message"
-msgstr "missatge del canvi"
-
-6
+7
-msgid "log entry"
-msgstr "entrada del registre"
-
-7
+8
-msgid "log entries"
-msgstr "entrades del registre"
@@ -470 +470 @@
-
-#: contrib/admin/templates/admin/login.html:25
-4
+5
-msgid "Log in"
-msgstr "Iniciar sessió"
@@ -770 +770 @@
-msgstr "Modificar:"
-
-4
+7
-msgid "All dates"
-msgstr "Totes les dates"
-
-4
+7
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "El/la %(name)s \"%(obj)s\".ha estat agregat/da amb Úxit."
-
-68
-4
+71
+6
-msgid "You may edit it again below."
-msgstr "Pot editar-lo de nou abaix."
@@ -797 +797 @@
-msgstr "Canviar clau: %s"
-
-0
+1
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
@@ -805 +805 @@
-"compte que tots dos camps son sensibles a majúscules i minúscules."
-
-2
+3
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
@@ -813 +813 @@
-"preocupi, el seu enviament està emmagatzemat."
-
-69
+70
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
@@ -822 +822 @@
-"pà gina i provi-ho de nou. "
-
-3
+4
-msgid "Usernames cannot contain the '@' character."
-msgstr "Els noms d'usuari no poden contenir el caracter '@'."
-
-5
+6
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
@@ -832 +832 @@
-"La seva adreça de correu no és el seu nom d'usuari. Provi '%s' en tot cas."
-
-7 contrib/admin/views/doc.py:49
-1
+8 contrib/admin/views/doc.py:50
+2
-msgid "tag:"
-msgstr "etiqueta:"
-
-8 contrib/admin/views/doc.py:80
-2
+9 contrib/admin/views/doc.py:81
+3
-msgid "filter:"
-msgstr "filtre:"
-
-6 contrib/admin/views/doc.py:138
-0
+7 contrib/admin/views/doc.py:139
+1
-msgid "view:"
-msgstr "vista:"
-
-5
+6
-#, python-format
-msgid "App %r not found"
-msgstr "La aplicació %r no s'ha pogut trobar"
-
-2
+3
-#, python-format
-msgid "Model %(name)r not found in app %(label)r"
-msgstr "El model %(name)r no s'ha trobat en la aplicació %(label)r"
-
-4
+5
-#, python-format
-msgid "the related `%(label)s.%(type)s` object"
-msgstr "el objecte relacionat `%(label)s.%(type)s`"
-
-4 contrib/admin/views/doc.py:206
-0 contrib/admin/views/doc.py:225
+5 contrib/admin/views/doc.py:207
+1 contrib/admin/views/doc.py:226
-msgid "model:"
-msgstr "model:"
-
-5
+6
-#, python-format
-msgid "related `%(label)s.%(name)s` objects"
-msgstr "objectes relacionats `%(label)s.%(name)s`"
-
-0
+1
-#, python-format
-msgid "all %s"
-msgstr "tots %s"
-
-5
+6
-#, python-format
-msgid "number of %s"
-msgstr "nombre de %s"
-
-0
+1
-#, python-format
-msgid "Fields on %s objects"
-msgstr "Camps en objectes %s"
-
-2 contrib/admin/views/doc.py:303
-5 contrib/admin/views/doc.py:311
-2 contrib/admin/views/doc.py:314
+3 contrib/admin/views/doc.py:304
+6 contrib/admin/views/doc.py:312
+3 contrib/admin/views/doc.py:315
-msgid "Integer"
-msgstr "Enter"
-
-3
+4
-msgid "Boolean (Either True or False)"
-msgstr "Booleà (Verdader o Fals)"
-
-4 contrib/admin/views/doc.py:313
+5 contrib/admin/views/doc.py:314
-#, python-format
-msgid "String (up to %(max_length)s)"
-msgstr "Cadena (de fins a %(max_length)s)"
-
-5
+6
-msgid "Comma-separated integers"
-msgstr "Enters separats per comes"
-
-6
+7
-msgid "Date (without time)"
-msgstr "Data (sense hora)"
-
-7
+8
-msgid "Date (with time)"
-msgstr "Data (amb hora)"
-
-8
+9
-msgid "Decimal number"
-msgstr "Número decimal"
-
-299
+300
-msgid "E-mail address"
-msgstr "Adreça de correu electrònic"
-
-0 contrib/admin/views/doc.py:301
-4
+1 contrib/admin/views/doc.py:302
+5
-msgid "File path"
-msgstr "Ruta del fitxer"
-
-2
+3
-msgid "Floating point number"
-msgstr "Número amb punt de coma flotant"
-
-6
+7
-msgid "IP address"
-msgstr "Adreça IP"
-
-8
+9
-msgid "Boolean (Either True, False or None)"
-msgstr "Booleà (Verdader, Fals o 'None' (cap))"
-
-09
+10
-msgid "Relation to parent model"
-msgstr "Relació amb el model pare"
-
-0
+1
-msgid "Phone number"
-msgstr "Número de telÚfon"
-
-5
+6
-msgid "Text"
-msgstr "Texte"
-
-6
+7
-msgid "Time"
-msgstr "Hora"
-
-7
+8
-msgid "URL"
-msgstr "URL"
-
-8
+9
-msgid "U.S. state (two uppercase letters)"
-msgstr "Estat dels E.U.A. (dos lletres majúscules)"
-
-19
+20
-msgid "XML text"
-msgstr "Texte XML"
-
-5
+6
-#, python-format
-msgid "%s does not appear to be a urlpattern object"
-msgstr "%s no sembla ser un objecte 'urlpattern'"
-
-0
+3
-msgid "Site administration"
-msgstr "Lloc administratiu"
-
-78 contrib/admin/views/main.py:363
+80 contrib/admin/views/main.py:365
-#, python-format
-msgid "You may add another %s below."
-msgstr "Pot afegir un altre %s a baix."
-
-6
+8
-#, python-format
-msgid "Add %s"
-msgstr "Afegir %s"
-
-2
+4
-#, python-format
-msgid "Added %s."
-msgstr "Agregat %s."
-
-2 contrib/admin/views/main.py:344
-6
+4 contrib/admin/views/main.py:346
+8
-#: db/models/manipulators.py:309
-msgid "and"
-msgstr "i"
-
-4
+6
-#, python-format
-msgid "Changed %s."
-msgstr "Modificat %s."
-
-6
+8
-#, python-format
-msgid "Deleted %s."
-msgstr "Eliminat %s."
-
-49
+51
-msgid "No fields changed."
-msgstr "Cap camp canviat."
-
-2
+4
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was changed successfully."
-msgstr "S'ha modificat amb Úxist el/la %(name)s \"%(obj)s."
-
-0
+2
-#, python-format
-msgid ""
@@ -1023 +1023 @@
-"S'ha agregat amb Úxit el/la %(name)s \"%(obj)s\". Pot editar-lo de nou abaix."
-
-398
+400
-#, python-format
-msgid "Change %s"
-msgstr "Modificar %s"
-
-3
+7
-#, 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"
-
-88
+92
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Un o més %(fieldname)s en %(name)s:"
-
-0
+4
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was deleted successfully."
-msgstr "El/la %(name)s \"%(obj)s\".ha estat eliminat amb Úxit."
-
-3
+7
-msgid "Are you sure?"
-msgstr "Està segur?"
-
-5
+9
-#, python-format
-msgid "Change history: %s"
-msgstr "Modificar històric: %s"
-
-79
+83
-#, python-format
-msgid "Select %s"
-msgstr "Seleccioni %s"
-
-79
+83
-#, python-format
-msgid "Select %s to change"
-msgstr "Seleccioni %s per modificar"
-
-0
+4
-msgid "Database error"
-msgstr "Error de/en la base de dades"
@@ -1623 +1623 @@
-msgstr "r"
-
-0
+2
-#, python-format
-msgid "%(value).1f million"
@@ -1630 +1630 @@
-msgstr[1] "%(value).1f  milions"
-
-3
+5
-#, python-format
-msgid "%(value).1f billion"
@@ -1637 +1637 @@
-msgstr[1] "%(value).1f bilions"
-
-6
+8
-#, python-format
-msgid "%(value).1f trillion"
@@ -1644 +1644 @@
-msgstr[1] "%(value).1f trilions"
-
-1
+4
-msgid "one"
-msgstr "un"
-
-1
+4
-msgid "two"
-msgstr "dos"
-
-1
+4
-msgid "three"
-msgstr "tres"
-
-1
+4
-msgid "four"
-msgstr "cuatre"
-
-1
+4
-msgid "five"
-msgstr "cinc"
-
-1
+4
-msgid "six"
-msgstr "sis"
-
-1
+4
-msgid "seven"
-msgstr "set"
-
-1
+4
-msgid "eight"
-msgstr "vuit"
-
-1
+4
-msgid "nine"
-msgstr "nou"
-
-0
+4
-msgid "today"
-msgstr "avui"
-
-2
+6