Django

Code

Changeset 7540 for django/branches

Show
Ignore:
Timestamp:
05/18/08 13:27:22 (6 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7526,7534-7539 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7522 to /django/trunk:1-7539

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

    r7405 r7540  
    1212DEBUG = False 
    1313TEMPLATE_DEBUG = False 
     14# True if BaseHandler.get_response() should propagate raw exceptions 
     15# rather than catching them.  This is useful under some testing siutations, 
     16# and should never be used on a live site. 
     17DEBUG_PROPAGATE_EXCEPTIONS = False 
    1418 
    1519# Whether to use the "Etag" header. This saves bandwidth but slows down performance. 

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

    r7482 r7540  
    66"Project-Id-Version: Django\n" 
    77"Report-Msgid-Bugs-To: \n" 
    8 "POT-Creation-Date: 2008-04-25 00:18+0200\n" 
    9 "PO-Revision-Date: 2008-03-29 01:37+0100\n" 
     8"POT-Creation-Date: 2007-02-15 00:00+0200\n" 
     9"PO-Revision-Date: 2008-05-14 11:15+0200\n" 
    1010"Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n" 
    1111"Language-Team: Catalan <ca@li.org>\n" 
    …… 
    410410"All of the following related items will be deleted:" 
    411411msgstr "" 
    412 "Esteu segurs de voler esborrar els/les %(object_name)s \"%(escaped_object)s\"? " 
    413 "S'esborraran els següents elements relacionats:" 
     412"Esteu segurs de voler esborrar els/les %(object_name)s \"%(escaped_object)s" 
     413"\"? S'esborraran els següents elements relacionats:" 
    414414 
    415415#: contrib/admin/templates/admin/delete_confirmation.html:25 
    …… 
    547547"options." 
    548548msgstr "" 
    549 "Primer, entreu un usuari i una contrasenya. Després podreu editar més opcions " 
    550 "de l'usuari." 
     549"Primer, entreu un usuari i una contrasenya. Després podreu editar més " 
     550"opcions de l'usuari." 
    551551 
    552552#: contrib/admin/templates/admin/auth/user/add_form.html:12 
    …… 
    600600"Observeu que alguns d'aquests 'bookmarklets' precisen que estigui veient\n" 
    601601"el lloc des de un ordinador senyalat com a \"intern\" (parleu\n" 
    602 "amb el vostre administrador de sistemes si no esteu segurs de la condició del " 
    603 "vostre).</p>\n" 
     602"amb el vostre administrador de sistemes si no esteu segurs de la condició " 
     603"del vostre).</p>\n" 
    604604 
    605605#: contrib/admin/templates/admin_doc/bookmarklets.html:18 
    …… 
    827827msgstr "" 
    828828"Sembla ser que el vostre navegador no està configurat per acceptar " 
    829 "'cookies' (galetes). Si us plau, habiliteu les 'cookies', recarregueu aquesta " 
    830 "pàgina i proveu-ho de nou. " 
     829"'cookies' (galetes). Si us plau, habiliteu les 'cookies', recarregueu " 
     830"aquesta pàgina i proveu-ho de nou. " 
    831831 
    832832#: contrib/admin/views/decorators.py:90 
    …… 
    838838msgid "Your e-mail address is not your username. Try '%s' instead." 
    839839msgstr "" 
    840 "La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en tot cas." 
     840"La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en tot " 
     841"cas." 
    841842 
    842843#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50 
    …… 
    10711072msgstr "Seleccioneu %s per modificar" 
    10721073 
    1073 #: contrib/admin/views/main.py:784 
     1074#: contrib/admin/views/main.py:765 
    10741075msgid "Database error" 
    10751076msgstr "Error de base de dades" 
    …… 
    11001101"you've registered?" 
    11011102msgstr "" 
    1102 "Aquesta adreça de correu no té associada cap compte d'usuari. Esteu segurs de " 
    1103 "que s'ha registrat?" 
     1103"Aquesta adreça de correu no té associada cap compte d'usuari. Esteu segurs " 
     1104"de que s'ha registrat?" 
    11041105 
    11051106#: contrib/auth/forms.py:107 
    …… 
    11741175"password form</a>." 
    11751176msgstr "" 
    1176 "Utilitzeu '[algo]$[salt]$[hexdigest]' o el <a href=\"password/\">formulari de " 
    1177 "canvi de contrasenya</a>." 
     1177"Utilitzeu '[algo]$[salt]$[hexdigest]' o el <a href=\"password/\">formulari " 
     1178"de canvi de contrasenya</a>." 
    11781179 
    11791180#: contrib/auth/models.py:136 
    …… 
    11901191 
    11911192#: contrib/auth/models.py:137 
    1192 #, fuzzy 
    11931193msgid "" 
    11941194"Designates whether this user should be treated as active. Unselect this " 
    11951195"instead of deleting accounts." 
    11961196msgstr "" 
    1197 "Designa si aquest usuari ha de ser tractat com a actiu. Desekeccioneu-ho " 
     1197"Designa si aquest usuari ha de ser tractat com a actiu. Deseleccioneu-ho " 
    11981198"enlloc d'esborrar comptes d'usuari." 
    11991199 
    …… 
    13281328"removed\" message will be displayed instead." 
    13291329msgstr "" 
    1330 "Marqueu aquesta caixa si el comentari no és apropiat. En lloc seu es mostrarà " 
    1331 "\"Aquest comentari ha estat eliminat\" " 
     1330"Marqueu aquesta caixa si el comentari no és apropiat. En lloc seu es " 
     1331"mostrarà \"Aquest comentari ha estat eliminat\" " 
    13321332 
    13331333#: contrib/comments/models.py:96 
    …… 
    15731573"Example: '/about/contact/'. Make sure to have leading and trailing slashes." 
    15741574msgstr "" 
    1575 "Exemple: '/about/contact/'. Assegureu-vos de posar les barres al principi i al " 
    1576 "final." 
     1575"Exemple: '/about/contact/'. Assegureu-vos de posar les barres al principi i " 
     1576"al final." 
    15771577 
    15781578#: contrib/flatpages/models.py:10 
    …… 
    16181618#: contrib/flatpages/models.py:27 
    16191619msgid "Advanced options" 
    1620 msgstr "" 
     1620msgstr "Opcions avançades" 
    16211621 
    16221622#: contrib/humanize/templatetags/humanize.py:19 
    …… 
    22552255"9XXXXXXXX." 
    22562256msgstr "" 
    2257 "Introduïu un número de telèfon vàlid en un dels formats 6XXXXXXXX, " 
    2258 "8XXXXXXXX o 9XXXXXXXX." 
     2257"Introduïu un número de telèfon vàlid en un dels formats 6XXXXXXXX, 8XXXXXXXX " 
     2258"o 9XXXXXXXX." 
    22592259 
    22602260#: contrib/localflavor/es/forms.py:66 
    …… 
    36293629msgstr "Data invàlida: %s" 
    36303630 
    3631 #: core/validators.py:156 db/models/fields/__init__.py:527 
     3631#: core/validators.py:156 db/models/fields/__init__.py:548 
    36323632msgid "Enter a valid date in YYYY-MM-DD format." 
    36333633msgstr "Introduïu una data vàlida en el forma AAAA-MM-DD." 
    …… 
    36373637msgstr "Introduïu una hora vàlida en el format HH:MM." 
    36383638 
    3639 #: core/validators.py:165 db/models/fields/__init__.py:604 
     3639#: core/validators.py:165 db/models/fields/__init__.py:625 
    36403640msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." 
    36413641msgstr "Introduïu un data/hora vàlida en format YYYY-MM-DD HH:MM." 
    …… 
    36563656"corrupted image." 
    36573657msgstr "" 
    3658 "Envieu una imatge vàlida. El fitxer que heu enviat no era una imatge o estava " 
    3659 "corrupte." 
     3658"Envieu una imatge vàlida. El fitxer que heu enviat no era una imatge o " 
     3659"estava corrupte." 
    36603660 
    36613661#: core/validators.py:200 
    …… 
    37133713msgid_plural "Watch your mouth! The words %s are not allowed here." 
    37143714msgstr[0] "Vigileu amb el vostre llenguatge! Aquí no s'admet la paraula: %s." 
    3715 msgstr[1] "Vigileu amb el vostre llenguatge! Aquí no s'admeten les paraules: %s." 
     3715msgstr[1] "" 
     3716"Vigileu amb el vostre llenguatge! Aquí no s'admeten les paraules: %s." 
    37163717 
    37173718#: core/validators.py:288 
    …… 
    37833784"Please enter a valid decimal number with a whole part of at most %s digits." 
    37843785msgstr[0] "" 
    3785 "Si us plau, introduïu un número decimal vàlid que la seva part sencera " 
    3786 "sigui de com a màxim %s digit." 
     3786"Si us plau, introduïu un número decimal vàlid que la seva part sencera sigui " 
     3787"de com a màxim %s digit." 
    37873788msgstr[1] "" 
    3788 "Si us plau, introduïu un número decimal vàlid que la seva part sencera " 
    3789 "sigui de com a màxim %s digits." 
     3789"Si us plau, introduïu un número decimal vàlid que la seva part sencera sigui " 
     3790"de com a màxim %s digits." 
    37903791 
    37913792#: core/validators.py:450 
    …… 
    38083809#, python-format 
    38093810msgid "Make sure your uploaded file is at least %s bytes big." 
    3810 msgstr "Assegureu-vos de que el fitxer que heu enviat té, com a mínim, %s bytes." 
     3811msgstr "" 
     3812"Assegureu-vos de que el fitxer que heu enviat té, com a mínim, %s bytes." 
    38113813 
    38123814#: core/validators.py:468 
    38133815#, python-format 
    38143816msgid "Make sure your uploaded file is at most %s bytes big." 
    3815 msgstr "Assegureu-vos de que el fitxer que heu enviat té, com a màxim %s bytes." 
     3817msgstr "" 
     3818"Assegureu-vos de que el fitxer que heu enviat té, com a màxim %s bytes." 
    38163819 
    38173820#: core/validators.py:485 
    …… 
    38953898msgstr "Ja existeix un %(object)s del tipus %(type)s amb aquest %(field)s." 
    38963899 
    3897 #: db/models/fields/__init__.py:52 
     3900#: db/models/fields/__init__.py:54 
    38983901#, python-format 
    38993902msgid "%(optname)s with this %(fieldname)s already exists." 
    39003903msgstr "Ja existeix %(optname)s amb aquest %(fieldname)s." 
    39013904 
    3902 #: db/models/fields/__init__.py:161 db/models/fields/__init__.py:327 
    3903 #: db/models/fields/__init__.py:759 db/models/fields/__init__.py:770 
     3905#: db/models/fields/__init__.py:179 db/models/fields/__init__.py:348 
     3906#: db/models/fields/__init__.py:780 db/models/fields/__init__.py:791 
    39043907#: newforms/fields.py:46 oldforms/__init__.py:374 
    39053908msgid "This field is required." 
    39063909msgstr "Aquest camp és obligatori." 
    39073910 
    3908 #: db/models/fields/__init__.py:427 
     3911#: db/models/fields/__init__.py:448 
    39093912msgid "This value must be an integer." 
    39103913msgstr "Aquest valor ha de ser un enter." 
    39113914 
    3912 #: db/models/fields/__init__.py:466 
     3915#: db/models/fields/__init__.py:487 
    39133916msgid "This value must be either True or False." 
    39143917msgstr "Aquest valor ha de ser True (Veritat) o False (Fals)" 
    39153918 
    3916 #: db/models/fields/__init__.py:490 
     3919#: db/models/fields/__init__.py:511 
    39173920msgid "This field cannot be null." 
    39183921msgstr "Aquest camp no pot ser nul." 
    39193922 
    3920 #: db/models/fields/__init__.py:668 
     3923#: db/models/fields/__init__.py:689 
    39213924msgid "This value must be a decimal number." 
    39223925msgstr "Aquest valor ha de ser un número decimal." 
    39233926 
    3924 #: db/models/fields/__init__.py:779 
     3927#: db/models/fields/__init__.py:800 
    39253928msgid "Enter a valid filename." 
    39263929msgstr "Introduïu un nom de fitxer vàlid." 
    39273930 
    3928 #: db/models/fields/__init__.py:960 
     3931#: db/models/fields/__init__.py:981 
    39293932msgid "This value must be either None, True or False." 
    39303933msgstr "Aquest valor ha de ser None (Cap), True (Veritat) o False (Fals)" 
    39313934 
    3932 #: db/models/fields/related.py:93 
     3935#: db/models/fields/related.py:94 
    39333936#, python-format 
    39343937msgid "Please enter a valid %s." 
    39353938msgstr "Si us plau, introduïu un %s vàlid." 
    39363939 
    3937 #: db/models/fields/related.py:701 
     3940#: db/models/fields/related.py:721 
    39383941msgid "Separate multiple IDs with commas." 
    39393942msgstr "Separi múltiples IDs amb comes." 
    39403943 
    3941 #: db/models/fields/related.py:703 
     3944#: db/models/fields/related.py:723 
    39423945msgid "" 
    39433946"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." 
    …… 
    39463949"d'un valor." 
    39473950 
    3948 #: db/models/fields/related.py:750 
     3951#: db/models/fields/related.py:770 
    39493952#, python-format 
    39503953msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." 
    …… 
    39663969msgid "Ensure this value has at most %(max)d characters (it has %(length)d)." 
    39673970msgstr "" 
    3968 "Assegureu-vos de que el valor té com a màxim %(max)d caràcters (en té %(length)" 
    3969 "d)." 
     3971"Assegureu-vos de que el valor té com a màxim %(max)d caràcters (en té %" 
     3972"(length)d)." 
    39703973 
    39713974#: newforms/fields.py:125 
    …… 
    39733976msgid "Ensure this value has at least %(min)d characters (it has %(length)d)." 
    39743977msgstr "" 
    3975 "Assegureu-vos de que el valor té com a mínim %(min)d caràcters (en té %(length)" 
    3976 "d)." 
     3978"Assegureu-vos de que el valor té com a mínim %(min)d caràcters (en té %" 
     3979"(length)d)." 
    39773980 
    39783981#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211 
    …… 
    40364039msgid "Select a valid choice. That choice is not one of the available choices." 
    40374040msgstr "" 
    4038 "Escolliy una opció vàlida; Aquesta opció no és una de les opcions disponibles." 
     4041"Escolli una opció vàlida; Aquesta opció no és una de les opcions " 
     4042"disponibles." 
    40394043 
    40404044#: newforms/fields.py:599 

  • django/branches/gis/django/conf/locale/it/LC_MESSAGES/django.po

    r7279 r7540  
    11# translation of django.po to Italiano 
     2# Nicola Larosa <nico@tekNico.net>, 2008. 
    23# Italian translation of Django. 
    34# Copyright (C) 2006 the Lawrence Journal-World 
    …… 
    56msgid "" 
    67msgstr "" 
    7 "Project-Id-Version: Django\n" 
     8"Project-Id-Version: django\n" 
    89"Report-Msgid-Bugs-To: \n" 
    9 "POT-Creation-Date: 2008-02-02 18:31+0100\n" 
    10 "PO-Revision-Date: 2008-03-02 11:40+0100\n" 
     10"POT-Creation-Date: 2008-05-18 18:39+0200\n" 
     11"PO-Revision-Date: 2008-05-18 19:13+0200\n" 
    1112"Last-Translator: Nicola Larosa <nico@tekNico.net>\n" 
    1213"Language-Team: Italiano\n" 
    …… 
    1718"Plural-Forms:  nplurals=2; plural=(n != 1);\n" 
    1819 
    19 #: conf/global_settings.py:39 
     20#: conf/global_settings.py:43 
    2021msgid "Arabic" 
    2122msgstr "Arabo" 
    2223 
    23 #: conf/global_settings.py:40 
     24#: conf/global_settings.py:44 
    2425msgid "Bengali" 
    25 msgstr "" 
    26  
    27 #: conf/global_settings.py:41 
     26msgstr "Bengali" 
     27 
     28#: conf/global_settings.py:45 
    2829msgid "Bulgarian" 
    2930msgstr "Bulgaro" 
    3031 
    31 #: conf/global_settings.py:42 
     32#: conf/global_settings.py:46 
    3233msgid "Catalan" 
    3334msgstr "Catalano" 
    3435 
    35 #: conf/global_settings.py:43 
     36#: conf/global_settings.py:47 
    3637msgid "Czech" 
    3738msgstr "Ceco" 
    3839 
    39 #: conf/global_settings.py:44 
     40#: conf/global_settings.py:48 
    4041msgid "Welsh" 
    4142msgstr "Gallese" 
    4243 
    43 #: conf/global_settings.py:45 
     44#: conf/global_settings.py:49 
    4445msgid "Danish" 
    4546msgstr "Danese" 
    4647 
    47 #: conf/global_settings.py:46 
     48#: conf/global_settings.py:50 
    4849msgid "German" 
    4950msgstr "Tedesco" 
    5051 
    51 #: conf/global_settings.py:47 
     52#: conf/global_settings.py:51 
    5253msgid "Greek" 
    5354msgstr "Greco" 
    5455 
    55 #: conf/global_settings.py:48 
     56#: conf/global_settings.py:52 
    5657msgid "English" 
    5758msgstr "Inglese" 
    5859 
    59 #: conf/global_settings.py:49 
     60#: conf/global_settings.py:53 
    6061msgid "Spanish" 
    6162msgstr "Spagnolo" 
    6263 
    63 #: conf/global_settings.py:50 
     64#: conf/global_settings.py:54 
    6465msgid "Argentinean Spanish" 
    6566msgstr "Spagnolo argentino" 
    6667 
    67 #: conf/global_settings.py:51 
     68#: conf/global_settings.py:55 
     69msgid "Basque" 
     70msgstr "Basco" 
     71 
     72#: conf/global_settings.py:56 
    6873msgid "Persian" 
    6974msgstr "Persiano" 
    7075 
    71 #: conf/global_settings.py:52 
     76#: conf/global_settings.py:57 
    7277msgid "Finnish" 
    7378msgstr "Finlandese" 
    7479 
    75 #: conf/global_settings.py:53 
     80#: conf/global_settings.py:58 
    7681msgid "French" 
    7782msgstr "Francese" 
    7883 
    79 #: conf/global_settings.py:54 
    80 msgid "Gaeilge" 
    81 msgstr "Gaelico" 
    82  
    83 #: conf/global_settings.py:55 
     84#: conf/global_settings.py:59 
     85msgid "Irish" 
     86msgstr "Irlandese" 
     87 
     88#: conf/global_settings.py:60 
    8489msgid "Galician" 
    8590msgstr "Galiziano" 
    8691 
    87 #: conf/global_settings.py:56 
     92#: conf/global_settings.py:61 
    8893msgid "Hungarian" 
    8994msgstr "Ungherese" 
    9095 
    91 #: conf/global_settings.py:57 
     96#: conf/global_settings.py:62 
    9297msgid "Hebrew" 
    9398msgstr "Ebraico" 
    9499 
    95 #: conf/global_settings.py:58 
     100#: conf/global_settings.py:63 
    96101msgid "Croatian" 
    97102msgstr "Croato" 
    98103 
    99 #: conf/global_settings.py:59 
     104#: conf/global_settings.py:64 
    100105msgid "Icelandic" 
    101106msgstr "Islandese" 
    102107 
    103 #: conf/global_settings.py:60 
     108#: conf/global_settings.py:65 
    104109msgid "Italian" 
    105110msgstr "Italiano" 
    106111 
    107 #: conf/global_settings.py:61 
     112#: conf/global_settings.py:66 
    108113msgid "Japanese" 
    109114msgstr "Giapponese" 
    110115 
    111 #: conf/global_settings.py:62 
     116#: conf/global_settings.py:67 
     117msgid "Georgian" 
     118msgstr "Georgiano" 
     119 
     120#: conf/global_settings.py:68 
    112121msgid "Korean" 
    113122msgstr "Coreano" 
    114123 
    115 #: conf/global_settings.py:63 
     124#: conf/global_settings.py:69 
    116125msgid "Khmer" 
    117 msgstr "" 
    118  
    119 #: conf/global_settings.py:64 
     126msgstr "Khmer" 
     127 
     128#: conf/global_settings.py:70 
    120129msgid "Kannada" 
    121 msgstr "" 
    122  
    123 #: conf/global_settings.py:65 
     130msgstr "Kannada" 
     131 
     132#: conf/global_settings.py:71 
    124133msgid "Latvian" 
    125134msgstr "Lettone" 
    126135 
    127 #: conf/global_settings.py:66 
     136#: conf/global_settings.py:72 
    128137msgid "Macedonian" 
    129138msgstr "Macedone" 
    130139 
    131 #: conf/global_settings.py:67 
     140#: conf/global_settings.py:73 
    132141msgid "Dutch" 
    133142msgstr "Olandese" 
    134143 
    135 #: conf/global_settings.py:68 
     144#: conf/global_settings.py:74 
    136145msgid "Norwegian" 
    137146msgstr "Norvegese" 
    138147 
    139 #: conf/global_settings.py:69 
     148#: conf/global_settings.py:75 
    140149msgid "Polish" 
    141150msgstr "Polacco" 
    142151 
    143 #: conf/global_settings.py:70 
     152#: conf/global_settings.py:76 
    144153msgid "Portugese" 
    145154msgstr "Portoghese" 
    146155 
    147 #: conf/global_settings.py:71 
    148 msgid "Brazilian" 
    149 msgstr "Brasiliano" 
    150  
    151 #: conf/global_settings.py:72 
     156#: conf/global_settings.py:77 
     157msgid "Brazilian Portuguese" 
     158msgstr "Brasiliano Portoghese" 
     159 
     160#: conf/global_settings.py:78 
    152161msgid "Romanian" 
    153162msgstr "Rumeno" 
    154163 
    155 #: conf/global_settings.py:73 
     164#: conf/global_settings.py:79 
    156165msgid "Russian" 
    157166msgstr "Russo" 
    158167 
    159 #: conf/global_settings.py:74 
     168#: conf/global_settings.py:80 
    160169msgid "Slovak" 
    161170msgstr "Slovacco" 
    162171 
    163 #: conf/global_settings.py:75 
     172#: conf/global_settings.py:81 
    164173msgid "Slovenian" 
    165174msgstr "Sloveno" 
    166175 
    167 #: conf/global_settings.py:76 
     176#: conf/global_settings.py:82 
    168177msgid "Serbian" 
    169178msgstr "Serbo" 
    170179 
    171 #: conf/global_settings.py:77 
     180#: conf/global_settings.py:83 
    172181msgid "Swedish" 
    173182msgstr "Svedese" 
    174183 
    175 #: conf/global_settings.py:78 
     184#: conf/global_settings.py:84 
    176185msgid "Tamil" 
    177 msgstr "" 
    178  
    179 #: conf/global_settings.py:79 
     186msgstr "Tamil" 
     187 
     188#: conf/global_settings.py:85 
    180189msgid "Telugu" 
    181 msgstr "" 
    182  
    183 #: conf/global_settings.py:80 
     190msgstr "Telugu" 
     191 
     192#: conf/global_settings.py:86 
    184193msgid "Turkish" 
    185194msgstr "Turco" 
    186195 
    187 #: conf/global_settings.py:81 
     196#: conf/global_settings.py:87 
    188197msgid "Ukrainian" 
    189198msgstr "Ucraino" 
    190199 
    191 #: conf/global_settings.py:82 
     200#: conf/global_settings.py:88 
    192201msgid "Simplified Chinese" 
    193202msgstr "Cinese semplificato" 
    194203 
    195 #: conf/global_settings.py:83 
     204#: conf/global_settings.py:89 
    196205msgid "Traditional Chinese" 
    197206msgstr "Cinese tradizionale" 
    …… 
    472481 
    473482#: contrib/admin/templates/admin/login.html:25 
    474 #: contrib/admin/views/decorators.py:25 
     483#: contrib/admin/views/decorators.py:31 
    475484msgid "Log in" 
    476485msgstr "Accedi" 
    …… 
    798807msgstr "Cambia la password: %s" 
    799808 
    800 #: contrib/admin/views/decorators.py:11 contrib/auth/forms.py:60 
     809#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60 
    801810msgid "" 
    802811"Please enter a correct username and password. Note that both fields are case-" 
    …… 
    806815"sensitive." 
    807816 
    808 #: contrib/admin/views/decorators.py:63 
     817#: contrib/admin/views/decorators.py:69 
    809818msgid "" 
    810819"Please log in again, because your session has expired. Don't worry: Your " 
    …… 
    814823"stati comunque salvati." 
    815824 
    816 #: contrib/admin/views/decorators.py:70 
     825#: contrib/admin/views/decorators.py:76 
    817826msgid "" 
    818827"Looks like your browser isn't configured to accept cookies. Please enable " 
    …… 
    822831"abilitati, ricaricare la pagina e riprovare." 
    823832 
    824 #: contrib/admin/views/decorators.py:84 
     833#: contrib/admin/views/decorators.py:89 
     834#, python-format 
     835msgid "Your e-mail address is not your username. Try '%s' instead." 
     836msgstr "Il nome utente non è costituito dall'indirizzo e-mail. Provare con '%s'." 
     837 
     838#: contrib/admin/views/decorators.py:93 
    825839msgid "Usernames cannot contain the '@' character." 
    826840msgstr "I nomi utente non possono contenere il carattere '@'." 
    827  
    828 #: contrib/admin/views/decorators.py:86 
    829 #, python-format 
    830 msgid "Your e-mail address is not your username. Try '%s' instead." 
    831 msgstr "Il nome utente non è costituito dall'indirizzo e-mail. Provare con '%s'." 
    832841 
    833842#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50 
    …… 
    954963msgstr "Ora" 
    955964 
    956 #: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:7 
     965#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:8 
    957966msgid "URL" 
    958967msgstr "URL" 
    …… 
    10611070msgstr "Scegli %s da modificare" 
    10621071 
    1063 #: contrib/admin/views/main.py:784 
     1072#: contrib/admin/views/main.py:765 
    10641073msgid "Database error" 
    10651074msgstr "Errore nel database" 
    …… 
    11801189#: contrib/auth/models.py:137 
    11811190msgid "" 
    1182 "Designates whether this user can log into the Django admin. Unselect this " 
     1191"Designates whether this user should be treated as active. Unselect this " 
    11831192"instead of deleting accounts." 
    11841193msgstr "" 
    1185 "Indica se l'utente può accedere all'amministrazione di Django. Deselezionare " 
     1194"Indica se l'utente debba essere considerato attivo. Deselezionare " 
    11861195"qui, piuttosto che cancellare gli account." 
    11871196 
    …… 
    15451554msgstr "Impossibile votare per se stessi" 
    15461555 
    1547 #: contrib/contenttypes/models.py:37 
     1556#: contrib/contenttypes/models.py:67 
    15481557msgid "python model class name" 
    15491558msgstr "nome della classe del modello Python" 
    15501559 
    1551 #: contrib/contenttypes/models.py:40 
     1560#: contrib/contenttypes/models.py:71 
    15521561msgid "content type" 
    15531562msgstr "content type" 
    15541563 
    1555 #: contrib/contenttypes/models.py:41 
     1564#: contrib/contenttypes/models.py:72 
    15561565msgid "content types" 
    15571566msgstr "content type" 
    15581567 
    1559 #: contrib/flatpages/models.py:8 
     1568#: contrib/flatpages/models.py:9 
    15601569msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes." 
    15611570msgstr "" 
    …… 
    15631572"iniziali e finali." 
    15641573 
    1565 #: contrib/flatpages/models.py:9 
     1574#: contrib/flatpages/models.py:10 
    15661575msgid "title" 
    15671576msgstr "titolo" 
    15681577 
    1569 #: contrib/flatpages/models.py:10 
     1578#: contrib/flatpages/models.py:11 
    15701579msgid "content" 
    15711580msgstr "contenuto" 
    15721581 
    1573 #: contrib/flatpages/models.py:11 
     1582#: contrib/flatpages/models.py:12 
    15741583msgid "enable comments" 
    15751584msgstr "abilita commenti" 
    15761585 
    1577 #: contrib/flatpages/models.py:12 
     1586#: contrib/flatpages/models.py:13 
    15781587msgid "template name" 
    15791588msgstr "nome modello" 
    15801589 
    1581 #: contrib/flatpages/models.py:13 
     1590#: contrib/flatpages/models.py:14 
    15821591msgid "" 
    15831592"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " 
    …… 
    15871596"'flatpages/default.html'." 
    15881597 
    1589 #: contrib/flatpages/models.py:14 
     1598#: contrib/flatpages/models.py:15 
    15901599msgid "registration required" 
    15911600msgstr "registrazione obbligatoria" 
    15921601 
    1593 #: contrib/flatpages/models.py:14 
     1602#: contrib/flatpages/models.py:15 
    15941603msgid "If this is checked, only logged-in users will be able to view the page." 
    15951604msgstr "" 
    …… 
    15971606"vedere la pagina." 
    15981607 
    1599 #: contrib/flatpages/models.py:18 
     1608#: contrib/flatpages/models.py:20 
    16001609msgid "flat page" 
    16011610msgstr "pagina statica" 
    16021611 
    1603 #: contrib/flatpages/models.py:19 
     1612#: contrib/flatpages/models.py:21 
    16041613msgid "flat pages" 
    16051614msgstr "pagine statiche" 
    16061615 
    1607 #: contrib/humanize/templatetags/humanize.py:20 
     1616#: contrib/flatpages/models.py:27 
     1617msgid "Advanced options" 
     1618msgstr "Opzioni avanzate" 
     1619 
     1620#: contrib/humanize/templatetags/humanize.py:19 
    16081621msgid "th" 
    16091622msgstr "º" 
    16101623 
    1611 #: contrib/humanize/templatetags/humanize.py:20 
     1624#: contrib/humanize/templatetags/humanize.py:19 
    16121625msgid "st" 
    16131626msgstr "º" 
    16141627 
    1615 #: contrib/humanize/templatetags/humanize.py:20 
     1628#: contrib/humanize/templatetags/humanize.py:19 
    16161629msgid "nd" 
    16171630msgstr "º" 
    16181631 
    1619 #: contrib/humanize/templatetags/humanize.py:20 
     1632#: contrib/humanize/templatetags/humanize.py:19 
    16201633msgid "rd" 
    16211634msgstr "º" 
    16221635 
    1623 #: contrib/humanize/templatetags/humanize.py:52 
     1636#: contrib/humanize/templatetags/humanize.py:51 
    16241637#, python-format 
    16251638msgid "%(value).1f million" 
    …… 
    16281641msgstr[1] "%(value).1f milioni" 
    16291642 
    1630 #: contrib/humanize/templatetags/humanize.py:55 
     1643#: contrib/humanize/templatetags/humanize.py:54 
    16311644#, python-format 
    16321645msgid "%(value).1f billion" 
    …… 
    16351648msgstr[1] "%(value).1f miliardi" 
    16361649 
    1637 #: contrib/humanize/templatetags/humanize.py:58 
     1650#: contrib/humanize/templatetags/humanize.py:57 
    16381651#, python-format 
    16391652msgid "%(value).1f trillion" 
    …… 
    16421655msgstr[1] "%(value).1f migliaia di miliardi" 
    16431656 
    1644 #: contrib/humanize/templatetags/humanize.py:74 
     1657#: contrib/humanize/templatetags/humanize.py:73 
    16451658msgid "one" 
    16461659msgstr "uno" 
    16471660 
    1648 #: contrib/humanize/templatetags/humanize.py:74 
     1661#: contrib/humanize/templatetags/humanize.py:73 
    16491662msgid "two" 
    16501663msgstr "due" 
    16511664 
    1652 #: contrib/humanize/templatetags/humanize.py:74 
     1665#: contrib/humanize/templatetags/humanize.py:73 
    16531666msgid "three" 
    16541667msgstr "tre" 
    16551668 
    1656 #: contrib/humanize/templatetags/humanize.py:74 
     1669#: contrib/humanize/templatetags/humanize.py:73 
    16571670msgid "four" 
    16581671msgstr "quattro" 
    16591672 
    1660 #: contrib/humanize/templatetags/humanize.py:74 
     1673#: contrib/humanize/templatetags/humanize.py:73 
    16611674msgid "five" 
    16621675msgstr "cinque" 
    16631676 
    1664 #: contrib/humanize/templatetags/humanize.py:74 
     1677#: contrib/humanize/templatetags/humanize.py:73 
    16651678msgid "six" 
    16661679msgstr "sei" 
    16671680 
    1668 #: contrib/humanize/templatetags/humanize.py:74 
     1681#: contrib/humanize/templatetags/humanize.py:73 
    16691682msgid "seven" 
    16701683msgstr "sette" 
    16711684 
    1672 #: contrib/humanize/templatetags/humanize.py:74 
     1685#: contrib/humanize/templatetags/humanize.py:73 
    16731686msgid "eight" 
    16741687msgstr "otto" 
    16751688 
    1676 #: contrib/humanize/templatetags/humanize.py:74 
     1689#: contrib/humanize/templatetags/humanize.py:73 
    16771690msgid "nine" 
    16781691msgstr "nove" 
    16791692 
    1680 #: contrib/humanize/templatetags/humanize.py:94 
     1693#: contrib/humanize/templatetags/humanize.py:93 
    16811694msgid "today" 
    16821695msgstr "oggi" 
    16831696 
    1684 #: contrib/humanize/templatetags/humanize.py:96 
     1697#: contrib/humanize/templatetags/humanize.py:95 
    16851698msgid "tomorrow" 
    16861699msgstr "domani" 
    16871700 
    1688 #: contrib/humanize/templatetags/humanize.py:98 
     1701#: contrib/humanize/templatetags/humanize.py:97 
    16891702msgid "yesterday" 
    16901703msgstr "ieri" 
    16911704 
    1692 #: contrib/localflavor/ar/forms.py:28 
     1705#: contrib/localflavor/ar/forms.py:27 
    16931706msgid "Enter a postal code in the format NNNN or ANNNNAAA." 
    16941707msgstr "Inserire un codice postale nel formato NNNN o ANNNNAAA." 
    16951708 
    1696 #: contrib/localflavor/ar/forms.py:50 contrib/localflavor/br/forms.py:96 
     1709#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96 
    16971710#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23 
    16981711#: contrib/localflavor/pe/forms.py:51 
    …… 
    17001713msgstr "In questo campo possono essere solo presenti numeri." 
    17011714 
    1702 #: contrib/localflavor/ar/forms.py:51 
     1715#: contrib/localflavor/ar/forms.py:50 
    17031716msgid "This field requires 7 or 8 digits." 
    17041717msgstr "Questo campo richiede 7 o 8 cifre." 
    17051718 
    1706 #: contrib/localflavor/ar/forms.py:80 
     1719#: contrib/localflavor/ar/forms.py:79 
    17071720msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format." 
    17081721msgstr "Inserire un CUIT valido nel formato XX-XXXXXXXX-X o XXXXXXXXXXXX." 
    17091722 
    1710 #: contrib/localflavor/ar/forms.py:81 
     1723#: contrib/localflavor/ar/forms.py:80 
    17111724msgid "Invalid CUIT." 
    17121725msgstr "CUIT non valido." 
    …… 
    17281741"Select a valid brazilian state. That state is not one of the available " 
    17291742"states." 
    1730 msgstr "Scegliere uno stato brasiliano valido. Questo stato non è uno di quelli disponibili." 
     1743msgstr "" 
     1744"Scegliere uno stato brasiliano valido. Questo stato non è uno di quelli " 
     1745"disponibili." 
    17311746 
    17321747#: contrib/localflavor/br/forms.py:94 
    …… 
    17441759#: contrib/localflavor/br/forms.py:136 
    17451760msgid "This field requires at least 14 digits" 
    1746 msgstr "Questo campo richiede almeno 14 cifre." 
     1761msgstr "Questo campo richiede almeno 14 cifre" 
    17471762 
    17481763#: contrib/localflavor/ca/forms.py:17 
    …… 
    17531768msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format." 
    17541769msgstr "" 
    1755 "Inserire un numero di assicurazione sociale canadese valido, nel formato " 
    1756 "XXX-XXX-XXX." 
     1770"Inserire un numero di assicurazione sociale canadese valido, nel formato XXX-" 
     1771"XXX-XXX." 
    17571772 
    17581773#: contrib/localflavor/ch/ch_states.py:5 
    17591774msgid "Aargau" 
    1760 msgstr "" 
     1775msgstr "Aargau" 
    17611776 
    17621777#: contrib/localflavor/ch/ch_states.py:6 
    17631778msgid "Appenzell Innerrhoden" 
    1764 msgstr "" 
     1779msgstr "Appenzell Innerrhoden" 
    17651780 
    17661781#: contrib/localflavor/ch/ch_states.py:7 
    17671782msgid "Appenzell Ausserrhoden" 
    1768 msgstr "" 
     1783msgstr "Appenzell Ausserrhoden" 
    17691784 
    17701785#: contrib/localflavor/ch/ch_states.py:8 
    17711786msgid "Basel-Stadt" 
    1772 msgstr "" 
     1787msgstr "Basel-Stadt" 
    17731788 
    17741789#: contrib/localflavor/ch/ch_states.py:9 
    17751790msgid "Basel-Land" 
    1776 msgstr "" 
     1791msgstr "Basel-Land" 
    17771792 
    17781793#: contrib/localflavor/ch/ch_states.py:10 
    …… 
    17901805#: contrib/localflavor/ch/ch_states.py:13 
    17911806msgid "Glarus" 
    1792 msgstr "" 
     1807msgstr "Glarus" 
    17931808 
    17941809#: contrib/localflavor/ch/ch_states.py:14 
    17951810msgid "Graubuenden" 
    1796 msgstr "" 
     1811msgstr "Graubuenden" 
    17971812 
    17981813#: contrib/localflavor/ch/ch_states.py:15 
    17991814msgid "Jura" 
    1800 msgstr "" 
     1815msgstr "Jura" 
    18011816 
    18021817#: contrib/localflavor/ch/ch_states.py:16 
    …… 
    18061821#: contrib/localflavor/ch/ch_states.py:17 
    18071822msgid "Neuchatel" 
    1808 msgstr "" 
     1823msgstr "Neuchatel" 
    18091824 
    18101825#: contrib/localflavor/ch/ch_states.py:18 
    18111826msgid "Nidwalden" 
    1812 msgstr "" 
     1827msgstr "Nidwalden" 
    18131828 
    18141829#: contrib/localflavor/ch/ch_states.py:19 
    18151830msgid "Obwalden" 
    1816 msgstr "" 
     1831msgstr "Obwalden" 
    18171832 
    18181833#: contrib/localflavor/ch/ch_states.py:20 
    18191834msgid "Schaffhausen" 
    1820 msgstr "" 
     1835msgstr "Schaffhausen" 
    18211836 
    18221837#: contrib/localflavor/ch/ch_states.py:21 
    18231838msgid "Schwyz" 
    1824 msgstr "" 
     1839msgstr "Schwyz" 
    18251840 
    18261841#: contrib/localflavor/ch/ch_states.py:22 
    18271842msgid "Solothurn" 
    1828 msgstr "" 
     1843msgstr "Solothurn" 
    18291844 
    18301845#: contrib/localflavor/ch/ch_states.py:23 
    18311846msgid "St. Gallen" 
    1832 msgstr "" 
     1847msgstr "St. Gallen" 
    18331848 
    18341849#: contrib/localflavor/ch/ch_states.py:24 
    18351850msgid "Thurgau" 
    1836 msgstr "" 
     1851msgstr "Thurgau" 
    18371852 
    18381853#: contrib/localflavor/ch/ch_states.py:25 
    18391854msgid "Ticino" 
    1840 msgstr "" 
     1855msgstr "Ticino" 
    18411856 
    18421857#: contrib/localflavor/ch/ch_states.py:26 
    18431858msgid "Uri" 
    1844 msgstr "" 
     1859msgstr "Uri" 
    18451860 
    18461861#: contrib/localflavor/ch/ch_states.py:27 
    18471862msgid "Valais" 
    1848 msgstr "" 
     1863msgstr "Valais" 
    18491864 
    18501865#: contrib/localflavor/ch/ch_states.py:28 
    18511866msgid "Vaud" 
    1852 msgstr "" 
     1867msgstr "Vaud" 
    18531868 
    18541869#: contrib/localflavor/ch/ch_states.py:29 
    18551870msgid "Zug" 
    1856 msgstr "" 
     1871msgstr "Zug" 
    18571872 
    18581873#: contrib/localflavor/ch/ch_states.py:30 
    …… 
    18861901#: contrib/localflavor/de/de_states.py:5 
    18871902msgid "Baden-Wuerttemberg" 
    1888 msgstr "" 
     1903msgstr "Baden-Wuerttemberg" 
    18891904 
    18901905#: contrib/localflavor/de/de_states.py:6 
    …… 
    19101925#: contrib/localflavor/de/de_states.py:11 
    19111926msgid "Hessen" 
    1912 msgstr "" 
     1927msgstr "Hessen" 
    19131928 
    19141929#: contrib/localflavor/de/de_states.py:12 
    19151930msgid "Mecklenburg-Western Pomerania" 
    1916 msgstr "" 
     1931msgstr "Mecklenburg-Pomerania Ovest" 
    19171932 
    19181933#: contrib/localflavor/de/de_states.py:13 
    …… 
    19221937#: contrib/localflavor/de/de_states.py:14 
    19231938msgid "North Rhine-Westphalia" 
    1924 msgstr "" 
     1939msgstr "Reno Nord-Wesfalia" 
    19251940 
    19261941#: contrib/localflavor/de/de_states.py:15 
    19271942msgid "Rhineland-Palatinate" 
    1928 msgstr "" 
     1943msgstr "Rhineland-Palatinate" 
    19291944 
    19301945#: contrib/localflavor/de/de_states.py:16 
    19311946msgid "Saarland" 
    1932 msgstr "" 
     1947msgstr "Saarland" 
    19331948 
    19341949#: contrib/localflavor/de/de_states.py:17 
    …… 
    19381953#: contrib/localflavor/de/de_states.py:18 
    19391954msgid "Saxony-Anhalt" 
    1940 msgstr "" 
     1955msgstr "Saxony-Anhalt" 
    19411956 
    19421957#: contrib/localflavor/de/de_states.py:19 
    19431958msgid "Schleswig-Holstein" 
    1944 msgstr "" 
     1959msgstr "Schleswig-Holstein" 
    19451960 
    19461961#: contrib/localflavor/de/de_states.py:20 
    19471962msgid "Thuringia" 
    1948 msgstr "" 
     1963msgstr "Thuringia" 
    19491964 
    19501965#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12 
    …… 
    19631978#: contrib/localflavor/es/es_provinces.py:5 
    19641979msgid "Arava" 
    1965 msgstr "" 
     1980msgstr "Arava" 
    19661981 
    19671982#: contrib/localflavor/es/es_provinces.py:6 
    19681983msgid "Albacete"