Django

Code

Changeset 6954

Show
Ignore:
Timestamp:
12/18/07 23:08:37 (1 year ago)
Author:
mtredinnick
Message:

queryset-refactor: Merged from trunk up to [6953].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/queryset-refactor/AUTHORS

    r6896 r6954  
    131131    Eric Floehr <eric@intellovations.com> 
    132132    Vincent Foley <vfoleybourgon@yahoo.ca> 
     133    Rudolph Froger <rfroger@estrate.nl> 
    133134    Jorge Gajon <gajon@gajon.org> 
    134135    gandalf@owca.info 
     
    301302    Vasiliy Stavenko <stavenko@gmail.com> 
    302303    Thomas Steinacher <http://www.eggdrop.ch/> 
     304    Johan C. Stöver <johan@nilling.nl> 
    303305    nowell strite 
    304306    Thomas Stromberg <tstromberg@google.com> 
     
    328330    Amit Upadhyay 
    329331    Geert Vanderkelen 
     332    I.S. van Oostveen <v.oostveen@idca.nl> 
    330333    viestards.lists@gmail.com 
    331334    George Vilches <gav@thataddress.com> 
  • django/branches/queryset-refactor/django/conf/__init__.py

    r6857 r6954  
    5353                raise KeyError 
    5454        except KeyError: 
    55             raise ImportError, "Environment variable %s is undefined so settings cannot be imported." % ENVIRONMENT_VARIABLE   # NOTE: This is arguably an EnvironmentError, but that causes problems with Python's interactive help 
     55            # NOTE: This is arguably an EnvironmentError, but that causes 
     56            # problems with Python's interactive help. 
     57            raise ImportError("Settings cannot be imported, because environment variable %s is undefined." % ENVIRONMENT_VARIABLE) 
    5658 
    5759        self._target = Settings(settings_module) 
  • django/branches/queryset-refactor/django/conf/locale/ca/LC_MESSAGES/django.po

    r6690 r6954  
    66"Project-Id-Version: django\n" 
    77"Report-Msgid-Bugs-To: \n" 
    8 "POT-Creation-Date: 2007-11-05 17:33+0100\n" 
    9 "PO-Revision-Date: 2007-11-05 17:34+0100\n" 
    10 "Last-Translator: Marc Garcia <marc.garcia@accopensys.com>\n" 
     8"POT-Creation-Date: 2007-12-02 22:26+0100\n" 
     9"PO-Revision-Date: 2007-12-02 22:32+0100\n" 
     10"Last-Translator: Marc Fargas <telenieko@telenieko.com>\n" 
    1111"Language-Team:  <es@li.org>\n" 
    1212"MIME-Version: 1.0\n" 
     
    195195msgstr "Xinés tradicional" 
    196196 
    197 #: contrib/admin/filterspecs.py:42 
     197#: contrib/admin/filterspecs.py:44 
    198198#, python-format 
    199199msgid "" 
     
    204204"<ul>\n" 
    205205 
    206 #: contrib/admin/filterspecs.py:72 contrib/admin/filterspecs.py:90 
    207 #: contrib/admin/filterspecs.py:145 contrib/admin/filterspecs.py:171 
     206#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92 
     207#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 
    208208msgid "All" 
    209209msgstr "Tots" 
    210210 
    211 #: contrib/admin/filterspecs.py:111 
     211#: contrib/admin/filterspecs.py:113 
    212212msgid "Any date" 
    213213msgstr "Qualsevol data" 
    214214 
    215 #: contrib/admin/filterspecs.py:112 
     215#: contrib/admin/filterspecs.py:114 
    216216msgid "Today" 
    217217msgstr "Avui" 
    218218 
    219 #: contrib/admin/filterspecs.py:115 
     219#: contrib/admin/filterspecs.py:117 
    220220msgid "Past 7 days" 
    221221msgstr "Últims 7 dies" 
    222222 
    223 #: contrib/admin/filterspecs.py:117 
     223#: contrib/admin/filterspecs.py:119 
    224224msgid "This month" 
    225225msgstr "Aquest mes" 
    226226 
    227 #: contrib/admin/filterspecs.py:119 
     227#: contrib/admin/filterspecs.py:121 
    228228msgid "This year" 
    229229msgstr "Aquest any" 
    230230 
    231 #: contrib/admin/filterspecs.py:145 newforms/widgets.py:22
    232 #: oldforms/__init__.py:591 
     231#: contrib/admin/filterspecs.py:147 newforms/widgets.py:23
     232#: oldforms/__init__.py:592 
    233233msgid "Yes" 
    234234msgstr "Si" 
    235235 
    236 #: contrib/admin/filterspecs.py:145 newforms/widgets.py:22
    237 #: oldforms/__init__.py:591 
     236#: contrib/admin/filterspecs.py:147 newforms/widgets.py:23
     237#: oldforms/__init__.py:592 
    238238msgid "No" 
    239239msgstr "No" 
    240240 
    241 #: contrib/admin/filterspecs.py:152 newforms/widgets.py:22
    242 #: oldforms/__init__.py:591 
     241#: contrib/admin/filterspecs.py:154 newforms/widgets.py:23
     242#: oldforms/__init__.py:592 
    243243msgid "Unknown" 
    244244msgstr "Desconegut" 
    245245 
    246 #: contrib/admin/models.py:17 
     246#: contrib/admin/models.py:18 
    247247msgid "action time" 
    248248msgstr "moment de l'acció" 
    249249 
    250 #: contrib/admin/models.py:20 
     250#: contrib/admin/models.py:21 
    251251msgid "object id" 
    252252msgstr "id del objecte" 
    253253 
    254 #: contrib/admin/models.py:21 
     254#: contrib/admin/models.py:22 
    255255msgid "object repr" 
    256256msgstr "'repr' de l'objecte" 
    257257 
    258 #: contrib/admin/models.py:22 
     258#: contrib/admin/models.py:23 
    259259msgid "action flag" 
    260260msgstr "marca de l'acció" 
    261261 
    262 #: contrib/admin/models.py:23 
     262#: contrib/admin/models.py:24 
    263263msgid "change message" 
    264264msgstr "missatge del canvi" 
    265265 
    266 #: contrib/admin/models.py:26 
     266#: contrib/admin/models.py:27 
    267267msgid "log entry" 
    268268msgstr "entrada del registre" 
    269269 
    270 #: contrib/admin/models.py:27 
     270#: contrib/admin/models.py:28 
    271271msgid "log entries" 
    272272msgstr "entrades del registre" 
     
    470470 
    471471#: contrib/admin/templates/admin/login.html:25 
    472 #: contrib/admin/views/decorators.py:24 
     472#: contrib/admin/views/decorators.py:25 
    473473msgid "Log in" 
    474474msgstr "Iniciar sessió" 
     
    770770msgstr "Modificar:" 
    771771 
    772 #: contrib/admin/templatetags/admin_list.py:254 
     772#: contrib/admin/templatetags/admin_list.py:257 
    773773msgid "All dates" 
    774774msgstr "Totes les dates" 
    775775 
    776 #: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:264 
     776#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267 
    777777#, python-format 
    778778msgid "The %(name)s \"%(obj)s\" was added successfully." 
    779779msgstr "El/la %(name)s \"%(obj)s\".ha estat agregat/da amb èxit." 
    780780 
    781 #: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:268 
    782 #: contrib/admin/views/main.py:354 
     781#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271 
     782#: contrib/admin/views/main.py:356 
    783783msgid "You may edit it again below." 
    784784msgstr "Pot editar-lo de nou abaix." 
     
    797797msgstr "Canviar clau: %s" 
    798798 
    799 #: contrib/admin/views/decorators.py:10 contrib/auth/forms.py:60 
     799#: contrib/admin/views/decorators.py:11 contrib/auth/forms.py:60 
    800800msgid "" 
    801801"Please enter a correct username and password. Note that both fields are case-" 
     
    805805"compte que tots dos camps son sensibles a majúscules i minúscules." 
    806806 
    807 #: contrib/admin/views/decorators.py:62 
     807#: contrib/admin/views/decorators.py:63 
    808808msgid "" 
    809809"Please log in again, because your session has expired. Don't worry: Your " 
     
    813813"preocupi, el seu enviament està emmagatzemat." 
    814814 
    815 #: contrib/admin/views/decorators.py:69 
     815#: contrib/admin/views/decorators.py:70 
    816816msgid "" 
    817817"Looks like your browser isn't configured to accept cookies. Please enable " 
     
    822822"pàgina i provi-ho de nou. " 
    823823 
    824 #: contrib/admin/views/decorators.py:83 
     824#: contrib/admin/views/decorators.py:84 
    825825msgid "Usernames cannot contain the '@' character." 
    826826msgstr "Els noms d'usuari no poden contenir el caracter '@'." 
    827827 
    828 #: contrib/admin/views/decorators.py:85 
     828#: contrib/admin/views/decorators.py:86 
    829829#, python-format 
    830830msgid "Your e-mail address is not your username. Try '%s' instead." 
     
    832832"La seva adreça de correu no és el seu nom d'usuari. Provi '%s' en tot cas." 
    833833 
    834 #: contrib/admin/views/doc.py:47 contrib/admin/views/doc.py:49 
    835 #: contrib/admin/views/doc.py:51 
     834#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50 
     835#: contrib/admin/views/doc.py:52 
    836836msgid "tag:" 
    837837msgstr "etiqueta:" 
    838838 
    839 #: contrib/admin/views/doc.py:78 contrib/admin/views/doc.py:80 
    840 #: contrib/admin/views/doc.py:82 
     839#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81 
     840#: contrib/admin/views/doc.py:83 
    841841msgid "filter:" 
    842842msgstr "filtre:" 
    843843 
    844 #: contrib/admin/views/doc.py:136 contrib/admin/views/doc.py:138 
    845 #: contrib/admin/views/doc.py:140 
     844#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139 
     845#: contrib/admin/views/doc.py:141 
    846846msgid "view:" 
    847847msgstr "vista:" 
    848848 
    849 #: contrib/admin/views/doc.py:165 
     849#: contrib/admin/views/doc.py:166 
    850850#, python-format 
    851851msgid "App %r not found" 
    852852msgstr "La aplicació %r no s'ha pogut trobar" 
    853853 
    854 #: contrib/admin/views/doc.py:172 
     854#: contrib/admin/views/doc.py:173 
    855855#, python-format 
    856856msgid "Model %(name)r not found in app %(label)r" 
    857857msgstr "El model %(name)r no s'ha trobat en la aplicació %(label)r" 
    858858 
    859 #: contrib/admin/views/doc.py:184 
     859#: contrib/admin/views/doc.py:185 
    860860#, python-format 
    861861msgid "the related `%(label)s.%(type)s` object" 
    862862msgstr "el objecte relacionat `%(label)s.%(type)s`" 
    863863 
    864 #: contrib/admin/views/doc.py:184 contrib/admin/views/doc.py:206 
    865 #: contrib/admin/views/doc.py:220 contrib/admin/views/doc.py:225 
     864#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207 
     865#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226 
    866866msgid "model:" 
    867867msgstr "model:" 
    868868 
    869 #: contrib/admin/views/doc.py:215 
     869#: contrib/admin/views/doc.py:216 
    870870#, python-format 
    871871msgid "related `%(label)s.%(name)s` objects" 
    872872msgstr "objectes relacionats `%(label)s.%(name)s`" 
    873873 
    874 #: contrib/admin/views/doc.py:220 
     874#: contrib/admin/views/doc.py:221 
    875875#, python-format 
    876876msgid "all %s" 
    877877msgstr "tots %s" 
    878878 
    879 #: contrib/admin/views/doc.py:225 
     879#: contrib/admin/views/doc.py:226 
    880880#, python-format 
    881881msgid "number of %s" 
    882882msgstr "nombre de %s" 
    883883 
    884 #: contrib/admin/views/doc.py:230 
     884#: contrib/admin/views/doc.py:231 
    885885#, python-format 
    886886msgid "Fields on %s objects" 
    887887msgstr "Camps en objectes %s" 
    888888 
    889 #: contrib/admin/views/doc.py:292 contrib/admin/views/doc.py:303 
    890 #: contrib/admin/views/doc.py:305 contrib/admin/views/doc.py:311 
    891 #: contrib/admin/views/doc.py:312 contrib/admin/views/doc.py:314 
     889#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304 
     890#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312 
     891#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315 
    892892msgid "Integer" 
    893893msgstr "Enter" 
    894894 
    895 #: contrib/admin/views/doc.py:293 
     895#: contrib/admin/views/doc.py:294 
    896896msgid "Boolean (Either True or False)" 
    897897msgstr "Booleà (Verdader o Fals)" 
    898898 
    899 #: contrib/admin/views/doc.py:294 contrib/admin/views/doc.py:313 
     899#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314 
    900900#, python-format 
    901901msgid "String (up to %(max_length)s)" 
    902902msgstr "Cadena (de fins a %(max_length)s)" 
    903903 
    904 #: contrib/admin/views/doc.py:295 
     904#: contrib/admin/views/doc.py:296 
    905905msgid "Comma-separated integers" 
    906906msgstr "Enters separats per comes" 
    907907 
    908 #: contrib/admin/views/doc.py:296 
     908#: contrib/admin/views/doc.py:297 
    909909msgid "Date (without time)" 
    910910msgstr "Data (sense hora)" 
    911911 
    912 #: contrib/admin/views/doc.py:297 
     912#: contrib/admin/views/doc.py:298 
    913913msgid "Date (with time)" 
    914914msgstr "Data (amb hora)" 
    915915 
    916 #: contrib/admin/views/doc.py:298 
     916#: contrib/admin/views/doc.py:299 
    917917msgid "Decimal number" 
    918918msgstr "Número decimal" 
    919919 
    920 #: contrib/admin/views/doc.py:299 
     920#: contrib/admin/views/doc.py:300 
    921921msgid "E-mail address" 
    922922msgstr "Adreça de correu electrònic" 
    923923 
    924 #: contrib/admin/views/doc.py:300 contrib/admin/views/doc.py:301 
    925 #: contrib/admin/views/doc.py:304 
     924#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302 
     925#: contrib/admin/views/doc.py:305 
    926926msgid "File path" 
    927927msgstr "Ruta del fitxer" 
    928928 
    929 #: contrib/admin/views/doc.py:302 
     929#: contrib/admin/views/doc.py:303 
    930930msgid "Floating point number" 
    931931msgstr "Número amb punt de coma flotant" 
    932932 
    933 #: contrib/admin/views/doc.py:306 contrib/comments/models.py:85 
     933#: contrib/admin/views/doc.py:307 contrib/comments/models.py:85 
    934934msgid "IP address" 
    935935msgstr "Adreça IP" 
    936936 
    937 #: contrib/admin/views/doc.py:308 
     937#: contrib/admin/views/doc.py:309 
    938938msgid "Boolean (Either True, False or None)" 
    939939msgstr "Booleà (Verdader, Fals o 'None' (cap))" 
    940940 
    941 #: contrib/admin/views/doc.py:309 
     941#: contrib/admin/views/doc.py:310 
    942942msgid "Relation to parent model" 
    943943msgstr "Relació amb el model pare" 
    944944 
    945 #: contrib/admin/views/doc.py:310 
     945#: contrib/admin/views/doc.py:311 
    946946msgid "Phone number" 
    947947msgstr "Número de telèfon" 
    948948 
    949 #: contrib/admin/views/doc.py:315 
     949#: contrib/admin/views/doc.py:316 
    950950msgid "Text" 
    951951msgstr "Texte" 
    952952 
    953 #: contrib/admin/views/doc.py:316 
     953#: contrib/admin/views/doc.py:317 
    954954msgid "Time" 
    955955msgstr "Hora" 
    956956 
    957 #: contrib/admin/views/doc.py:317 contrib/flatpages/models.py:7 
     957#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:7 
    958958msgid "URL" 
    959959msgstr "URL" 
    960960 
    961 #: contrib/admin/views/doc.py:318 
     961#: contrib/admin/views/doc.py:319 
    962962msgid "U.S. state (two uppercase letters)" 
    963963msgstr "Estat dels E.U.A. (dos lletres majúscules)" 
    964964 
    965 #: contrib/admin/views/doc.py:319 
     965#: contrib/admin/views/doc.py:320 
    966966msgid "XML text" 
    967967msgstr "Texte XML" 
    968968 
    969 #: contrib/admin/views/doc.py:345 
     969#: contrib/admin/views/doc.py:346 
    970970#, python-format 
    971971msgid "%s does not appear to be a urlpattern object" 
    972972msgstr "%s no sembla ser un objecte 'urlpattern'" 
    973973 
    974 #: contrib/admin/views/main.py:230 
     974#: contrib/admin/views/main.py:233 
    975975msgid "Site administration" 
    976976msgstr "Lloc administratiu" 
    977977 
    978 #: contrib/admin/views/main.py:278 contrib/admin/views/main.py:363 
     978#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365 
    979979#, python-format 
    980980msgid "You may add another %s below." 
    981981msgstr "Pot afegir un altre %s a baix." 
    982982 
    983 #: contrib/admin/views/main.py:296 
     983#: contrib/admin/views/main.py:298 
    984984#, python-format 
    985985msgid "Add %s" 
    986986msgstr "Afegir %s" 
    987987 
    988 #: contrib/admin/views/main.py:342 
     988#: contrib/admin/views/main.py:344 
    989989#, python-format 
    990990msgid "Added %s." 
    991991msgstr "Agregat %s." 
    992992 
    993 #: contrib/admin/views/main.py:342 contrib/admin/views/main.py:344 
    994 #: contrib/admin/views/main.py:346 core/validators.py:283 
     993#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346 
     994#: contrib/admin/views/main.py:348 core/validators.py:283 
    995995#: db/models/manipulators.py:309 
    996996msgid "and" 
    997997msgstr "i" 
    998998 
    999 #: contrib/admin/views/main.py:344 
     999#: contrib/admin/views/main.py:346 
    10001000#, python-format 
    10011001msgid "Changed %s." 
    10021002msgstr "Modificat %s." 
    10031003 
    1004 #: contrib/admin/views/main.py:346 
     1004#: contrib/admin/views/main.py:348 
    10051005#, python-format 
    10061006msgid "Deleted %s." 
    10071007msgstr "Eliminat %s." 
    10081008 
    1009 #: contrib/admin/views/main.py:349 
     1009#: contrib/admin/views/main.py:351 
    10101010msgid "No fields changed." 
    10111011msgstr "Cap camp canviat." 
    10121012 
    1013 #: contrib/admin/views/main.py:352 
     1013#: contrib/admin/views/main.py:354 
    10141014#, python-format 
    10151015msgid "The %(name)s \"%(obj)s\" was changed successfully." 
    10161016msgstr "S'ha modificat amb èxist el/la %(name)s \"%(obj)s." 
    10171017 
    1018 #: contrib/admin/views/main.py:360 
     1018#: contrib/admin/views/main.py:362 
    10191019#, python-format 
    10201020msgid "" 
     
    10231023"S'ha agregat amb èxit el/la %(name)s \"%(obj)s\". Pot editar-lo de nou abaix." 
    10241024 
    1025 #: contrib/admin/views/main.py:398 
     1025#: contrib/admin/views/main.py:400 
    10261026#, python-format 
    10271027msgid "Change %s" 
    10281028msgstr "Modificar %s" 
    10291029 
    1030 #: contrib/admin/views/main.py:483 
     1030#: contrib/admin/views/main.py:487 
    10311031#, python-format 
    10321032msgid "One or more %(fieldname)s in %(name)s: %(obj)s" 
    10331033msgstr "Un o més %(fieldname)s en %(name)s: %(obj)s" 
    10341034 
    1035 #: contrib/admin/views/main.py:488 
     1035#: contrib/admin/views/main.py:492 
    10361036#, python-format 
    10371037msgid "One or more %(fieldname)s in %(name)s:" 
    10381038msgstr "Un o més %(fieldname)s en %(name)s:" 
    10391039 
    1040 #: contrib/admin/views/main.py:520 
     1040#: contrib/admin/views/main.py:524 
    10411041#, python-format 
    10421042msgid "The %(name)s \"%(obj)s\" was deleted successfully." 
    10431043msgstr "El/la %(name)s \"%(obj)s\".ha estat eliminat amb èxit." 
    10441044 
    1045 #: contrib/admin/views/main.py:523 
     1045#: contrib/admin/views/main.py:527 
    10461046msgid "Are you sure?" 
    10471047msgstr "Està segur?" 
    10481048 
    1049 #: contrib/admin/views/main.py:545 
     1049#: contrib/admin/views/main.py:549 
    10501050#, python-format 
    10511051msgid "Change history: %s" 
    10521052msgstr "Modificar històric: %s" 
    10531053 
    1054 #: contrib/admin/views/main.py:579 
     1054#: contrib/admin/views/main.py:583 
    10551055#, python-format 
    10561056msgid "Select %s" 
    10571057msgstr "Seleccioni %s" 
    10581058 
    1059 #: contrib/admin/views/main.py:579 
     1059#: contrib/admin/views/main.py:583 
    10601060#, python-format 
    10611061msgid "Select %s to change" 
    10621062msgstr "Seleccioni %s per modificar" 
    10631063 
    1064 #: contrib/admin/views/main.py:780 
     1064#: contrib/admin/views/main.py:784 
    10651065msgid "Database error" 
    10661066msgstr "Error de/en la base de dades" 
     
    16231623msgstr "r" 
    16241624 
    1625 #: contrib/humanize/templatetags/humanize.py:50 
     1625#: contrib/humanize/templatetags/humanize.py:52 
    16261626#, python-format 
    16271627msgid "%(value).1f million" 
     
    16301630msgstr[1] "%(value).1f  milions" 
    16311631 
    1632 #: contrib/humanize/templatetags/humanize.py:53 
     1632#: contrib/humanize/templatetags/humanize.py:55 
    16331633#, python-format 
    16341634msgid "%(value).1f billion" 
     
    16371637msgstr[1] "%(value).1f bilions" 
    16381638 
    1639 #: contrib/humanize/templatetags/humanize.py:56 
     1639#: contrib/humanize/templatetags/humanize.py:58 
    16401640#, python-format 
    16411641msgid "%(value).1f trillion" 
     
    16441644msgstr[1] "%(value).1f trilions" 
    16451645 
    1646 #: contrib/humanize/templatetags/humanize.py:71 
     1646#: contrib/humanize/templatetags/humanize.py:74 
    16471647msgid "one" 
    16481648msgstr "un" 
    16491649 
    1650 #: contrib/humanize/templatetags/humanize.py:71 
     1650#: contrib/humanize/templatetags/humanize.py:74 
    16511651msgid "two" 
    16521652msgstr "dos" 
    16531653 
    1654 #: contrib/humanize/templatetags/humanize.py:71 
     1654#: contrib/humanize/templatetags/humanize.py:74 
    16551655msgid "three" 
    16561656msgstr "tres" 
    16571657 
    1658 #: contrib/humanize/templatetags/humanize.py:71 
     1658#: contrib/humanize/templatetags/humanize.py:74 
    16591659msgid "four" 
    16601660msgstr "cuatre" 
    16611661 
    1662 #: contrib/humanize/templatetags/humanize.py:71 
     1662#: contrib/humanize/templatetags/humanize.py:74 
    16631663msgid "five" 
    16641664msgstr "cinc" 
    16651665 
    1666 #: contrib/humanize/templatetags/humanize.py:71 
     1666#: contrib/humanize/templatetags/humanize.py:74 
    16671667msgid "six" 
    16681668msgstr "sis" 
    16691669 
    1670 #: contrib/humanize/templatetags/humanize.py:71 
     1670#: contrib/humanize/templatetags/humanize.py:74 
    16711671msgid "seven" 
    16721672msgstr "set" 
    16731673 
    1674 #: contrib/humanize/templatetags/humanize.py:71 
     1674#: contrib/humanize/templatetags/humanize.py:74 
    16751675msgid "eight" 
    16761676msgstr "vuit" 
    16771677 
    1678 #: contrib/humanize/templatetags/humanize.py:71 
     1678#: contrib/humanize/templatetags/humanize.py:74 
    16791679msgid "nine" 
    16801680msgstr "nou" 
    16811681 
    1682 #: contrib/humanize/templatetags/humanize.py:90 
     1682#: contrib/humanize/templatetags/humanize.py:94 
    16831683msgid "today" 
    16841684msgstr "avui" 
    16851685 
    1686 #: contrib/humanize/templatetags/humanize.py:92 
     1686#: contrib/humanize/templatetags/humanize.py:96 
    16871687msgid "tomorrow" 
    16881688msgstr "demà" 
    16891689 
    1690 #: contrib/humanize/templatetags/humanize.py:94 
     1690#: contrib/humanize/templatetags/humanize.py:98 
    16911691msgid "yesterday" 
    16921692msgstr "ahir" 
     
    30253025"XXX-XX-XXXX." 
    30263026 
     3027#: contrib/localflavor/za/forms.py:22 
     3028msgid "Enter a valid South African ID number" 
     3029msgstr "Introdueixi un número d'Identitat Sud Africà valid" 
     3030 
     3031#: contrib/localflavor/za/forms.py:57 
     3032msgid "Enter a valid South African postal code" 
     3033msgstr "Introdueixi un codi postal Sud Africà vàlid." 
     3034 
     3035#: contrib/localflavor/za/za_provinces.py:4 
     3036msgid "Eastern Cape" 
     3037msgstr "Eastern Cape" 
     3038 
     3039#: contrib/localflavor/za/za_provinces.py:5 
     3040msgid "Free State" 
     3041msgstr "Free State" 
     3042 
     3043#: contrib/localflavor/za/za_provinces.py:6 
     3044msgid "Gauteng" 
     3045msgstr "Gauteng" 
     3046 
     3047#: contrib/localflavor/za/za_provinces.py:7 
     3048msgid "KwaZulu-Natal" 
     3049msgstr "KwaZulu-Natal" 
     3050 
     3051#: contrib/localflavor/za/za_provinces.py:8 
     3052msgid "Limpopo" 
     3053msgstr "Limpopo" 
     3054 
     3055#: contrib/localflavor/za/za_provinces.py:9 
     3056msgid "Mpumalanga" 
     3057msgstr "Mpumalanga" 
     3058 
     3059#: contrib/localflavor/za/za_provinces.py:10 
     3060msgid "Northern Cape" 
     3061msgstr "Northern Cape" 
     3062 
     3063#: contrib/localflavor/za/za_provinces.py:11 
     3064msgid "North West" 
     3065msgstr "North West" 
     3066 
     3067#: contrib/localflavor/za/za_provinces.py:12 
     3068msgid "Western Cape" 
     3069msgstr "Western Cape" 
     3070 
    30273071#: contrib/redirects/models.py:7 
    30283072msgid "redirect from" 
     
    30573101msgstr "redreçaments" 
    30583102 
    3059 #: contrib/sessions/models.py:80 
     3103#: contrib/sessions/models.py:46 
    30603104msgid "session key" 
    30613105msgstr "clau de la sessió" 
    30623106 
    3063 #: contrib/sessions/models.py:81 
     3107#: contrib/sessions/models.py:47 
    30643108msgid "session data" 
    30653109msgstr "dades de la sessió" 
    30663110 
    3067 #: contrib/sessions/models.py:82 
     3111#: contrib/sessions/models.py:48 
    30683112msgid "expire date" 
    30693113msgstr "data de caducitat" 
    30703114 
    3071 #: contrib/sessions/models.py:87 
     3115#: contrib/sessions/models.py:53 
    30723116msgid "session" 
    30733117msgstr "sessió" 
    30743118 
    3075 #: contrib/sessions/models.py:88 
     3119#: contrib/sessions/models.py:54 
    30763120msgid "sessions" 
    30773121msgstr "sessions" 
     
    31423186msgstr "Aquest valor no pot contenir només dígits." 
    31433187 
    3144 #: core/validators.py:128 newforms/fields.py:157 
     3188#: core/validators.py:128 newforms/fields.py:151 
    31453189msgid "Enter a whole number." 
    31463190msgstr "Introdueixi un número sencer." 
     
    31713215msgstr "Introdueixi un data/hora vàlida en format YYYY-MM-DD HH:MM." 
    31723216 
    3173 #: core/validators.py:170 newforms/fields.py:408 
     3217#: core/validators.py:170 newforms/fields.py:402 
    31743218msgid "Enter a valid e-mail address." 
    31753219msgstr "Introdueixi una adreça de correu vàlida." 
    31763220 
    3177 #: core/validators.py:182 core/validators.py:474 newforms/fields.py:438 
    3178 #: oldforms/__init__.py:686 
     3221#: core/validators.py:182 core/validators.py:474 newforms/fields.py:432 
     3222#: oldforms/__init__.py:687 
    31793223msgid "No file was submitted. Check the encoding type on the form." 
    31803224msgstr "" 
    31813225"No s'ha enviat cap fitxer. Comprovi el tipus de codificació del formulari." 
    31823226 
    3183 #: core/validators.py:193 newforms/fields.py:462 
     3227#: core/validators.py:193 newforms/fields.py:456 
    31843228msgid "" 
    31853229"Upload a valid image. The file you uploaded was either not an image or a " 
     
    34323476#: db/models/fields/__init__.py:161 db/models/fields/__init__.py:318 
    34333477#: db/models/fields/__init__.py:735 db/models/fields/__init__.py:746 
    3434 #: newforms/fields.py:45 newforms/models.py:211 oldforms/__init__.py:373 
     3478#: newforms/fields.py:45 oldforms/__init__.py:374 
    34353479msgid "This field is required." 
    34363480msgstr "Aquest camp és obligatori." 
     
    34853529msgstr "Introdueixi un valor vàlid." 
    34863530 
    3487 #: newforms/fields.py:129 
     3531#: newforms/fields.py:123 
    34883532#, python-format 
    34893533msgid "Ensure this value has at most %(max)d characters (it has %(length)d)." 
     
    34923536"d)." 
    34933537 
    3494 #: newforms/fields.py:130 
     3538#: newforms/fields.py:124 
    34953539#, python-format 
    34963540msgid "Ensure this value has at least %(min)d characters (it has %(length)d)." 
     
    34993543"d)." 
    35003544 
    3501 #: newforms/fields.py:158 newforms/fields.py:187 newforms/fields.py:216 
     3545#: newforms/fields.py:152 newforms/fields.py:181 newforms/fields.py:210 
    35023546#, python-format 
    35033547msgid "Ensure this value is less than or equal to %s." 
    35043548msgstr "Aquest valor ha de ser menor o igual a %s." 
    35053549 
    3506 #: newforms/fields.py:159 newforms/fields.py:188 newforms/fields.py:217 
     3550#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211 
    35073551#, python-format 
    35083552msgid "Ensure this value is greater than or equal to %s." 
    35093553msgstr "Asseguris de que aquest valor sigui superior o igual a %s." 
    35103554 
    3511 #: newforms/fields.py:186 newforms/fields.py:215 
     3555#: newforms/fields.py:180 newforms/fields.py:209 
    35123556msgid "Enter a number." 
    35133557msgstr "Introdueixi un número." 
    35143558 
    3515 #: newforms/fields.py:218 
     3559#: newforms/fields.py:212 
    35163560#, python-format 
    35173561msgid "Ensure that there are no more than %s digits in total." 
    35183562msgstr "Asseguris de que no hi ha més de %s dígits en total." 
    35193563 
    3520 #: newforms/fields.py:219 
     3564#: newforms/fields.py:213 
    35213565#, python-format 
    35223566msgid "Ensure that there are no more than %s decimal places." 
    35233567msgstr "Asseguris de que no hi ha més de %s decimals." 
    35243568 
    3525 #: newforms/fields.py:220 
     3569#: newforms/fields.py:214 
    35263570#, python-format 
    35273571msgid "Ensure that there are no more than %s digits before the decimal point." 
    35283572msgstr "Asseguris de que no hia ha més de %s dígits decimals." 
    35293573 
    3530 #: newforms/fields.py:268 newforms/fields.py:724 
     3574#: newforms/fields.py:262 newforms/fields.py:719 
    35313575msgid "E