1
0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00

[soc2009/multidb] Merged up to trunk r11785.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2009-12-03 06:28:26 +00:00
parent 0ca0ed0453
commit fdadb7bf18
14 changed files with 624 additions and 957 deletions

View File

@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-07 15:04+0200\n"
"POT-Creation-Date: 2009-11-30 11:19+0100\n"
"PO-Revision-Date: 2009-03-24 13:28+0100\n"
"Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n"
"Language-Team: Catalan <ca@li.org>\n"
@ -223,7 +223,7 @@ msgstr "xinès tradicional"
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Eliminat/s %(count)d %(items)s satisfactòriament."
#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
#: contrib/admin/actions.py:67 contrib/admin/options.py:1033
msgid "Are you sure?"
msgstr "Esteu segurs?"
@ -266,15 +266,15 @@ msgstr "Aquest mes"
msgid "This year"
msgstr "Aquest any"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
msgid "Yes"
msgstr "Si"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
msgid "No"
msgstr "No"
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
#: contrib/admin/filterspecs.py:154 forms/widgets.py:435
msgid "Unknown"
msgstr "Desconegut"
@ -310,61 +310,61 @@ msgstr "entrada del registre"
msgid "log entries"
msgstr "entrades del registre"
#: contrib/admin/options.py:133 contrib/admin/options.py:147
#: contrib/admin/options.py:134 contrib/admin/options.py:148
msgid "None"
msgstr "cap"
#: contrib/admin/options.py:519
#: contrib/admin/options.py:521
#, python-format
msgid "Changed %s."
msgstr "Modificat %s."
#: contrib/admin/options.py:519 contrib/admin/options.py:529
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
#: forms/models.py:600
#: contrib/admin/options.py:521 contrib/admin/options.py:531
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:384
#: forms/models.py:596
msgid "and"
msgstr "i"
#: contrib/admin/options.py:524
#: contrib/admin/options.py:526
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "Afegit %(name)s \"%(object)s\""
#: contrib/admin/options.py:528
#: contrib/admin/options.py:530
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "Modificat %(list)s per a %(name)s \"%(object)s\"."
#: contrib/admin/options.py:533
#: contrib/admin/options.py:535
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "Eliminat %(name)s \"%(object)s\"."
#: contrib/admin/options.py:537
#: contrib/admin/options.py:539
msgid "No fields changed."
msgstr "Cap camp canviat."
#: contrib/admin/options.py:598 contrib/auth/admin.py:67
#: contrib/admin/options.py:601 contrib/auth/admin.py:67
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "El/la %(name)s \"%(obj)s\".ha estat afegit/da amb èxit."
#: contrib/admin/options.py:602 contrib/admin/options.py:635
#: contrib/admin/options.py:605 contrib/admin/options.py:638
#: contrib/auth/admin.py:75
msgid "You may edit it again below."
msgstr "Podeu editar-lo de nou a baix."
#: contrib/admin/options.py:612 contrib/admin/options.py:645
#: contrib/admin/options.py:615 contrib/admin/options.py:648
#, python-format
msgid "You may add another %s below."
msgstr "Podeu afegir un altre %s a baix."
#: contrib/admin/options.py:633
#: contrib/admin/options.py:636
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "S'ha modificat amb èxit el/la %(name)s \"%(obj)s."
#: contrib/admin/options.py:641
#: contrib/admin/options.py:644
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
@ -372,43 +372,43 @@ msgstr ""
"S'ha afegit exitosament el/la %(name)s \"%(obj)s\". Pot editar-lo de nou "
"abaix."
#: contrib/admin/options.py:772
#: contrib/admin/options.py:777
#, python-format
msgid "Add %s"
msgstr "Afegir %s"
#: contrib/admin/options.py:803 contrib/admin/options.py:1003
#: contrib/admin/options.py:809 contrib/admin/options.py:1011
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "No existèix cap objecte %(name)s amb la clau primària %(key)r."
#: contrib/admin/options.py:860
#: contrib/admin/options.py:866
#, python-format
msgid "Change %s"
msgstr "Modificar %s"
#: contrib/admin/options.py:904
#: contrib/admin/options.py:910
msgid "Database error"
msgstr "Error de base de dades"
#: contrib/admin/options.py:940
#: contrib/admin/options.py:946
#, python-format
msgid "%(count)s %(name)s was changed successfully."
msgid_plural "%(count)s %(name)s were changed successfully."
msgstr[0] "%(count)s %(name)s s'ha modificat amb èxit."
msgstr[1] "%(count)s %(name)s s'han modificat amb èxit."
#: contrib/admin/options.py:1018
#: contrib/admin/options.py:1026
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "El/la %(name)s \"%(obj)s\" ha estat eliminat amb èxit."
#: contrib/admin/options.py:1054
#: contrib/admin/options.py:1063
#, python-format
msgid "Change history: %s"
msgstr "Modificar històric: %s"
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
#: contrib/admin/sites.py:22 contrib/admin/views/decorators.py:14
#: contrib/auth/forms.py:80
msgid ""
"Please enter a correct username and password. Note that both fields are case-"
@ -417,11 +417,11 @@ msgstr ""
"Si us plau, introduïu un nom d'usuari i contrasenya vàlids. Tingueu en "
"compte que tots dos camps son sensibles a majúscules i minúscules."
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "Si us plau, identifiqueu-vos de nou doncs la vostra sessió ha expirat."
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
#: contrib/admin/sites.py:299 contrib/admin/views/decorators.py:47
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@ -430,29 +430,29 @@ msgstr ""
"'cookies' (galetes). Si us plau, habiliteu les 'cookies', recarregueu "
"aquesta pàgina i proveu-ho de nou. "
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
#: contrib/admin/sites.py:315 contrib/admin/sites.py:321
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Els noms d'usuari no poden contenir el caracter '@'."
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
#: contrib/admin/sites.py:318 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
"La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en tot "
"cas."
#: contrib/admin/sites.py:360
#: contrib/admin/sites.py:374
msgid "Site administration"
msgstr "Lloc administratiu"
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
#: contrib/admin/sites.py:388 contrib/admin/templates/admin/login.html:26
#: contrib/admin/templates/registration/password_reset_complete.html:14
#: contrib/admin/views/decorators.py:20
msgid "Log in"
msgstr "Iniciar sessió"
#: contrib/admin/sites.py:417
#: contrib/admin/sites.py:433
#, python-format
msgid "%s administration"
msgstr "Administració de %s"
@ -467,27 +467,27 @@ msgstr "Un o més %(fieldname)s en %(name)s: %(obj)s"
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Un o més %(fieldname)s en %(name)s:"
#: contrib/admin/widgets.py:71
#: contrib/admin/widgets.py:72
msgid "Date:"
msgstr "Data:"
#: contrib/admin/widgets.py:71
#: contrib/admin/widgets.py:72
msgid "Time:"
msgstr "Hora:"
#: contrib/admin/widgets.py:95
#: contrib/admin/widgets.py:96
msgid "Currently:"
msgstr "Actualment:"
#: contrib/admin/widgets.py:95
#: contrib/admin/widgets.py:96
msgid "Change:"
msgstr "Modificar:"
#: contrib/admin/widgets.py:124
#: contrib/admin/widgets.py:125
msgid "Lookup"
msgstr "Cercar"
#: contrib/admin/widgets.py:236
#: contrib/admin/widgets.py:237
msgid "Add Another"
msgstr "Afegir un altre"
@ -502,7 +502,7 @@ msgstr "Ho sentim, però no s'ha pogut trobar la pàgina sol·licitada"
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/app_index.html:8
#: contrib/admin/templates/admin/base.html:31
#: contrib/admin/templates/admin/base.html:54
#: contrib/admin/templates/admin/change_form.html:17
#: contrib/admin/templates/admin/change_list.html:25
#: contrib/admin/templates/admin/delete_confirmation.html:6
@ -555,18 +555,18 @@ msgstr "Anar"
msgid "%(name)s"
msgstr "%(name)s"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:27
msgid "Welcome,"
msgstr "Benvingut/da,"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:32
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "Documentació"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:40
#: contrib/admin/templates/admin/auth/user/change_password.html:14
#: contrib/admin/templates/admin/auth/user/change_password.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
@ -574,7 +574,7 @@ msgstr "Documentació"
msgid "Change password"
msgstr "Canviar contrasenya"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
@ -600,7 +600,7 @@ msgstr "Històric"
#: contrib/admin/templates/admin/change_form.html:28
#: contrib/admin/templates/admin/edit_inline/stacked.html:13
#: contrib/admin/templates/admin/edit_inline/tabular.html:27
#: contrib/admin/templates/admin/edit_inline/tabular.html:28
msgid "View on site"
msgstr "Veure al lloc"
@ -670,9 +670,9 @@ msgstr ""
#, python-format
msgid ""
"Are you sure you want to delete the selected %(object_name)s objects? All of "
"the following objects and it's related items will be deleted:"
"the following objects and their related items will be deleted:"
msgstr ""
"Esteu segurs de voler esborrar els/les %(object_name)s seleccionats?Tots "
"Esteu segurs de voler esborrar els/les %(object_name)s seleccionats? Tots "
"aquests objectes i els seus elements relacionats s'esborraran:"
#: contrib/admin/templates/admin/filter.html:2
@ -736,7 +736,6 @@ msgid "User"
msgstr "Usuari"
#: contrib/admin/templates/admin/object_history.html:24
#: contrib/comments/templates/comments/moderation_queue.html:33
msgid "Action"
msgstr "Acció"
@ -985,7 +984,7 @@ msgstr "Adreça de correu electrònic:"
msgid "Reset my password"
msgstr "Restablir la meva contrasenya"
#: contrib/admin/templatetags/admin_list.py:299
#: contrib/admin/templatetags/admin_list.py:304
msgid "All dates"
msgstr "Totes les dates"
@ -1007,145 +1006,144 @@ msgstr "lloc"
msgid "template"
msgstr "plantilla"
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
#: contrib/admindocs/views.py:62
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
#: contrib/admindocs/views.py:65
msgid "tag:"
msgstr "etiqueta:"
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
#: contrib/admindocs/views.py:95
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
#: contrib/admindocs/views.py:98
msgid "filter:"
msgstr "filtre:"
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
#: contrib/admindocs/views.py:159
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
#: contrib/admindocs/views.py:162
msgid "view:"
msgstr "vista:"
#: contrib/admindocs/views.py:187
#: contrib/admindocs/views.py:190
#, python-format
msgid "App %r not found"
msgstr "No s'ha pogut trobar l'aplicació %r"
#: contrib/admindocs/views.py:194
#: contrib/admindocs/views.py:197
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr "El model %(model_name)r no s'ha trobat en l'aplicació %(app_label)r"
#: contrib/admindocs/views.py:206
#: contrib/admindocs/views.py:209
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "l'objecte relacionat `%(app_label)s.%(data_type)s`"
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:225
#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:244
#: contrib/admindocs/views.py:258 contrib/admindocs/views.py:263
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
msgid "model:"
msgstr "model:"
#: contrib/admindocs/views.py:221 contrib/admindocs/views.py:253
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr "objectes relacionats `%(app_label)s.%(object_name)s`"
#: contrib/admindocs/views.py:225 contrib/admindocs/views.py:258
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
#, python-format
msgid "all %s"
msgstr "tots %s"
#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:263
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
#, python-format
msgid "number of %s"
msgstr "nombre de %s"
#: contrib/admindocs/views.py:268
#: contrib/admindocs/views.py:271
#, python-format
msgid "Fields on %s objects"
msgstr "Camps en objectes %s"
#: contrib/admindocs/views.py:331 contrib/admindocs/views.py:342
#: contrib/admindocs/views.py:344 contrib/admindocs/views.py:350
#: contrib/admindocs/views.py:351 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
msgid "Integer"
msgstr "Enter"
#: contrib/admindocs/views.py:332
#: contrib/admindocs/views.py:335
msgid "Boolean (Either True or False)"
msgstr "Booleà (Verdader o Fals)"
#: contrib/admindocs/views.py:333 contrib/admindocs/views.py:352
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (de fins a %(max_length)s)"
#: contrib/admindocs/views.py:334
#: contrib/admindocs/views.py:337
msgid "Comma-separated integers"
msgstr "Enters separats per comes"
#: contrib/admindocs/views.py:335
#: contrib/admindocs/views.py:338
msgid "Date (without time)"
msgstr "Data (sense hora)"
#: contrib/admindocs/views.py:336
#: contrib/admindocs/views.py:339
msgid "Date (with time)"
msgstr "Data (amb hora)"
#: contrib/admindocs/views.py:337
#: contrib/admindocs/views.py:340
msgid "Decimal number"
msgstr "Número decimal"
#: contrib/admindocs/views.py:338
#: contrib/admindocs/views.py:341
msgid "E-mail address"
msgstr "Adreça de correu electrònic"
#: contrib/admindocs/views.py:339 contrib/admindocs/views.py:340
#: contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:346
msgid "File path"
msgstr "Ruta del fitxer"
#: contrib/admindocs/views.py:341
#: contrib/admindocs/views.py:344
msgid "Floating point number"
msgstr "Número amb punt de coma flotant"
#: contrib/admindocs/views.py:345 contrib/comments/models.py:60
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
msgid "IP address"
msgstr "Adreça IP"
#: contrib/admindocs/views.py:347
#: contrib/admindocs/views.py:350
msgid "Boolean (Either True, False or None)"
msgstr "Booleà (Verdader, Fals o 'None' (cap))"
#: contrib/admindocs/views.py:348
#: contrib/admindocs/views.py:351
msgid "Relation to parent model"
msgstr "Relació amb el model pare"
#: contrib/admindocs/views.py:349
#: contrib/admindocs/views.py:352
msgid "Phone number"
msgstr "Número de telèfon"
#: contrib/admindocs/views.py:354
#: contrib/admindocs/views.py:357
msgid "Text"
msgstr "Text"
#: contrib/admindocs/views.py:355
#: contrib/admindocs/views.py:358
msgid "Time"
msgstr "Hora"
#: contrib/admindocs/views.py:356 contrib/comments/forms.py:95
#: contrib/comments/templates/comments/moderation_queue.html:37
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
#: contrib/admindocs/views.py:357
#: contrib/admindocs/views.py:360
msgid "U.S. state (two uppercase letters)"
msgstr "Estat dels E.U.A. (dues lletres majúscules)"
#: contrib/admindocs/views.py:358
#: contrib/admindocs/views.py:361
msgid "XML text"
msgstr "Text XML"
#: contrib/admindocs/views.py:384
#: contrib/admindocs/views.py:387
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s no sembla ser un objecte 'urlpattern'"
@ -1438,22 +1436,54 @@ msgstr "usuaris"
msgid "message"
msgstr "missatge"
#: contrib/auth/views.py:56
#: contrib/auth/views.py:60
msgid "Logged out"
msgstr "Sessió finalitzada"
#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429
#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428
msgid "Enter a valid e-mail address."
msgstr "Introduïu una adreça de correu vàlida."
#: contrib/comments/admin.py:11
#: contrib/comments/admin.py:12
msgid "Content"
msgstr "contingut"
#: contrib/comments/admin.py:14
#: contrib/comments/admin.py:15
msgid "Metadata"
msgstr "metadades"
# Context problem... waitting for comments from django-i18n
#: contrib/comments/admin.py:39
msgid "flagged"
msgstr "marcat"
#: contrib/comments/admin.py:40
msgid "Flag selected comments"
msgstr "Marcar els comentaris seleccionats"
#: contrib/comments/admin.py:43
msgid "approved"
msgstr "aprovat"
#: contrib/comments/admin.py:44
msgid "Approve selected comments"
msgstr "Aprovar els comentaris seleccionats"
#: contrib/comments/admin.py:47
msgid "removed"
msgstr "eliminat"
#: contrib/comments/admin.py:48
msgid "Remove selected comments"
msgstr "Eliminar els comentaris seleccionats"
#: contrib/comments/admin.py:60
#, python-format
msgid "1 comment was successfully %(action)s."
msgid_plural "%(count)s comments were successfully %(action)s."
msgstr[0] "1 comentari ha estat %(action)s satisfactòriament."
msgstr[1] "%(count)s comentaris han estat %(action)s satisfactòriament."
#: contrib/comments/feeds.py:13
#, python-format
msgid "%(site_name)s comments"
@ -1465,7 +1495,6 @@ msgid "Latest comments on %(site_name)s"
msgstr "Últims comentaris a %(site_name)s."
#: contrib/comments/forms.py:93
#: contrib/comments/templates/comments/moderation_queue.html:34
msgid "Name"
msgstr "nom"
@ -1474,7 +1503,6 @@ msgid "Email address"
msgstr "Adreça de correu electrònic"
#: contrib/comments/forms.py:96
#: contrib/comments/templates/comments/moderation_queue.html:35
msgid "Comment"
msgstr "Comentari"
@ -1606,7 +1634,6 @@ msgid "Really make this comment public?"
msgstr "Realment vol fer aquest comentari públic?"
#: contrib/comments/templates/comments/approve.html:12
#: contrib/comments/templates/comments/moderation_queue.html:49
msgid "Approve"
msgstr "Aprovar"
@ -1631,7 +1658,6 @@ msgid "Really remove this comment?"
msgstr "Realment vol eliminar aquest comentari?"
#: contrib/comments/templates/comments/delete.html:12
#: contrib/comments/templates/comments/moderation_queue.html:53
msgid "Remove"
msgstr "Eliminar"
@ -1666,39 +1692,6 @@ msgstr "Publicar"
msgid "Preview"
msgstr "Vista prèvia"
#: contrib/comments/templates/comments/moderation_queue.html:4
#: contrib/comments/templates/comments/moderation_queue.html:19
msgid "Comment moderation queue"
msgstr "Cua de moderació de comentaris"
#: contrib/comments/templates/comments/moderation_queue.html:26
msgid "No comments to moderate"
msgstr "No hi ha comentaris per a moderar"
#: contrib/comments/templates/comments/moderation_queue.html:36
msgid "Email"
msgstr "Correu electrònic"
#: contrib/comments/templates/comments/moderation_queue.html:38
msgid "Authenticated?"
msgstr "Autentificat?"
#: contrib/comments/templates/comments/moderation_queue.html:39
msgid "IP Address"
msgstr "Adreça IP"
#: contrib/comments/templates/comments/moderation_queue.html:40
msgid "Date posted"
msgstr "Data d'enviament"
#: contrib/comments/templates/comments/moderation_queue.html:63
msgid "yes"
msgstr "si"
#: contrib/comments/templates/comments/moderation_queue.html:63
msgid "no"
msgstr "no"
#: contrib/comments/templates/comments/posted.html:4
msgid "Thanks for commenting"
msgstr "Gràcies per comentar"
@ -1793,7 +1786,7 @@ msgstr "pàgina estàtica"
msgid "flat pages"
msgstr "pàgines estàtiques"
#: contrib/formtools/wizard.py:130
#: contrib/formtools/wizard.py:132
msgid ""
"We apologize, but your form has expired. Please continue filling out the "
"form from this page."
@ -2615,6 +2608,10 @@ msgstr "Validació invàlida del número de compte bancari."
msgid "Enter a valid Finnish social security number."
msgstr "Introduïu un número vàlid de la seguretat social finlandesa."
#: contrib/localflavor/fr/forms.py:30
msgid "Phone numbers must be in 0X XX XX XX XX format."
msgstr "Els números de telèfon han de estar en el format 0X XX XX XX XX."
#: contrib/localflavor/in_/forms.py:14
msgid "Enter a zip code in the format XXXXXXX."
msgstr "Introduïu un codi zip en el format XXXXXXX."
@ -3053,7 +3050,8 @@ msgstr "Validació invàlida del número tributari (NIP)."
#: contrib/localflavor/pl/forms.py:109
msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
msgstr ""
"El número nacional de registre de negocis (REGON) consisteix en 9 o 14 dígits."
"El número nacional de registre de negocis (REGON) consisteix en 9 o 14 "
"dígits."
#: contrib/localflavor/pl/forms.py:110
msgid "Wrong checksum for the National Business Register Number (REGON)."
@ -3943,14 +3941,14 @@ msgstr "Aquest valor ha de ser None (Cap), True (Veritat) o False (Fals)"
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Introduïu una hora vàlida en el format HH:MM[:ss[.uuuuuu]]."
#: db/models/fields/related.py:816
#: db/models/fields/related.py:869
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Premeu la tecla \"Control\" -o \"Command\" en un Mac- per seleccionar més "
"d'un valor."
#: db/models/fields/related.py:894
#: db/models/fields/related.py:930
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@ -3962,95 +3960,95 @@ msgstr[1] ""
"Si us plau, introduïu IDs de %(self)s vàlids. Els valors %(value)r són "
"invàlids."
#: forms/fields.py:54
#: forms/fields.py:53
msgid "This field is required."
msgstr "Aquest camp és obligatori."
#: forms/fields.py:55
#: forms/fields.py:54
msgid "Enter a valid value."
msgstr "Introduïu un valor vàlid."
#: forms/fields.py:138
#: forms/fields.py:137
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Assegureu-vos de que el valor té com a màxim %(max)d caràcters (en té %"
"(length)d)."
#: forms/fields.py:139
#: forms/fields.py:138
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
"Assegureu-vos de que el valor té com a mínim %(min)d caràcters (en té %"
"(length)d)."
#: forms/fields.py:166
#: forms/fields.py:165
msgid "Enter a whole number."
msgstr "Introduïu un número sencer."
#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225
#: forms/fields.py:166 forms/fields.py:195 forms/fields.py:224
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "Aquest valor ha de ser menor o igual a %s."
#: forms/fields.py:168 forms/fields.py:197 forms/fields.py:226
#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "Assegureu-vos de que aquest valor sigui superior o igual a %s."
#: forms/fields.py:195 forms/fields.py:224
#: forms/fields.py:194 forms/fields.py:223
msgid "Enter a number."
msgstr "Introduïu un número."
#: forms/fields.py:227
#: forms/fields.py:226
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Assegureu-vos de que no hi ha més de %s dígits en total."
#: forms/fields.py:228
#: forms/fields.py:227
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Assegureu-vos de que no hi ha més de %s decimals."
#: forms/fields.py:229
#: forms/fields.py:228
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Assegureu-vos de que no hi ha més de %s dígits decimals."
#: forms/fields.py:288 forms/fields.py:863
#: forms/fields.py:287 forms/fields.py:862
msgid "Enter a valid date."
msgstr "Introduïu una data vàlida."
#: forms/fields.py:322 forms/fields.py:864
#: forms/fields.py:321 forms/fields.py:863
msgid "Enter a valid time."
msgstr "Introduïu una hora vàlida."
#: forms/fields.py:361
#: forms/fields.py:360
msgid "Enter a valid date/time."
msgstr "Introduïu una data/hora vàlides."
#: forms/fields.py:447
#: forms/fields.py:446
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"No s'ha enviat cap fitxer. Comprovi el tipus de codificació del formulari."
#: forms/fields.py:448
#: forms/fields.py:447
msgid "No file was submitted."
msgstr "No s'ha enviat cap fitxer."
#: forms/fields.py:449
#: forms/fields.py:448
msgid "The submitted file is empty."
msgstr "El fitxer enviat està buit."
#: forms/fields.py:450
#: forms/fields.py:449
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Assegureu-vos de que el valor té com a màxim %(max)d caràcters "
"(en té %(length)d)."
"Assegureu-vos de que el valor té com a màxim %(max)d caràcters (en té %"
"(length)d)."
#: forms/fields.py:483
#: forms/fields.py:482
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@ -4058,28 +4056,28 @@ msgstr ""
"Envieu una imatge vàlida. El fitxer que heu enviat no era una imatge o "
"estava corrupte."
#: forms/fields.py:544
#: forms/fields.py:543
msgid "Enter a valid URL."
msgstr "Introduïu una URL vàlida."
#: forms/fields.py:545
#: forms/fields.py:544
msgid "This URL appears to be a broken link."
msgstr "Aquesta URL sembla ser un enllaç trencat."
#: forms/fields.py:625 forms/fields.py:703
#: forms/fields.py:624 forms/fields.py:702
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Esculliu una opció vàlida. %(value)s no és una de les opcions vàlides."
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:999
msgid "Enter a list of values."
msgstr "Introduïu una llista de valors."
#: forms/fields.py:892
#: forms/fields.py:891
msgid "Enter a valid IPv4 address."
msgstr "Introduïu una adreça IPv4 vàlida."
#: forms/fields.py:902
#: forms/fields.py:901
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
@ -4090,56 +4088,58 @@ msgstr ""
msgid "Order"
msgstr "Ordre"
#: forms/models.py:367
#: forms/models.py:363
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "El camp %(field_name)s ha de ser únic per a %(lookup)s %(date_field)s."
#: forms/models.py:381 forms/models.py:389
#: forms/models.py:377 forms/models.py:385
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Ja existeix %(model_name)s amb aquest %(field_label)s."
#: forms/models.py:594
#: forms/models.py:590
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Si us plau, corregiu la dada duplicada per a %(field)s."
#: forms/models.py:598
#: forms/models.py:594
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Si us plau, corregiu la dada duplicada per a %(field)s, la qual ha de ser única."
msgstr ""
"Si us plau, corregiu la dada duplicada per a %(field)s, la qual ha de ser "
"única."
#: forms/models.py:604
#: forms/models.py:600
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
"Si us plau, corregiu la dada duplicada per a %(field_name)s, "
"la qual ha de ser única per a la cerca %(lookup)s en %(date_field)s."
"Si us plau, corregiu la dada duplicada per a %(field_name)s, la qual ha de "
"ser única per a la cerca %(lookup)s en %(date_field)s."
#: forms/models.py:612
#: forms/models.py:608
msgid "Please correct the duplicate values below."
msgstr "Si us plau, corregiu els valors duplicats a baix."
#: forms/models.py:867
#: forms/models.py:863
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La clau forànea en línea no coincideix amb la clau primària de la instància "
"del pare"
#: forms/models.py:930
#: forms/models.py:926
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Escolli una opció vàlida; Aquesta opció no és una de les opcions disponibles."
#: forms/models.py:1004
#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Escolliu una opció vàlida; %s' no és una de les opcions vàlides."
#: forms/models.py:1006
#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" no és un valor vàlid per a una clau primària."
@ -4459,6 +4459,30 @@ msgstr "El/la %(verbose_name)s s'ha actualtzat amb èxit."
msgid "The %(verbose_name)s was deleted."
msgstr "El %(verbose_name)s s'ha eliminat."
#~ msgid "Comment moderation queue"
#~ msgstr "Cua de moderació de comentaris"
#~ msgid "No comments to moderate"
#~ msgstr "No hi ha comentaris per a moderar"
#~ msgid "Email"
#~ msgstr "Correu electrònic"
#~ msgid "Authenticated?"
#~ msgstr "Autentificat?"
#~ msgid "IP Address"
#~ msgstr "Adreça IP"
#~ msgid "Date posted"
#~ msgstr "Data d'enviament"
#~ msgid "yes"
#~ msgstr "si"
#~ msgid "no"
#~ msgstr "no"
#, fuzzy
#~ msgid "verbose_name"
#~ msgid_plural "verbose_name_plural"

View File

@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-07-07 15:15+0200\n"
"PO-Revision-Date: 2009-07-07 15:22+0200\n"
"POT-Creation-Date: 2009-11-30 11:27+0100\n"
"PO-Revision-Date: 2009-11-30 11:31+0100\n"
"Last-Translator: Django Spanish Team <django-cat@googlegroups.com>Language-"
"Team: Django Spanish Team <django-cat@googlegroups.com>MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@ -222,7 +222,7 @@ msgstr "chino tradicional"
msgid "Successfully deleted %(count)d %(items)s."
msgstr "Eliminado/s %(count)d %(items)s satisfactoriamente."
#: contrib/admin/actions.py:67 contrib/admin/options.py:1025
#: contrib/admin/actions.py:67 contrib/admin/options.py:1033
msgid "Are you sure?"
msgstr "¿Está seguro?"
@ -265,15 +265,15 @@ msgstr "Este mes"
msgid "This year"
msgstr "Este año"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
msgid "Yes"
msgstr "Sí"
#: contrib/admin/filterspecs.py:147 forms/widgets.py:434
#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
msgid "No"
msgstr "No"
#: contrib/admin/filterspecs.py:154 forms/widgets.py:434
#: contrib/admin/filterspecs.py:154 forms/widgets.py:435
msgid "Unknown"
msgstr "Desconocido"
@ -309,104 +309,104 @@ msgstr "entrada de registro"
msgid "log entries"
msgstr "entradas de registro"
#: contrib/admin/options.py:133 contrib/admin/options.py:147
#: contrib/admin/options.py:134 contrib/admin/options.py:148
msgid "None"
msgstr "Ninguno"
#: contrib/admin/options.py:519
#: contrib/admin/options.py:521
#, python-format
msgid "Changed %s."
msgstr "Modificado/a %s."
#: contrib/admin/options.py:519 contrib/admin/options.py:529
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:388
#: forms/models.py:600
#: contrib/admin/options.py:521 contrib/admin/options.py:531
#: contrib/comments/templates/comments/preview.html:16 forms/models.py:384
#: forms/models.py:596
msgid "and"
msgstr "y"
#: contrib/admin/options.py:524
#: contrib/admin/options.py:526
#, python-format
msgid "Added %(name)s \"%(object)s\"."
msgstr "Añadido/a \"%(object)s\" %(name)s."
#: contrib/admin/options.py:528
#: contrib/admin/options.py:530
#, python-format
msgid "Changed %(list)s for %(name)s \"%(object)s\"."
msgstr "Modificados %(list)s para \"%(object)s\" %(name)s."
#: contrib/admin/options.py:533
#: contrib/admin/options.py:535
#, python-format
msgid "Deleted %(name)s \"%(object)s\"."
msgstr "Eliminado/a \"%(object)s\" %(name)s."
#: contrib/admin/options.py:537
#: contrib/admin/options.py:539
msgid "No fields changed."
msgstr "No ha cambiado ningún campo."
#: contrib/admin/options.py:598 contrib/auth/admin.py:67
#: contrib/admin/options.py:601 contrib/auth/admin.py:67
#, python-format
msgid "The %(name)s \"%(obj)s\" was added successfully."
msgstr "Se añadió con éxito el %(name)s \"%(obj)s\"."
#: contrib/admin/options.py:602 contrib/admin/options.py:635
#: contrib/admin/options.py:605 contrib/admin/options.py:638
#: contrib/auth/admin.py:75
msgid "You may edit it again below."
msgstr "Puede editarlo de nuevo abajo."
#: contrib/admin/options.py:612 contrib/admin/options.py:645
#: contrib/admin/options.py:615 contrib/admin/options.py:648
#, python-format
msgid "You may add another %s below."
msgstr "Puede añadir otro %s abajo."
#: contrib/admin/options.py:633
#: contrib/admin/options.py:636
#, python-format
msgid "The %(name)s \"%(obj)s\" was changed successfully."
msgstr "Se modificó con éxito el %(name)s \"%(obj)s\"."
#: contrib/admin/options.py:641
#: contrib/admin/options.py:644
#, python-format
msgid ""
"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
msgstr ""
"Se añadió con éxito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo."
#: contrib/admin/options.py:772
#: contrib/admin/options.py:777
#, python-format
msgid "Add %s"
msgstr "Añadir %s"
#: contrib/admin/options.py:803 contrib/admin/options.py:1003
#: contrib/admin/options.py:809 contrib/admin/options.py:1011
#, python-format
msgid "%(name)s object with primary key %(key)r does not exist."
msgstr "No existe ningún objeto %(name)s con la clave primaria %(key)r."
#: contrib/admin/options.py:860
#: contrib/admin/options.py:866
#, python-format
msgid "Change %s"
msgstr "Modificar %s"
#: contrib/admin/options.py:904
#: contrib/admin/options.py:910
msgid "Database error"
msgstr "Error en la base de datos"
#: contrib/admin/options.py:940
#: contrib/admin/options.py:946
#, python-format
msgid "%(count)s %(name)s was changed successfully."
msgid_plural "%(count)s %(name)s were changed successfully."
msgstr[0] "%(count)s %(name)s fué modificado con éxito."
msgstr[1] "%(count)s %(name)s fueron modificados con éxito."
#: contrib/admin/options.py:1018
#: contrib/admin/options.py:1026
#, python-format
msgid "The %(name)s \"%(obj)s\" was deleted successfully."
msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"."
#: contrib/admin/options.py:1054
#: contrib/admin/options.py:1063
#, python-format
msgid "Change history: %s"
msgstr "Histórico de modificaciones: %s"
#: contrib/admin/sites.py:20 contrib/admin/views/decorators.py:14
#: contrib/admin/sites.py:22 contrib/admin/views/decorators.py:14
#: contrib/auth/forms.py:80
msgid ""
"Please enter a correct username and password. Note that both fields are case-"
@ -415,11 +415,11 @@ msgstr ""
"Por favor, introduzca un nombre de usuario y contraseña correctos. Note que "
"ambos campos son sensibles a mayúsculas/minúsculas."
#: contrib/admin/sites.py:278 contrib/admin/views/decorators.py:40
#: contrib/admin/sites.py:292 contrib/admin/views/decorators.py:40
msgid "Please log in again, because your session has expired."
msgstr "Por favor, inicie sesión de nuevo, ya que su sesión ha caducado."
#: contrib/admin/sites.py:285 contrib/admin/views/decorators.py:47
#: contrib/admin/sites.py:299 contrib/admin/views/decorators.py:47
msgid ""
"Looks like your browser isn't configured to accept cookies. Please enable "
"cookies, reload this page, and try again."
@ -427,29 +427,29 @@ msgstr ""
"Parece que su navegador no está configurado para aceptar cookies. "
"Actívelas , recargue esta página, e inténtelo de nuevo."
#: contrib/admin/sites.py:301 contrib/admin/sites.py:307
#: contrib/admin/sites.py:315 contrib/admin/sites.py:321
#: contrib/admin/views/decorators.py:66
msgid "Usernames cannot contain the '@' character."
msgstr "Los nombres de usuario no pueden contener el carácter '@'."
#: contrib/admin/sites.py:304 contrib/admin/views/decorators.py:62
#: contrib/admin/sites.py:318 contrib/admin/views/decorators.py:62
#, python-format
msgid "Your e-mail address is not your username. Try '%s' instead."
msgstr ""
"Su dirección de correo no es su nombre de usuario. Pruebe con '%s' en su "
"lugar."
#: contrib/admin/sites.py:360
#: contrib/admin/sites.py:374
msgid "Site administration"
msgstr "Sitio administrativo"
#: contrib/admin/sites.py:373 contrib/admin/templates/admin/login.html:26
#: contrib/admin/sites.py:388 contrib/admin/templates/admin/login.html:26
#: contrib/admin/templates/registration/password_reset_complete.html:14
#: contrib/admin/views/decorators.py:20
msgid "Log in"
msgstr "Iniciar sesión"
#: contrib/admin/sites.py:417
#: contrib/admin/sites.py:433
#, python-format
msgid "%s administration"
msgstr "Administración de %s"
@ -464,27 +464,27 @@ msgstr "Uno o más %(fieldname)s en %(name)s: %(obj)s"
msgid "One or more %(fieldname)s in %(name)s:"
msgstr "Uno o más %(fieldname)s en %(name)s:"
#: contrib/admin/widgets.py:71
#: contrib/admin/widgets.py:72
msgid "Date:"
msgstr "Fecha:"
#: contrib/admin/widgets.py:71
#: contrib/admin/widgets.py:72
msgid "Time:"
msgstr "Hora:"
#: contrib/admin/widgets.py:95
#: contrib/admin/widgets.py:96
msgid "Currently:"
msgstr "Actualmente:"
#: contrib/admin/widgets.py:95
#: contrib/admin/widgets.py:96
msgid "Change:"
msgstr "Modificar:"
#: contrib/admin/widgets.py:124
#: contrib/admin/widgets.py:125
msgid "Lookup"
msgstr "Buscar"
#: contrib/admin/widgets.py:236
#: contrib/admin/widgets.py:237
msgid "Add Another"
msgstr "Añadir otro"
@ -499,7 +499,7 @@ msgstr "Lo sentimos, pero no se encuentra la página solicitada."
#: contrib/admin/templates/admin/500.html:4
#: contrib/admin/templates/admin/app_index.html:8
#: contrib/admin/templates/admin/base.html:31
#: contrib/admin/templates/admin/base.html:54
#: contrib/admin/templates/admin/change_form.html:17
#: contrib/admin/templates/admin/change_list.html:25
#: contrib/admin/templates/admin/delete_confirmation.html:6
@ -553,18 +553,18 @@ msgstr "Ir"
msgid "%(name)s"
msgstr "%(name)s"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:27
msgid "Welcome,"
msgstr "Bienvenido/a,"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:32
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
msgid "Documentation"
msgstr "Documentación"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:40
#: contrib/admin/templates/admin/auth/user/change_password.html:14
#: contrib/admin/templates/admin/auth/user/change_password.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
@ -572,7 +572,7 @@ msgstr "Documentación"
msgid "Change password"
msgstr "Cambiar contraseña"
#: contrib/admin/templates/admin/base.html:26
#: contrib/admin/templates/admin/base.html:47
#: contrib/admin/templates/registration/password_change_done.html:3
#: contrib/admin/templates/registration/password_change_form.html:3
msgid "Log out"
@ -598,7 +598,7 @@ msgstr "Histórico"
#: contrib/admin/templates/admin/change_form.html:28
#: contrib/admin/templates/admin/edit_inline/stacked.html:13
#: contrib/admin/templates/admin/edit_inline/tabular.html:27
#: contrib/admin/templates/admin/edit_inline/tabular.html:28
msgid "View on site"
msgstr "Ver en el sitio"
@ -668,9 +668,9 @@ msgstr ""
#, python-format
msgid ""
"Are you sure you want to delete the selected %(object_name)s objects? All of "
"the following objects and it's related items will be deleted:"
"the following objects and their related items will be deleted:"
msgstr ""
"¿Está seguro de que quiere borrar los %(object_name)s? Los siguientes "
"¿Está seguro de que quiere eliminar los %(object_name)s seleccionados? Los siguientes "
"objetos y sus elementos relacionados serán eliminados:"
#: contrib/admin/templates/admin/filter.html:2
@ -734,7 +734,6 @@ msgid "User"
msgstr "Usuario"
#: contrib/admin/templates/admin/object_history.html:24
#: contrib/comments/templates/comments/moderation_queue.html:33
msgid "Action"
msgstr "Acción"
@ -987,7 +986,7 @@ msgstr "Dirección de correo electrónico:"
msgid "Reset my password"
msgstr "Restablecer mi contraseña"
#: contrib/admin/templatetags/admin_list.py:299
#: contrib/admin/templatetags/admin_list.py:304
msgid "All dates"
msgstr "Todas las fechas"
@ -1009,146 +1008,145 @@ msgstr "sitio"
msgid "template"
msgstr "plantilla"
#: contrib/admindocs/views.py:58 contrib/admindocs/views.py:60
#: contrib/admindocs/views.py:62
#: contrib/admindocs/views.py:61 contrib/admindocs/views.py:63
#: contrib/admindocs/views.py:65
msgid "tag:"
msgstr "etiqueta:"
#: contrib/admindocs/views.py:91 contrib/admindocs/views.py:93
#: contrib/admindocs/views.py:95
#: contrib/admindocs/views.py:94 contrib/admindocs/views.py:96
#: contrib/admindocs/views.py:98
msgid "filter:"
msgstr "filtro:"
#: contrib/admindocs/views.py:155 contrib/admindocs/views.py:157
#: contrib/admindocs/views.py:159
#: contrib/admindocs/views.py:158 contrib/admindocs/views.py:160
#: contrib/admindocs/views.py:162
msgid "view:"
msgstr "vista:"
#: contrib/admindocs/views.py:187
#: contrib/admindocs/views.py:190
#, python-format
msgid "App %r not found"
msgstr "Aplicación %r no encontrada"
#: contrib/admindocs/views.py:194
#: contrib/admindocs/views.py:197
#, python-format
msgid "Model %(model_name)r not found in app %(app_label)r"
msgstr ""
"El modelo %(model_name)r no se ha encontrado en la aplicación %(app_label)r"
#: contrib/admindocs/views.py:206
#: contrib/admindocs/views.py:209
#, python-format
msgid "the related `%(app_label)s.%(data_type)s` object"
msgstr "el objeto relacionado `%(app_label)s.%(data_type)s`"
#: contrib/admindocs/views.py:206 contrib/admindocs/views.py:225
#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:244
#: contrib/admindocs/views.py:258 contrib/admindocs/views.py:263
#: contrib/admindocs/views.py:209 contrib/admindocs/views.py:228
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:247
#: contrib/admindocs/views.py:261 contrib/admindocs/views.py:266
msgid "model:"
msgstr "modelo:"
#: contrib/admindocs/views.py:221 contrib/admindocs/views.py:253
#: contrib/admindocs/views.py:224 contrib/admindocs/views.py:256
#, python-format
msgid "related `%(app_label)s.%(object_name)s` objects"
msgstr "los objetos relacionados `%(app_label)s.%(object_name)s`"
#: contrib/admindocs/views.py:225 contrib/admindocs/views.py:258
#: contrib/admindocs/views.py:228 contrib/admindocs/views.py:261
#, python-format
msgid "all %s"
msgstr "todo %s"
#: contrib/admindocs/views.py:230 contrib/admindocs/views.py:263
#: contrib/admindocs/views.py:233 contrib/admindocs/views.py:266
#, python-format
msgid "number of %s"
msgstr "número de %s"
#: contrib/admindocs/views.py:268
#: contrib/admindocs/views.py:271
#, python-format
msgid "Fields on %s objects"
msgstr "Campos en %s objetos"
#: contrib/admindocs/views.py:331 contrib/admindocs/views.py:342
#: contrib/admindocs/views.py:344 contrib/admindocs/views.py:350
#: contrib/admindocs/views.py:351 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:334 contrib/admindocs/views.py:345
#: contrib/admindocs/views.py:347 contrib/admindocs/views.py:353
#: contrib/admindocs/views.py:354 contrib/admindocs/views.py:356
msgid "Integer"
msgstr "Entero"
#: contrib/admindocs/views.py:332
#: contrib/admindocs/views.py:335
msgid "Boolean (Either True or False)"
msgstr "Booleano (Verdadero o Falso)"
#: contrib/admindocs/views.py:333 contrib/admindocs/views.py:352
#: contrib/admindocs/views.py:336 contrib/admindocs/views.py:355
#, python-format
msgid "String (up to %(max_length)s)"
msgstr "Cadena (máximo %(max_length)s)"
#: contrib/admindocs/views.py:334
#: contrib/admindocs/views.py:337
msgid "Comma-separated integers"
msgstr "Enteros separados por comas"
#: contrib/admindocs/views.py:335
#: contrib/admindocs/views.py:338
msgid "Date (without time)"
msgstr "Fecha (sin hora)"
#: contrib/admindocs/views.py:336
#: contrib/admindocs/views.py:339
msgid "Date (with time)"
msgstr "Fecha (con hora)"
#: contrib/admindocs/views.py:337
#: contrib/admindocs/views.py:340
msgid "Decimal number"
msgstr "Número decimal"
#: contrib/admindocs/views.py:338
#: contrib/admindocs/views.py:341
msgid "E-mail address"
msgstr "Dirección de correo electrónico"
#: contrib/admindocs/views.py:339 contrib/admindocs/views.py:340
#: contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:342 contrib/admindocs/views.py:343
#: contrib/admindocs/views.py:346
msgid "File path"
msgstr "Ruta de fichero"
#: contrib/admindocs/views.py:341
#: contrib/admindocs/views.py:344
msgid "Floating point number"
msgstr "Número en coma flotante"
#: contrib/admindocs/views.py:345 contrib/comments/models.py:60
#: contrib/admindocs/views.py:348 contrib/comments/models.py:60
msgid "IP address"
msgstr "Dirección IP"
#: contrib/admindocs/views.py:347
#: contrib/admindocs/views.py:350
msgid "Boolean (Either True, False or None)"
msgstr "Booleano (Verdadero, Falso o Nulo)"
#: contrib/admindocs/views.py:348
#: contrib/admindocs/views.py:351
msgid "Relation to parent model"
msgstr "Relación con el modelo padre"
#: contrib/admindocs/views.py:349
#: contrib/admindocs/views.py:352
msgid "Phone number"
msgstr "Número de teléfono"
#: contrib/admindocs/views.py:354
#: contrib/admindocs/views.py:357
msgid "Text"
msgstr "Texto"
#: contrib/admindocs/views.py:355
#: contrib/admindocs/views.py:358
msgid "Time"
msgstr "Hora"
#: contrib/admindocs/views.py:356 contrib/comments/forms.py:95
#: contrib/comments/templates/comments/moderation_queue.html:37
#: contrib/admindocs/views.py:359 contrib/comments/forms.py:95
#: contrib/flatpages/admin.py:8 contrib/flatpages/models.py:7
msgid "URL"
msgstr "URL"
#: contrib/admindocs/views.py:357
#: contrib/admindocs/views.py:360
msgid "U.S. state (two uppercase letters)"
msgstr "Estado de los EEUU (dos letras mayúsculas)"
#: contrib/admindocs/views.py:358
#: contrib/admindocs/views.py:361
msgid "XML text"
msgstr "Texto XML"
#: contrib/admindocs/views.py:384
#: contrib/admindocs/views.py:387
#, python-format
msgid "%s does not appear to be a urlpattern object"
msgstr "%s no parece ser un objeto urlpattern"
@ -1441,22 +1439,53 @@ msgstr "usuarios"
msgid "message"
msgstr "mensaje"
#: contrib/auth/views.py:56
#: contrib/auth/views.py:60
msgid "Logged out"
msgstr "Sesión terminada"
#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:429
#: contrib/auth/management/commands/createsuperuser.py:23 forms/fields.py:428
msgid "Enter a valid e-mail address."
msgstr "Introduzca una dirección de correo electrónico válida."
#: contrib/comments/admin.py:11
#: contrib/comments/admin.py:12
msgid "Content"
msgstr "contenido"
#: contrib/comments/admin.py:14
#: contrib/comments/admin.py:15
msgid "Metadata"
msgstr "metadatos"
#: contrib/comments/admin.py:39
msgid "flagged"
msgstr "marcado"
#: contrib/comments/admin.py:40
msgid "Flag selected comments"
msgstr "Marcar los comentarios seleccionados"
#: contrib/comments/admin.py:43
msgid "approved"
msgstr "aprobado"
#: contrib/comments/admin.py:44
msgid "Approve selected comments"
msgstr "aprobar los comentarios seleccionados"
#: contrib/comments/admin.py:47
msgid "removed"
msgstr "eliminado"
#: contrib/comments/admin.py:48
msgid "Remove selected comments"
msgstr "Eliminar los comentarios seleccionados"
#: contrib/comments/admin.py:60
#, python-format
msgid "1 comment was successfully %(action)s."
msgid_plural "%(count)s comments were successfully %(action)s."
msgstr[0] "1 comentarios ha sido %(action)s satisfactoriamente."
msgstr[1] "%(count)s comentarios han sido %(action)s satisfactoriamente."
#: contrib/comments/feeds.py:13
#, python-format
msgid "%(site_name)s comments"
@ -1468,7 +1497,6 @@ msgid "Latest comments on %(site_name)s"
msgstr "Últimos comentarios en %(site_name)s"
#: contrib/comments/forms.py:93
#: contrib/comments/templates/comments/moderation_queue.html:34
msgid "Name"
msgstr "Nombre"
@ -1477,7 +1505,6 @@ msgid "Email address"
msgstr "dirección de correo electrónico"
#: contrib/comments/forms.py:96
#: contrib/comments/templates/comments/moderation_queue.html:35
msgid "Comment"
msgstr "Comentario"
@ -1598,14 +1625,13 @@ msgstr "marcas de comentario"
#: contrib/comments/templates/comments/approve.html:4
msgid "Approve a comment"
msgstr "Aprovar un comentario"
msgstr "Aprobar un comentario"
#: contrib/comments/templates/comments/approve.html:7
msgid "Really make this comment public?"
msgstr "Realmente desea hacer este comentario público?"
#: contrib/comments/templates/comments/approve.html:12
#: contrib/comments/templates/comments/moderation_queue.html:49
msgid "Approve"
msgstr "Aprobar"
@ -1631,7 +1657,6 @@ msgid "Really remove this comment?"
msgstr "¿Realmente desea eliminar este comentario?"
#: contrib/comments/templates/comments/delete.html:12
#: contrib/comments/templates/comments/moderation_queue.html:53
msgid "Remove"
msgstr "Eliminar"
@ -1665,39 +1690,6 @@ msgstr "Enviar"
msgid "Preview"
msgstr "Previsualizar"
#: contrib/comments/templates/comments/moderation_queue.html:4
#: contrib/comments/templates/comments/moderation_queue.html:19
msgid "Comment moderation queue"
msgstr "Cola de moderación de comentarios"
#: contrib/comments/templates/comments/moderation_queue.html:26
msgid "No comments to moderate"
msgstr "No hay comentarios por moderar"
#: contrib/comments/templates/comments/moderation_queue.html:36
msgid "Email"
msgstr "Correo electrónico"
#: contrib/comments/templates/comments/moderation_queue.html:38
msgid "Authenticated?"
msgstr "¿Autentificado?"
#: contrib/comments/templates/comments/moderation_queue.html:39
msgid "IP Address"
msgstr "Dirección IP"
#: contrib/comments/templates/comments/moderation_queue.html:40
msgid "Date posted"
msgstr "Fecha de envío"
#: contrib/comments/templates/comments/moderation_queue.html:63
msgid "yes"
msgstr "sí"
#: contrib/comments/templates/comments/moderation_queue.html:63
msgid "no"
msgstr "no"
#: contrib/comments/templates/comments/posted.html:4
msgid "Thanks for commenting"
msgstr "Gracias por comentar"
@ -1790,7 +1782,7 @@ msgstr "página estática"
msgid "flat pages"
msgstr "páginas estáticas"
#: contrib/formtools/wizard.py:130
#: contrib/formtools/wizard.py:132
msgid ""
"We apologize, but your form has expired. Please continue filling out the "
"form from this page."
@ -1815,8 +1807,8 @@ msgid ""
"An error occurred when transforming the geometry to the SRID of the geometry "
"form field."
msgstr ""
"Ocurrió un error al transformar la geometria al SRID de la geometria "
"del campo de formulario."
"Ocurrió un error al transformar la geometria al SRID de la geometria del "
"campo de formulario."
#: contrib/humanize/templatetags/humanize.py:19
msgid "th"
@ -2611,6 +2603,10 @@ msgstr "El número de cuenta bancaria es incorrecto."
msgid "Enter a valid Finnish social security number."
msgstr "Introduzca un número de seguro social finlandés válido."
#: contrib/localflavor/fr/forms.py:30
msgid "Phone numbers must be in 0X XX XX XX XX format."
msgstr "Los números de teléfono deben tener el formato 0X XX XX XX XX."
#: contrib/localflavor/in_/forms.py:14
msgid "Enter a zip code in the format XXXXXXX."
msgstr "Introduzca un código postal en el formato XXXXXXX."
@ -3052,7 +3048,8 @@ msgstr "El Número de Identificación Tributaria (NIP) es incorrecto."
#: contrib/localflavor/pl/forms.py:109
msgid "National Business Register Number (REGON) consists of 9 or 14 digits."
msgstr ""
"El Número Nacional de Registro de Negocios (REGON) consiste en 9 o 14 dígitos."
"El Número Nacional de Registro de Negocios (REGON) consiste en 9 o 14 "
"dígitos."
#: contrib/localflavor/pl/forms.py:110
msgid "Wrong checksum for the National Business Register Number (REGON)."
@ -3941,14 +3938,14 @@ msgstr "Este valor debe ser Verdadero, Falso o Ninguno."
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
msgstr "Introduzca una hora válida en formato HH:MM[:ss[.uuuuuu]]."
#: db/models/fields/related.py:816
#: db/models/fields/related.py:869
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
"Mantenga presionado \"Control\", o \"Command\" en un Mac, para seleccionar "
"más de una opción."
#: db/models/fields/related.py:894
#: db/models/fields/related.py:930
#, python-format
msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
msgid_plural ""
@ -3960,88 +3957,88 @@ msgstr[1] ""
"Por favor, introduzca IDs de %(self)s válidos. Los valores %(value)r no son "
"válidos."
#: forms/fields.py:54
#: forms/fields.py:53
msgid "This field is required."
msgstr "Este campo es obligatorio."
#: forms/fields.py:55
#: forms/fields.py:54
msgid "Enter a valid value."
msgstr "Introduzca un valor correcto."
#: forms/fields.py:138
#: forms/fields.py:137
#, python-format
msgid "Ensure this value has at most %(max)d characters (it has %(length)d)."
msgstr ""
"Asegúrese de que su texto tiene a lo más %(max)d caracteres (actualmente "
"tiene %(length)d)."
#: forms/fields.py:139
#: forms/fields.py:138
#, python-format
msgid "Ensure this value has at least %(min)d characters (it has %(length)d)."
msgstr ""
"Asegúrese de que su texto tiene al menos %(min)d caracteres (actualmente "
"tiene %(length)d)."
#: forms/fields.py:166
#: forms/fields.py:165
msgid "Enter a whole number."
msgstr "Introduzca un número entero."
#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225
#: forms/fields.py:166 forms/fields.py:195 forms/fields.py:224
#, python-format
msgid "Ensure this value is less than or equal to %s."
msgstr "Asegúrese de que este valor es menor o igual a %s."
#: forms/fields.py:168 forms/fields.py:197 forms/fields.py:226
#: forms/fields.py:167 forms/fields.py:196 forms/fields.py:225
#, python-format
msgid "Ensure this value is greater than or equal to %s."
msgstr "Asegúrese de que este valor es mayor o igual a %s."
#: forms/fields.py:195 forms/fields.py:224
#: forms/fields.py:194 forms/fields.py:223
msgid "Enter a number."
msgstr "Introduzca un número."
#: forms/fields.py:227
#: forms/fields.py:226
#, python-format
msgid "Ensure that there are no more than %s digits in total."
msgstr "Asegúrese de que no hay más de %s dígitos en total."
#: forms/fields.py:228
#: forms/fields.py:227
#, python-format
msgid "Ensure that there are no more than %s decimal places."
msgstr "Asegúrese de que no hay más de %s decimales."
#: forms/fields.py:229
#: forms/fields.py:228
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "Asegúrese de que no hay más de %s dígitos antes de la coma decimal."
#: forms/fields.py:288 forms/fields.py:863
#: forms/fields.py:287 forms/fields.py:862
msgid "Enter a valid date."
msgstr "Introduzca una fecha válida."
#: forms/fields.py:322 forms/fields.py:864
#: forms/fields.py:321 forms/fields.py:863
msgid "Enter a valid time."
msgstr "Introduzca una hora válida."
#: forms/fields.py:361
#: forms/fields.py:360
msgid "Enter a valid date/time."
msgstr "Introduzca una fecha/hora válida."
#: forms/fields.py:447
#: forms/fields.py:446
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
"No se ha enviado ningún fichero. Compruebe el tipo de codificación en el "
"formulario."
#: forms/fields.py:448
#: forms/fields.py:447
msgid "No file was submitted."
msgstr "No se ha enviado ningún fichero"
#: forms/fields.py:449
#: forms/fields.py:448
msgid "The submitted file is empty."
msgstr "El fichero enviado está vacío."
#: forms/fields.py:450
#: forms/fields.py:449
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
@ -4049,7 +4046,7 @@ msgstr ""
"Asegúrese de que su texto tiene no más de %(max)d caracteres (actualmente "
"tiene %(length)d)."
#: forms/fields.py:483
#: forms/fields.py:482
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
@ -4057,29 +4054,29 @@ msgstr ""
"Envíe una imagen válida. El fichero que ha enviado no era una imagen o se "
"trataba de una imagen corrupta."
#: forms/fields.py:544
#: forms/fields.py:543
msgid "Enter a valid URL."
msgstr "Introduzca una URL válida."
#: forms/fields.py:545
#: forms/fields.py:544
msgid "This URL appears to be a broken link."
msgstr "La URL parece ser un enlace roto."
#: forms/fields.py:625 forms/fields.py:703
#: forms/fields.py:624 forms/fields.py:702
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Escoja una opción válida. %(value)s no es una de las opciones disponibles."
#: forms/fields.py:704 forms/fields.py:765 forms/models.py:1003
#: forms/fields.py:703 forms/fields.py:764 forms/models.py:999
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
#: forms/fields.py:892
#: forms/fields.py:891
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida."
#: forms/fields.py:902
#: forms/fields.py:901
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
@ -4090,28 +4087,28 @@ msgstr ""
msgid "Order"
msgstr "Orden"
#: forms/models.py:367
#: forms/models.py:363
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "El campo %(field_name)s debe ser único para %(lookup)s %(date_field)s"
#: forms/models.py:381 forms/models.py:389
#: forms/models.py:377 forms/models.py:385
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Ya existe %(model_name)s con este %(field_label)s."
#: forms/models.py:594
#: forms/models.py:590
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Por favor, corrija el dato duplicado para %(field)s."
#: forms/models.py:598
#: forms/models.py:594
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Por favor corriga el dato duplicado para %(field)s, el cual debe ser único."
#: forms/models.py:604
#: forms/models.py:600
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@ -4120,26 +4117,26 @@ msgstr ""
"Por favor corriga los datos duplicados para %(field_name)s el cual debe ser "
"único para %(lookup)s en %(date_field)s."
#: forms/models.py:612
#: forms/models.py:608
msgid "Please correct the duplicate values below."
msgstr "Por favor, corrija los valores duplicados abajo."
#: forms/models.py:867
#: forms/models.py:863
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La clave foránea en linea no coincide con la clave primaria de la instancia "
"padre."
#: forms/models.py:930
#: forms/models.py:926
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Escoja una opción válida. Esa opción no está entre las disponibles."
#: forms/models.py:1004
#: forms/models.py:1000
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Escoja una opción válida; '%s' no es una de las opciones disponibles."
#: forms/models.py:1006
#: forms/models.py:1002
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" no es un valor válido para una clave primaria."
@ -4459,6 +4456,30 @@ msgstr "Se actualizó con éxito el %(verbose_name)s."
msgid "The %(verbose_name)s was deleted."
msgstr "El/La %(verbose_name)s ha sido borrado."
#~ msgid "Comment moderation queue"
#~ msgstr "Cola de moderación de comentarios"
#~ msgid "No comments to moderate"
#~ msgstr "No hay comentarios por moderar"
#~ msgid "Email"
#~ msgstr "Correo electrónico"
#~ msgid "Authenticated?"
#~ msgstr "¿Autentificado?"
#~ msgid "IP Address"
#~ msgstr "Dirección IP"
#~ msgid "Date posted"
#~ msgstr "Fecha de envío"
#~ msgid "yes"
#~ msgstr "sí"
#~ msgid "no"
#~ msgstr "no"
#~ msgid "verbose_name"
#~ msgid_plural "verbose_name_plural"
#~ msgstr[0] "verbose_name"

File diff suppressed because it is too large Load Diff

View File

@ -4,7 +4,7 @@
Please note that MySQL only supports bounding box queries, also
known as MBRs (Minimum Bounding Rectangles). Moreover, spatial
indices may only be used on MyISAM tables -- if you need
indices may only be used on MyISAM tables -- if you need
transactions, take a look at PostGIS.
"""
from django.db import connection
@ -38,7 +38,7 @@ MISC_TERMS = ['isnull']
# Assacceptable lookup types for Oracle spatial.
MYSQL_GIS_TERMS = MYSQL_GIS_FUNCTIONS.keys()
MYSQL_GIS_TERMS += MISC_TERMS
MYSQL_GIS_TERMS = dict((term, None) for term in MYSQL_GIS_TERMS) # Making dictionary
MYSQL_GIS_TERMS = dict((term, None) for term in MYSQL_GIS_TERMS) # Making dictionary
def get_geo_where_clause(table_alias, name, lookup_type, geo_annot):
"Returns the SQL WHERE clause for use in MySQL spatial SQL construction."
@ -49,7 +49,7 @@ def get_geo_where_clause(table_alias, name, lookup_type, geo_annot):
lookup_info = MYSQL_GIS_FUNCTIONS.get(lookup_type, False)
if lookup_info:
return "%s(%s, %%s)" % (lookup_info, geo_col)
# Handling 'isnull' lookup type
# TODO: Is this needed because MySQL cannot handle NULL
# geometries in its spatial indices.

View File

@ -3,8 +3,8 @@
routine for Oracle Spatial.
Please note that WKT support is broken on the XE version, and thus
this backend will not work on such platforms. Specifically, XE lacks
support for an internal JVM, and Java libraries are required to use
this backend will not work on such platforms. Specifically, XE lacks
support for an internal JVM, and Java libraries are required to use
the WKT constructors.
"""
import re
@ -31,10 +31,10 @@ TRANSFORM = 'SDO_CS.TRANSFORM'
UNION = 'SDO_GEOM.SDO_UNION'
UNIONAGG = 'SDO_AGGR_UNION'
# We want to get SDO Geometries as WKT because it is much easier to
# instantiate GEOS proxies from WKT than SDO_GEOMETRY(...) strings.
# However, this adversely affects performance (i.e., Java is called
# to convert to WKT on every query). If someone wishes to write a
# We want to get SDO Geometries as WKT because it is much easier to
# instantiate GEOS proxies from WKT than SDO_GEOMETRY(...) strings.
# However, this adversely affects performance (i.e., Java is called
# to convert to WKT on every query). If someone wishes to write a
# SDO_GEOMETRY(...) parser in Python, let me know =)
GEOM_SELECT = 'SDO_UTIL.TO_WKTGEOMETRY(%s)'
@ -50,7 +50,7 @@ class SDOOperation(SpatialFunction):
class SDODistance(SpatialFunction):
"Class for Distance queries."
def __init__(self, op, tolerance=0.05):
super(SDODistance, self).__init__(DISTANCE, end_subst=', %s) %%s %%s' % tolerance,
super(SDODistance, self).__init__(DISTANCE, end_subst=', %s) %%s %%s' % tolerance,
operator=op, result='%%s')
class SDOGeomRelate(SpatialFunction):
@ -59,7 +59,7 @@ class SDOGeomRelate(SpatialFunction):
# SDO_GEOM.RELATE(...) has a peculiar argument order: column, mask, geom, tolerance.
# Moreover, the runction result is the mask (e.g., 'DISJOINT' instead of 'TRUE').
end_subst = "%s%s) %s '%s'" % (', %%s, ', tolerance, '=', mask)
beg_subst = "%%s(%%s, '%s'" % mask
beg_subst = "%%s(%%s, '%s'" % mask
super(SDOGeomRelate, self).__init__('SDO_GEOM.RELATE', beg_subst=beg_subst, end_subst=end_subst)
class SDORelate(SpatialFunction):
@ -81,7 +81,7 @@ DISTANCE_FUNCTIONS = {
'distance_gte' : (SDODistance('>='), dtypes),
'distance_lt' : (SDODistance('<'), dtypes),
'distance_lte' : (SDODistance('<='), dtypes),
'dwithin' : (SDOOperation('SDO_WITHIN_DISTANCE',
'dwithin' : (SDOOperation('SDO_WITHIN_DISTANCE',
beg_subst="%s(%s, %%s, 'distance=%%s'"), dtypes),
}
@ -118,7 +118,7 @@ def get_geo_where_clause(table_alias, name, lookup_type, geo_annot):
# See if a Oracle Geometry function matches the lookup type next
lookup_info = ORACLE_GEOMETRY_FUNCTIONS.get(lookup_type, False)
if lookup_info:
# Lookup types that are tuples take tuple arguments, e.g., 'relate' and
# Lookup types that are tuples take tuple arguments, e.g., 'relate' and
# 'dwithin' lookup types.
if isinstance(lookup_info, tuple):
# First element of tuple is lookup type, second element is the type
@ -128,15 +128,15 @@ def get_geo_where_clause(table_alias, name, lookup_type, geo_annot):
# Ensuring that a tuple _value_ was passed in from the user
if not isinstance(geo_annot.value, tuple):
raise TypeError('Tuple required for `%s` lookup type.' % lookup_type)
if len(geo_annot.value) != 2:
if len(geo_annot.value) != 2:
raise ValueError('2-element tuple required for %s lookup type.' % lookup_type)
# Ensuring the argument type matches what we expect.
if not isinstance(geo_annot.value[1], arg_type):
raise TypeError('Argument type should be %s, got %s instead.' % (arg_type, type(geo_annot.value[1])))
if lookup_type == 'relate':
# The SDORelate class handles construction for these queries,
# The SDORelate class handles construction for these queries,
# and verifies the mask argument.
return sdo_op(geo_annot.value[1]).as_sql(geo_col)
else:
@ -144,7 +144,7 @@ def get_geo_where_clause(table_alias, name, lookup_type, geo_annot):
return sdo_op.as_sql(geo_col)
else:
# Lookup info is a SDOOperation instance, whose `as_sql` method returns
# the SQL necessary for the geometry function call. For example:
# the SQL necessary for the geometry function call. For example:
# SDO_CONTAINS("geoapp_country"."poly", SDO_GEOMTRY('POINT(5 23)', 4326)) = 'TRUE'
return lookup_info.as_sql(geo_col)
elif lookup_type == 'isnull':

View File

@ -401,7 +401,7 @@ SMTP backend
This is the default backend. E-mail will be sent through a SMTP server.
The server address and authentication credentials are set in the
:setting:`EMAIL_HOST`, :setting:`EMAIL_POST`, :setting:`EMAIL_HOST_USER`,
:setting:`EMAIL_HOST`, :setting:`EMAIL_PORT`, :setting:`EMAIL_HOST_USER`,
:setting:`EMAIL_HOST_PASSWORD` and :setting:`EMAIL_USE_TLS` settings in your
settings file.

View File

@ -3,6 +3,7 @@ from optparse import OptionParser, make_option
from django.core.management.base import BaseCommand
class Command(BaseCommand):
option_list = BaseCommand.option_list + (
make_option("--list", action="store_true", dest="list",