Commits

Anonymous committed 937e6d6

[soc2010/app-loading] merged trunk

Comments (0)

Files changed (482)

     Gisle Aas <gisle@aas.no>
     ajs <adi@sieker.info>
     alang@bright-green.com
-    Alcides Fonseca
     Andi Albrecht <albrecht.andi@gmail.com>
     Marty Alchin <gulopine@gamemusic.org>
     Ahmad Alhashemi <trans@ahmadh.com>
     AgarFu <heaven@croasanaso.sytes.net>
     Dagur Páll Ammendrup <dagurp@gmail.com>
     Collin Anderson <cmawebsite@gmail.com>
-    Nicolas Lara <nicolaslara@gmail.com>
     Jeff Anderson <jefferya@programmerq.net>
     Marian Andre <django@andre.sk>
     Andreas
     Sean Brant
     Andrew Brehaut <http://brehaut.net/blog>
     brut.alll@gmail.com
+    bthomas
     btoll@bestweb.net
     Jonathan Buchanan <jonathan.buchanan@gmail.com>
     Keith Bussell <kbussell@gmail.com>
+    C8E
     Chris Cahoon <chris.cahoon@gmail.com>
     Juan Manuel Caicedo <juan.manuel.caicedo@gmail.com>
     Trevor Caira <trevor@caira.com>
     Brett Cannon <brett@python.org>
     Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
     Jeremy Carbaugh <jcarbaugh@gmail.com>
-    Carl Meyer <carl@dirtcircle.com>
     Graham Carlyle <graham.carlyle@maplecroft.net>
     Antonio Cavedoni <http://cavedoni.com/>
-    C8E
     cedric@terramater.net
     Chris Chamberlin <dja@cdc.msbx.net>
     Amit Chakradeo <http://amit.chakradeo.net/>
     Michal Chruszcz <troll@pld-linux.org>
     Can Burak Çilingir <canburak@cs.bilgi.edu.tr>
     Ian Clelland <clelland@gmail.com>
+    Travis Cline <travis.cline@gmail.com>
     Russell Cloran <russell@rucus.net>
     colin@owlfish.com
     crankycoder@gmail.com
     Rajesh Dhawan <rajesh.dhawan@gmail.com>
     Sander Dijkhuis <sander.dijkhuis@gmail.com>
     Jordan Dimov <s3x3y1@gmail.com>
+    Nebojša Dorđević
     dne@mayonnaise.net
     dready <wil@mojipage.com>
     Maximillian Dornseif <md@hudora.de>
     Liang Feng <hutuworm@gmail.com>
     Bill Fenner <fenner@gmail.com>
     Stefane Fermgier <sf@fermigier.com>
-    Afonso Fernández Nogueira <fonzzo.django@gmail.com>
     J. Pablo Fernandez <pupeno@pupeno.com>
     Maciej Fijalkowski
     Ben Firshman <ben@firshman.co.uk>
     Eric Floehr <eric@intellovations.com>
     Eric Florenzano <floguy@gmail.com>
     Vincent Foley <vfoleybourgon@yahoo.ca>
+    Alcides Fonseca
     Rudolph Froger <rfroger@estrate.nl>
     Jorge Gajon <gajon@gajon.org>
     gandalf@owca.info
     Idan Gazit
     geber@datacollect.com
     Baishampayan Ghose
+    Joshua Ginsberg <jag@flowtheory.net>
     Dimitris Glezos <dimitris@glezos.com>
     glin@seznam.cz
     martin.glueck@gmail.com
     Artyom Gnilov <boobsd@gmail.com>
     Ben Godfrey <http://aftnn.org>
+    Andrew Godwin <andrew@aeracode.org>
     GomoX <gomo@datafull.com>
     Guilherme Mesquita Gondim <semente@taurinus.org>
     Mario Gonzalez <gonzalemario@gmail.com>
     Kieran Holland <http://www.kieranholland.com>
     Sung-Jin Hong <serialx.net@gmail.com>
     Leo "hylje" Honkanen <sealage@gmail.com>
+    Matt Hoskins <skaffenuk@googlemail.com>
     Tareque Hossain <http://www.codexn.com>
     Richard House <Richard.House@i-logue.com>
     Robert Rock Howard <http://djangomojo.com/>
     jcrasta@gmail.com
     jdetaeye
     jhenry <jhenry@theonion.com>
+    john@calixto.net
     Zak Johnson <zakj@nox.cx>
     Nis Jørgensen <nis@superlativ.dk>
     Michael Josephson <http://www.sdjournal.com/>
     kurtiss@meetro.com
     Denis Kuzmichyov <kuzmichyov@gmail.com>
     Panos Laganakos <panos.laganakos@gmail.com>
-    Lakin Wecker <lakin@structuredabstraction.com>
     Nick Lane <nick.lane.au@gmail.com>
     Stuart Langridge <http://www.kryogenix.org/>
     Paul Lanier <planier@google.com>
     David Larlet <http://david.larlet.fr>
+    Nicolas Lara <nicolaslara@gmail.com>
     Nicola Larosa <nico@teknico.net>
     Finn Gruwier Larsen <finn@gruwier.dk>
     Lau Bech Lauritzen
     Simon Litchfield <simon@quo.com.au>
     Daniel Lindsley <polarcowz@gmail.com>
     Trey Long <trey@ktrl.com>
-    msaelices <msaelices@gmail.com>
     Martin Mahner <http://www.mahner.org/>
     Matt McClanahan <http://mmcc.cx/>
     Stanislaus Madueke
     Petr Marhoun <petr.marhoun@gmail.com>
     Petar Marić <http://www.petarmaric.com/>
     Nuno Mariz <nmariz@gmail.com>
-    Marijn Vriens <marijn@metronomo.cl>
     mark@junklight.com
     Orestis Markou <orestis@orestis.gr>
     Takashi Matsuo <matsuo.takashi@gmail.com>
     Yasushi Masuda <whosaysni@gmail.com>
     mattycakes@gmail.com
+    Glenn Maynard <glenn@zewt.org>
     Jason McBrayer <http://www.carcosa.net/jason/>
     Kevin McConnell <kevin.mcconnell@gmail.com>
     mccutchen@gmail.com
+    michael.mcewan@gmail.com
     Paul McLanahan <paul@mclanahan.net>
     Tobias McNulty <http://www.caktusgroup.com/blog>
     Zain Memon
     Christian Metts
-    michael.mcewan@gmail.com
+    Carl Meyer <carl@dirtcircle.com>
     michal@plovarna.cz
     Slawek Mikula <slawek dot mikula at gmail dot com>
     mitakummaa@gmail.com
     Aljosa Mohorovic <aljosa.mohorovic@gmail.com>
     Ramiro Morales <rm0@gmx.net>
     Eric Moritz <http://eric.themoritzfamily.com/>
+    msaelices <msaelices@gmail.com>
+    Gregor Müllegger <gregor@muellegger.de>
     Robin Munn <http://www.geekforgod.com/>
     James Murty
     msundstr
     Robert Myers <myer0052@gmail.com>
+    Aaron T. Myers <atmyers@gmail.com>
     Alexander Myodov <alex@myodov.com>
-    Nebojša Dorđević
     Doug Napoleone <doug@dougma.com>
     Gopal Narayanan <gopastro@gmail.com>
     Fraser Nevett <mail@nevett.org>
     phil.h.smith@gmail.com
     Gustavo Picon
     Michael Placentra II <someone@michaelplacentra2.net>
-    Luke Plant <http://lukeplant.me.uk/>
     plisk
     Daniel Poelzleithner <http://poelzi.org/>
     polpak@yahoo.com
     Henrique Romano <onaiort@gmail.com>
     Armin Ronacher
     Daniel Roseman <http://roseman.org.uk/>
-    Brian Rosner <brosner@gmail.com>
     Rozza <ross.lawley@gmail.com>
     Oliver Rutherfurd <http://rutherfurd.net/>
     ryankanno
     George Vilches <gav@thataddress.com>
     Vlado <vlado@labath.org>
     Zachary Voase <zacharyvoase@gmail.com>
+    Marijn Vriens <marijn@metronomo.cl>
     Milton Waddams
     Chris Wagner <cw264701@ohio.edu>
     Rick Wagner <rwagner@physics.ucsd.edu>
     Filip Wasilewski <filip.wasilewski@gmail.com>
     Dan Watson <http://theidioteque.net/>
     Joel Watts <joel@joelwatts.com>
+    Lakin Wecker <lakin@structuredabstraction.com>
     Chris Wesseling <Chris.Wesseling@cwi.nl>
     James Wheare <django@sparemint.com>
     Mike Wiacek <mjwiacek@google.com>
     Gasper Zejn <zejn@kiberpipa.org>
     Jarek Zgoda <jarek.zgoda@gmail.com>
     Cheng Zhang
-    Glenn Maynard <glenn@zewt.org>
-    bthomas
 
 A big THANK YOU goes to:
 
 include INSTALL
 include LICENSE
 include MANIFEST.in
-include django/utils/simplejson/LICENSE.txt
 include django/contrib/gis/gdal/LICENSE
 include django/contrib/gis/geos/LICENSE
+include django/dispatch/license.txt
+include django/utils/simplejson/LICENSE.txt
 recursive-include docs *
 recursive-include scripts *
-recursive-include examples *
 recursive-include extras *
 recursive-include tests *
 recursive-include django/conf/locale *
 recursive-include django/contrib/comments/templates *
 recursive-include django/contrib/databrowse/templates *
 recursive-include django/contrib/formtools/templates *
+recursive-include django/contrib/flatpages/fixtures *
+recursive-include django/contrib/flatpages/tests/templates *
 recursive-include django/contrib/gis/templates *
 recursive-include django/contrib/gis/tests/data *
 recursive-include django/contrib/gis/tests/geoapp/fixtures *

django/__init__.py

-VERSION = (1, 2, 1, 'final', 0)
+VERSION = (1, 3, 0, 'alpha', 0)
 
 def get_version():
     version = '%s.%s' % (VERSION[0], VERSION[1])

django/conf/__init__.py

         self.INSTALLED_APPS = new_installed_apps
 
         if hasattr(time, 'tzset') and getattr(self, 'TIME_ZONE'):
+            # When we can, attempt to validate the timezone. If we can't find
+            # this file, no check happens and it's harmless.
+            zoneinfo_root = '/usr/share/zoneinfo'
+            if (os.path.exists(zoneinfo_root) and not
+                    os.path.exists(os.path.join(zoneinfo_root, *(self.TIME_ZONE.split('/'))))):
+                raise ValueError("Incorrect timezone setting: %s" % self.TIME_ZONE)
             # Move the time zone info into os.environ. See ticket #2315 for why
             # we don't do this unconditionally (breaks Windows).
             os.environ['TZ'] = self.TIME_ZONE

django/conf/global_settings.py

     ('en', gettext_noop('English')),
     ('en-gb', gettext_noop('British English')),
     ('es', gettext_noop('Spanish')),
-    ('es-ar', gettext_noop('Argentinean Spanish')),
+    ('es-ar', gettext_noop('Argentinian Spanish')),
     ('et', gettext_noop('Estonian')),
     ('eu', gettext_noop('Basque')),
     ('fa', gettext_noop('Persian')),
     ('lt', gettext_noop('Lithuanian')),
     ('lv', gettext_noop('Latvian')),
     ('mk', gettext_noop('Macedonian')),
+    ('ml', gettext_noop('Malayalam')),
     ('mn', gettext_noop('Mongolian')),
     ('nl', gettext_noop('Dutch')),
     ('no', gettext_noop('Norwegian')),
 # Boolean that sets whether to add thousand separator when formatting numbers
 USE_THOUSAND_SEPARATOR = False
 
-# Number of digits that will be togheter, when spliting them by THOUSAND_SEPARATOR
-# 0 means no grouping, 3 means splitting by thousands...
+# Number of digits that will be together, when spliting them by
+# THOUSAND_SEPARATOR. 0 means no grouping, 3 means splitting by thousands...
 NUMBER_GROUPING = 0
 
 # Thousand separator symbol

django/conf/locale/ca/LC_MESSAGES/django.mo

Binary file modified.

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

-# translation of django.po to
+# translation of django.po to Catalan
 # This file is distributed under the same license as the Django package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-30 11:19+0100\n"
+"POT-Creation-Date: 2010-06-03 20:18+0200\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"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: conf/global_settings.py:44
+#: .\conf\global_settings.py:44
 msgid "Arabic"
-msgstr "aràbic"
-
-#: conf/global_settings.py:45
+msgstr "àrab"
+
+#: .\conf\global_settings.py:45
+msgid "Bulgarian"
+msgstr "búlgar"
+
+#: .\conf\global_settings.py:46
 msgid "Bengali"
 msgstr "bengalí"
 
-#: conf/global_settings.py:46
-msgid "Bulgarian"
-msgstr "búlgar"
-
-#: conf/global_settings.py:47
+#: .\conf\global_settings.py:47
+msgid "Bosnian"
+msgstr "bosnià"
+
+#: .\conf\global_settings.py:48
 msgid "Catalan"
 msgstr "català"
 
-#: conf/global_settings.py:48
+#: .\conf\global_settings.py:49
 msgid "Czech"
 msgstr "txec"
 
-#: conf/global_settings.py:49
+#: .\conf\global_settings.py:50
 msgid "Welsh"
-msgstr "galès"
-
-#: conf/global_settings.py:50
+msgstr "gal·lès"
+
+#: .\conf\global_settings.py:51
 msgid "Danish"
 msgstr "danès"
 
-#: conf/global_settings.py:51
+#: .\conf\global_settings.py:52
 msgid "German"
 msgstr "alemany"
 
-#: conf/global_settings.py:52
+#: .\conf\global_settings.py:53
 msgid "Greek"
 msgstr "grec"
 
-#: conf/global_settings.py:53
+#: .\conf\global_settings.py:54
 msgid "English"
 msgstr "anglès"
 
-#: conf/global_settings.py:54
+#: .\conf\global_settings.py:55
+msgid "British English"
+msgstr "anglès britànic"
+
+#: .\conf\global_settings.py:56
 msgid "Spanish"
 msgstr "espanyol"
 
-#: conf/global_settings.py:55
+#: .\conf\global_settings.py:57
+msgid "Argentinean Spanish"
+msgstr "castellà argentí"
+
+#: .\conf\global_settings.py:58
 msgid "Estonian"
 msgstr "estonià"
 
-#: conf/global_settings.py:56
-msgid "Argentinean Spanish"
-msgstr "castellà argentí"
-
-#: conf/global_settings.py:57
+#: .\conf\global_settings.py:59
 msgid "Basque"
 msgstr "euskera"
 
-#: conf/global_settings.py:58
+#: .\conf\global_settings.py:60
 msgid "Persian"
 msgstr "persa"
 
-#: conf/global_settings.py:59
+#: .\conf\global_settings.py:61
 msgid "Finnish"
 msgstr "finlandès"
 
-#: conf/global_settings.py:60
+#: .\conf\global_settings.py:62
 msgid "French"
 msgstr "francès"
 
-#: conf/global_settings.py:61
+#: .\conf\global_settings.py:63
+msgid "Frisian"
+msgstr "frisi"
+
+#: .\conf\global_settings.py:64
 msgid "Irish"
 msgstr "irlandès"
 
-#: conf/global_settings.py:62
+#: .\conf\global_settings.py:65
 msgid "Galician"
 msgstr "gallec"
 
-#: conf/global_settings.py:63
-msgid "Hungarian"
-msgstr "húngar"
-
-#: conf/global_settings.py:64
+#: .\conf\global_settings.py:66
 msgid "Hebrew"
 msgstr "hebreu"
 
-#: conf/global_settings.py:65
+#: .\conf\global_settings.py:67
 msgid "Hindi"
 msgstr "hindi"
 
-#: conf/global_settings.py:66
+#: .\conf\global_settings.py:68
 msgid "Croatian"
 msgstr "croat"
 
-#: conf/global_settings.py:67
+#: .\conf\global_settings.py:69
+msgid "Hungarian"
+msgstr "hongarès"
+
+#: .\conf\global_settings.py:70
+msgid "Indonesian"
+msgstr "indonesi"
+
+#: .\conf\global_settings.py:71
 msgid "Icelandic"
 msgstr "islandès"
 
-#: conf/global_settings.py:68
+#: .\conf\global_settings.py:72
 msgid "Italian"
 msgstr "italià"
 
-#: conf/global_settings.py:69
+#: .\conf\global_settings.py:73
 msgid "Japanese"
 msgstr "japonès"
 
-#: conf/global_settings.py:70
+#: .\conf\global_settings.py:74
 msgid "Georgian"
 msgstr "georgià"
 
-#: conf/global_settings.py:71
+#: .\conf\global_settings.py:75
+msgid "Khmer"
+msgstr "khmer"
+
+#: .\conf\global_settings.py:76
+msgid "Kannada"
+msgstr "kannarès"
+
+#: .\conf\global_settings.py:77
 msgid "Korean"
 msgstr "coreà"
 
-#: conf/global_settings.py:72
-msgid "Khmer"
-msgstr "khmer"
-
-#: conf/global_settings.py:73
-msgid "Kannada"
-msgstr "canès"
-
-#: conf/global_settings.py:74
+#: .\conf\global_settings.py:78
+msgid "Lithuanian"
+msgstr "lituà"
+
+#: .\conf\global_settings.py:79
 msgid "Latvian"
 msgstr "letó"
 
-#: conf/global_settings.py:75
-msgid "Lithuanian"
-msgstr "lituà"
-
-#: conf/global_settings.py:76
+#: .\conf\global_settings.py:80
 msgid "Macedonian"
 msgstr "macedoni"
 
-#: conf/global_settings.py:77
+#: .\conf\global_settings.py:81
+msgid "Mongolian"
+msgstr "mongol"
+
+#: .\conf\global_settings.py:82
 msgid "Dutch"
 msgstr "holandès"
 
-#: conf/global_settings.py:78
+#: .\conf\global_settings.py:83
 msgid "Norwegian"
-msgstr "norueg"
-
-#: conf/global_settings.py:79
+msgstr "noruec"
+
+#: .\conf\global_settings.py:84
+msgid "Norwegian Bokmal"
+msgstr "noruec bokmal"
+
+#: .\conf\global_settings.py:85
+msgid "Norwegian Nynorsk"
+msgstr "noruec nynorsk"
+
+#: .\conf\global_settings.py:86
 msgid "Polish"
-msgstr "polac"
-
-#: conf/global_settings.py:80
+msgstr "polonès"
+
+#: .\conf\global_settings.py:87
 msgid "Portuguese"
 msgstr "portuguès"
 
-#: conf/global_settings.py:81
+#: .\conf\global_settings.py:88
 msgid "Brazilian Portuguese"
 msgstr "portuguès de brasil"
 
-#: conf/global_settings.py:82
+#: .\conf\global_settings.py:89
 msgid "Romanian"
-msgstr "rumanès"
-
-#: conf/global_settings.py:83
+msgstr "romanès"
+
+#: .\conf\global_settings.py:90
 msgid "Russian"
-msgstr "rús"
-
-#: conf/global_settings.py:84
+msgstr "rus"
+
+#: .\conf\global_settings.py:91
 msgid "Slovak"
 msgstr "eslovac"
 
-#: conf/global_settings.py:85
+#: .\conf\global_settings.py:92
 msgid "Slovenian"
-msgstr "esloveni"
-
-#: conf/global_settings.py:86
+msgstr "eslovè"
+
+#: .\conf\global_settings.py:93
+msgid "Albanian"
+msgstr "albanès"
+
+#: .\conf\global_settings.py:94
 msgid "Serbian"
 msgstr "serbi"
 
-#: conf/global_settings.py:87
+#: .\conf\global_settings.py:95
+msgid "Serbian Latin"
+msgstr "serbi llatí"
+
+#: .\conf\global_settings.py:96
 msgid "Swedish"
 msgstr "suec"
 
-#: conf/global_settings.py:88
+#: .\conf\global_settings.py:97
 msgid "Tamil"
 msgstr "tàmil"
 
-#: conf/global_settings.py:89
+#: .\conf\global_settings.py:98
 msgid "Telugu"
 msgstr "telugu"
 
-#: conf/global_settings.py:90
+#: .\conf\global_settings.py:99
 msgid "Thai"
 msgstr "tailandès"
 
-#: conf/global_settings.py:91
+#: .\conf\global_settings.py:100
 msgid "Turkish"
 msgstr "turc"
 
-#: conf/global_settings.py:92
+#: .\conf\global_settings.py:101
 msgid "Ukrainian"
-msgstr "ucranià"
-
-#: conf/global_settings.py:93
+msgstr "ucraïnès"
+
+#: .\conf\global_settings.py:102
+msgid "Vietnamese"
+msgstr "vietnamita"
+
+#: .\conf\global_settings.py:103
 msgid "Simplified Chinese"
 msgstr "xinès simplificat"
 
-#: conf/global_settings.py:94
+#: .\conf\global_settings.py:104
 msgid "Traditional Chinese"
 msgstr "xinès tradicional"
 
-#: contrib/admin/actions.py:60
+#: .\contrib\admin\actions.py:48
 #, python-format
 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:1033
+#: .\contrib\admin\actions.py:55 .\contrib\admin\options.py:1125
 msgid "Are you sure?"
-msgstr "Esteu segurs?"
-
-#: contrib/admin/actions.py:85
+msgstr "N'esteu segur?"
+
+#: .\contrib\admin\actions.py:73
 #, python-format
 msgid "Delete selected %(verbose_name_plural)s"
 msgstr "Eliminar els %(verbose_name_plural)s seleccionats"
 
-#: contrib/admin/filterspecs.py:44
+#: .\contrib\admin\filterspecs.py:44
 #, python-format
 msgid ""
 "<h3>By %s:</h3>\n"
 "<h3>Per %s:</h3>\n"
 "<ul>\n"
 
-#: contrib/admin/filterspecs.py:75 contrib/admin/filterspecs.py:92
-#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173
+#: .\contrib\admin\filterspecs.py:75 .\contrib\admin\filterspecs.py:92
+#: .\contrib\admin\filterspecs.py:147 .\contrib\admin\filterspecs.py:173
 msgid "All"
 msgstr "Tots"
 
-#: contrib/admin/filterspecs.py:113
+#: .\contrib\admin\filterspecs.py:113
 msgid "Any date"
 msgstr "Qualsevol data"
 
-#: contrib/admin/filterspecs.py:114
+#: .\contrib\admin\filterspecs.py:114
 msgid "Today"
 msgstr "Avui"
 
-#: contrib/admin/filterspecs.py:117
+#: .\contrib\admin\filterspecs.py:117
 msgid "Past 7 days"
 msgstr "Últims 7 dies"
 
-#: contrib/admin/filterspecs.py:119
+#: .\contrib\admin\filterspecs.py:119
 msgid "This month"
 msgstr "Aquest mes"
 
-#: contrib/admin/filterspecs.py:121
+#: .\contrib\admin\filterspecs.py:121
 msgid "This year"
 msgstr "Aquest any"
 
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
+#: .\contrib\admin\filterspecs.py:147 .\forms\widgets.py:466
 msgid "Yes"
-msgstr "Si"
-
-#: contrib/admin/filterspecs.py:147 forms/widgets.py:435
+msgstr "Sí"
+
+#: .\contrib\admin\filterspecs.py:147 .\forms\widgets.py:466
 msgid "No"
 msgstr "No"
 
-#: contrib/admin/filterspecs.py:154 forms/widgets.py:435
+#: .\contrib\admin\filterspecs.py:154 .\forms\widgets.py:466
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: contrib/admin/helpers.py:14
+#: .\contrib\admin\helpers.py:20
 msgid "Action:"
 msgstr "Acció:"
 
-#: contrib/admin/models.py:19
+#: .\contrib\admin\models.py:19
 msgid "action time"
 msgstr "moment de l'acció"
 
-#: contrib/admin/models.py:22
+#: .\contrib\admin\models.py:22
 msgid "object id"
-msgstr "id del objecte"
-
-#: contrib/admin/models.py:23
+msgstr "id de l'objecte"
+
+#: .\contrib\admin\models.py:23
 msgid "object repr"
 msgstr "'repr' de l'objecte"
 
-#: contrib/admin/models.py:24
+#: .\contrib\admin\models.py:24
 msgid "action flag"
-msgstr "marca de l'acció"
-
-#: contrib/admin/models.py:25
+msgstr "indicador de l'acció"
+
+#: .\contrib\admin\models.py:25
 msgid "change message"
 msgstr "missatge del canvi"
 
-#: contrib/admin/models.py:28
+#: .\contrib\admin\models.py:28
 msgid "log entry"
 msgstr "entrada del registre"
 
-#: contrib/admin/models.py:29
+#: .\contrib\admin\models.py:29
 msgid "log entries"
 msgstr "entrades del registre"
 
-#: contrib/admin/options.py:134 contrib/admin/options.py:148
+#: .\contrib\admin\options.py:138 .\contrib\admin\options.py:153
 msgid "None"
 msgstr "cap"
 
-#: contrib/admin/options.py:521
+#: .\contrib\admin\options.py:559
 #, python-format
 msgid "Changed %s."
 msgstr "Modificat %s."
 
-#: 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
+#: .\contrib\admin\options.py:559 .\contrib\admin\options.py:569
+#: .\contrib\comments\templates\comments\preview.html.py:16
+#: .\db\models\base.py:845 .\forms\models.py:568
 msgid "and"
 msgstr "i"
 
-#: contrib/admin/options.py:526
+#: .\contrib\admin\options.py:564
 #, python-format
 msgid "Added %(name)s \"%(object)s\"."
 msgstr "Afegit %(name)s \"%(object)s\""
 
-#: contrib/admin/options.py:530
+#: .\contrib\admin\options.py:568
 #, 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:535
+#: .\contrib\admin\options.py:573
 #, python-format
 msgid "Deleted %(name)s \"%(object)s\"."
 msgstr "Eliminat %(name)s \"%(object)s\"."
 
-#: contrib/admin/options.py:539
+#: .\contrib\admin\options.py:577
 msgid "No fields changed."
-msgstr "Cap camp canviat."
-
-#: contrib/admin/options.py:601 contrib/auth/admin.py:67
+msgstr "Cap camp modificat."
+
+#: .\contrib\admin\options.py:643
 #, 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:605 contrib/admin/options.py:638
-#: contrib/auth/admin.py:75
+msgstr "El/la %(name)s \"%(obj)s\" ha estat afegit/da amb èxit."
+
+#: .\contrib\admin\options.py:647 .\contrib\admin\options.py:680
 msgid "You may edit it again below."
-msgstr "Podeu editar-lo de nou a baix."
-
-#: contrib/admin/options.py:615 contrib/admin/options.py:648
+msgstr "Podeu editar-lo de nou a sota."
+
+#: .\contrib\admin\options.py:657 .\contrib\admin\options.py:690
 #, python-format
 msgid "You may add another %s below."
-msgstr "Podeu afegir un altre %s a baix."
-
-#: contrib/admin/options.py:636
+msgstr "Podeu afegir un altre %s a sota."
+
+#: .\contrib\admin\options.py:678
 #, 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:644
+#: .\contrib\admin\options.py:686
 #, python-format
 msgid ""
 "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
 msgstr ""
-"S'ha afegit exitosament el/la %(name)s \"%(obj)s\". Pot editar-lo de nou "
-"abaix."
-
-#: contrib/admin/options.py:777
+"S'ha afegit amb èxit el/la %(name)s \"%(obj)s\". Pot editar-lo de nou a sota."
+
+#: .\contrib\admin\options.py:740 .\contrib\admin\options.py:997
+msgid ""
+"Items must be selected in order to perform actions on them. No items have "
+"been changed."
+msgstr ""
+"Heu de seleccionar els elements per poder realitzar-hi accions. "
+"No heu seleccionat cap element."
+
+#: .\contrib\admin\options.py:759
+msgid "No action selected."
+msgstr "no heu seleccionat cap acció"
+
+#: .\contrib\admin\options.py:840
 #, python-format
 msgid "Add %s"
 msgstr "Afegir %s"
 
-#: contrib/admin/options.py:809 contrib/admin/options.py:1011
+#: .\contrib\admin\options.py:866 .\contrib\admin\options.py:1105
 #, 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:866
+msgstr "No existeix cap objecte %(name)s amb la clau primària %(key)r."
+
+#: .\contrib\admin\options.py:931
 #, python-format
 msgid "Change %s"
 msgstr "Modificar %s"
 
-#: contrib/admin/options.py:910
+#: .\contrib\admin\options.py:977
 msgid "Database error"
 msgstr "Error de base de dades"
 
-#: contrib/admin/options.py:946
+#: .\contrib\admin\options.py:1039
 #, 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:1026
+#: .\contrib\admin\options.py:1066
+#, python-format
+msgid "%(total_count)s selected"
+msgid_plural "All %(total_count)s selected"
+msgstr[0] "%(total_count)s seleccionat(s)"
+msgstr[1] "Tots %(total_count)s seleccionat(s)"
+
+#: .\contrib\admin\options.py:1071
+#, python-format
+msgid "0 of %(cnt)s selected"
+msgstr "0 de %(cnt)s seleccionats"
+
+#: .\contrib\admin\options.py:1118
 #, 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:1063
+msgstr "El/la %(name)s \"%(obj)s\" s'ha eliminat amb èxit."
+
+#: .\contrib\admin\options.py:1155
 #, python-format
 msgid "Change history: %s"
 msgstr "Modificar històric: %s"
 
-#: contrib/admin/sites.py:22 contrib/admin/views/decorators.py:14
-#: contrib/auth/forms.py:80
+#: .\contrib\admin\sites.py:18 .\contrib\admin\views\decorators.py:14
+#: .\contrib\auth\forms.py:81
 msgid ""
 "Please enter a correct username and password. Note that both fields are case-"
 "sensitive."
 "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:292 contrib/admin/views/decorators.py:40
+#: .\contrib\admin\sites.py:307 .\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:299 contrib/admin/views/decorators.py:47
+msgstr "Si us plau, entreu de nou perquè la vostra sessió ha caducat."
+
+#: .\contrib\admin\sites.py:314 .\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."
 msgstr ""
-"Sembla ser que el vostre navegador no està configurat per acceptar "
-"'cookies' (galetes). Si us plau, habiliteu les 'cookies', recarregueu "
-"aquesta pàgina i proveu-ho de nou. "
-
-#: contrib/admin/sites.py:315 contrib/admin/sites.py:321
-#: contrib/admin/views/decorators.py:66
+"Sembla ser que el vostre navegador no està configurat per acceptar galetes "
+"('cookies'). Si us plau, habiliteu les galetes, recarregueu aquesta pàgina i "
+"proveu-ho de nou. "
+
+#: .\contrib\admin\sites.py:330 .\contrib\admin\sites.py:336
+#: .\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:318 contrib/admin/views/decorators.py:62
+msgstr "Els noms d'usuari no poden contenir el caràcter '@'."
+
+#: .\contrib\admin\sites.py:333 .\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:374
+"La vostra adreça de correu no és el vostre nom d'usuari. Provi '%s' en el "
+"seu lloc."
+
+#: .\contrib\admin\sites.py:389
 msgid "Site administration"
-msgstr "Lloc administratiu"
-
-#: 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
+msgstr "Administració del lloc"
+
+#: .\contrib\admin\sites.py:403
+#: .\contrib\admin\templates\admin\login.html.py:26
+#: .\contrib\admin\templates\registration\password_reset_complete.html.py:14
+#: .\contrib\admin\views\decorators.py:20
 msgid "Log in"
 msgstr "Iniciar sessió"
 
-#: contrib/admin/sites.py:433
+#: .\contrib\admin\sites.py:448
 #, python-format
 msgid "%s administration"
 msgstr "Administració de %s"
 
-#: contrib/admin/util.py:168
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s: %(obj)s"
-msgstr "Un o més %(fieldname)s en %(name)s: %(obj)s"
-
-#: contrib/admin/util.py:173
-#, python-format
-msgid "One or more %(fieldname)s in %(name)s:"
-msgstr "Un o més %(fieldname)s en %(name)s:"
-
-#: contrib/admin/widgets.py:72
+#: .\contrib\admin\widgets.py:75
 msgid "Date:"
 msgstr "Data:"
 
-#: contrib/admin/widgets.py:72
+#: .\contrib\admin\widgets.py:75
 msgid "Time:"
 msgstr "Hora:"
 
-#: contrib/admin/widgets.py:96
+#: .\contrib\admin\widgets.py:99
 msgid "Currently:"
 msgstr "Actualment:"
 
-#: contrib/admin/widgets.py:96
+#: .\contrib\admin\widgets.py:99
 msgid "Change:"
 msgstr "Modificar:"
 
-#: contrib/admin/widgets.py:125
+#: .\contrib\admin\widgets.py:129
 msgid "Lookup"
 msgstr "Cercar"
 
-#: contrib/admin/widgets.py:237
+#: .\contrib\admin\widgets.py:244
 msgid "Add Another"
-msgstr "Afegir un altre"
-
-#: contrib/admin/templates/admin/404.html:4
-#: contrib/admin/templates/admin/404.html:8
+msgstr "Afegir-ne un altre"
+
+#: .\contrib\admin\templates\admin\404.html.py:4
+#: .\contrib\admin\templates\admin\404.html.py:8
 msgid "Page not found"
 msgstr "No s'ha pogut trobar la pàgina"
 
-#: contrib/admin/templates/admin/404.html:10
+#: .\contrib\admin\templates\admin\404.html.py:10
 msgid "We're sorry, but the requested page could not be found."
 msgstr "Ho sentim, però no s'ha pogut trobar la pàgina sol·licitada"
 
-#: contrib/admin/templates/admin/500.html:4
-#: contrib/admin/templates/admin/app_index.html:8
-#: 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
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:6
-#: contrib/admin/templates/admin/invalid_setup.html:4
-#: contrib/admin/templates/admin/object_history.html:6
-#: contrib/admin/templates/admin/auth/user/change_password.html:10
-#: contrib/admin/templates/registration/logged_out.html:4
-#: contrib/admin/templates/registration/password_change_done.html:4
-#: contrib/admin/templates/registration/password_change_form.html:4
-#: contrib/admin/templates/registration/password_reset_complete.html:4
-#: contrib/admin/templates/registration/password_reset_confirm.html:4
-#: contrib/admin/templates/registration/password_reset_done.html:4
-#: contrib/admin/templates/registration/password_reset_form.html:4
-#: contrib/admindocs/templates/admin_doc/bookmarklets.html:3
+#: .\contrib\admin\templates\admin\500.html.py:4
+#: .\contrib\admin\templates\admin\app_index.html.py:8
+#: .\contrib\admin\templates\admin\base.html.py:55
+#: .\contrib\admin\templates\admin\change_form.html.py:18
+#: .\contrib\admin\templates\admin\change_list.html.py:42
+#: .\contrib\admin\templates\admin\delete_confirmation.html.py:6
+#: .\contrib\admin\templates\admin\delete_selected_confirmation.html.py:6
+#: .\contrib\admin\templates\admin\invalid_setup.html.py:4
+#: .\contrib\admin\templates\admin\object_history.html.py:6
+#: .\contrib\admin\templates\admin\auth\user\change_password.html.py:11
+#: .\contrib\admin\templates\registration\logged_out.html.py:4
+#: .\contrib\admin\templates\registration\password_change_done.html.py:4
+#: .\contrib\admin\templates\registration\password_change_form.html.py:5
+#: .\contrib\admin\templates\registration\password_reset_complete.html.py:4
+#: .\contrib\admin\templates\registration\password_reset_confirm.html.py:4
+#: .\contrib\admin\templates\registration\password_reset_done.html.py:4
+#: .\contrib\admin\templates\registration\password_reset_form.html.py:4
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:3
 msgid "Home"
 msgstr "Inici"
 
-#: contrib/admin/templates/admin/500.html:4
+#: .\contrib\admin\templates\admin\500.html.py:4
 msgid "Server error"
 msgstr "Error del servidor"
 
-#: contrib/admin/templates/admin/500.html:6
+#: .\contrib\admin\templates\admin\500.html.py:6
 msgid "Server error (500)"
 msgstr "Error del servidor (500)"
 
-#: contrib/admin/templates/admin/500.html:9
+#: .\contrib\admin\templates\admin\500.html.py:9
 msgid "Server Error <em>(500)</em>"
 msgstr "Error del servidor <em>(500)</em>"
 
-#: contrib/admin/templates/admin/500.html:10
+#: .\contrib\admin\templates\admin\500.html.py:10
 msgid ""
 "There's been an error. It's been reported to the site administrators via e-"
 "mail and should be fixed shortly. Thanks for your patience."
 msgstr ""
-"Ha ocorregut un error. S'ha informat als administradors del lloc per correu "
-"electrònic y hauria d'arreglar-se en breu. Gràcies per la vostra paciència."
-
-#: contrib/admin/templates/admin/actions.html:4
+"S'ha produït un error. Se n'ha informat els administradors del lloc per "
+"correu electrònic, i hauria d'arreglar-se en breu. Gràcies per la vostra "
+"paciència."
+
+#: .\contrib\admin\templates\admin\actions.html.py:4
 msgid "Run the selected action"
-msgstr "Executar la acció seleccionada"
-
-#: contrib/admin/templates/admin/actions.html:4
+msgstr "Executar l'acció seleccionada"
+
+#: .\contrib\admin\templates\admin\actions.html.py:4
 msgid "Go"
 msgstr "Anar"
 
-#: contrib/admin/templates/admin/app_index.html:10
-#: contrib/admin/templates/admin/index.html:19
+#: .\contrib\admin\templates\admin\actions.html.py:11
+msgid "Click here to select the objects across all pages"
+msgstr "Feu clic aquí per seleccionar els objectes a totes les pàgines"
+
+#: .\contrib\admin\templates\admin\actions.html.py:11
+#, python-format
+msgid "Select all %(total_count)s %(module_name)s"
+msgstr "Seleccioneu tots %(total_count)s %(module_name)s"
+
+#: .\contrib\admin\templates\admin\actions.html.py:13
+msgid "Clear selection"
+msgstr "Netejar la selecció"
+
+#: .\contrib\admin\templates\admin\app_index.html.py:10
+#: .\contrib\admin\templates\admin\index.html.py:19
 #, python-format
 msgid "%(name)s"
 msgstr "%(name)s"
 
-#: contrib/admin/templates/admin/base.html:27
+#: .\contrib\admin\templates\admin\base.html.py:28
 msgid "Welcome,"
 msgstr "Benvingut/da,"
 
-#: 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
+#: .\contrib\admin\templates\admin\base.html.py:33
+#: .\contrib\admin\templates\registration\password_change_done.html.py:3
+#: .\contrib\admin\templates\registration\password_change_form.html.py:4
+#: .\contrib\admindocs\templates\admin_doc\bookmarklets.html.py:3
 msgid "Documentation"
 msgstr "Documentació"
 
-#: 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
-#: contrib/admin/templates/registration/password_change_form.html:3
+#: .\contrib\admin\templates\admin\base.html.py:41
+#: .\contrib\admin\templates\admin\auth\user\change_password.html.py:15
+#: .\contrib\admin\templates\admin\auth\user\change_password.html.py:48
+#: .\contrib\admin\templates\registration\password_change_done.html.py:3
+#: .\contrib\admin\templates\registration\password_change_form.html.py:4
 msgid "Change password"
 msgstr "Canviar contrasenya"
 
-#: 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
+#: .\contrib\admin\templates\admin\base.html.py:48
+#: .\contrib\admin\templates\registration\password_change_done.html.py:3
+#: .\contrib\admin\templates\registration\password_change_form.html.py:4
 msgid "Log out"
 msgstr "Finalitzar sessió"
 
-#: contrib/admin/templates/admin/base_site.html:4
+#: .\contrib\admin\templates\admin\base_site.html.py:4
 msgid "Django site admin"
 msgstr "Lloc administratiu de Django"
 
-#: contrib/admin/templates/admin/base_site.html:7
+#: .\contrib\admin\templates\admin\base_site.html.py:7
 msgid "Django administration"
 msgstr "Administració de Django"
 
-#: contrib/admin/templates/admin/change_form.html:20
-#: contrib/admin/templates/admin/index.html:29
+#: .\contrib\admin\templates\admin\change_form.html.py:21
+#: .\contrib\admin\templates\admin\index.html.py:29
 msgid "Add"
 msgstr "Afegir"
 
-#: contrib/admin/templates/admin/change_form.html:27
-#: contrib/admin/templates/admin/object_history.html:10
+#: .\contrib\admin\templates\admin\change_form.html.py:28
+#: .\contrib\admin\templates\admin\object_history.html.py:10
 msgid "History"
 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:28
+#: .\contrib\admin\templates\admin\change_form.html.py:29
+#: .\contrib\admin\templates\admin\edit_inline\stacked.html.py:9
+#: .\contrib\admin\templates\admin\edit_inline\tabular.html.py:28
 msgid "View on site"
 msgstr "Veure al lloc"
 
-#: contrib/admin/templates/admin/change_form.html:38
-#: contrib/admin/templates/admin/change_list.html:54
-#: contrib/admin/templates/admin/auth/user/change_password.html:23
+#: .\contrib\admin\templates\admin\change_form.html.py:39
+#: .\contrib\admin\templates\admin\change_list.html.py:71
+#: .\contrib\admin\templates\admin\auth\user\change_password.html.py:24
+#: .\contrib\admin\templates\registration\password_change_form.html.py:15
 msgid "Please correct the error below."
 msgid_plural "Please correct the errors below."
-msgstr[0] "Si us plau, corregiu l'error mostrat a baix."
-msgstr[1] "Si us plau, corregiu els errors mostrats a baix."
-
-#: contrib/admin/templates/admin/change_list.html:46
+msgstr[0] "Si us plau, corregiu l'error mostrat a sota."
+msgstr[1] "Si us plau, corregiu els errors mostrats a sota."
+
+#: .\contrib\admin\templates\admin\change_list.html.py:63
 #, python-format
 msgid "Add %(name)s"
 msgstr "Afegir %(name)s"
 
-#: contrib/admin/templates/admin/change_list.html:65
+#: .\contrib\admin\templates\admin\change_list.html.py:82
 msgid "Filter"
 msgstr "Filtre"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:10
-#: contrib/admin/templates/admin/submit_line.html:4 forms/formsets.py:275
+#: .\contrib\admin\templates\admin\delete_confirmation.html.py:10
+#: .\contrib\admin\templates\admin\submit_line.html.py:4
+#: .\forms\formsets.py:302
 msgid "Delete"
 msgstr "Eliminar"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:16
+#: .\contrib\admin\templates\admin\delete_confirmation.html.py:16
 #, python-format
 msgid ""
 "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting "
 "following types of objects:"
 msgstr ""
 "Eliminar el/la %(object_name)s '%(escaped_object)s' provocaria l'eliminació "
-"d'objectes relacionats, però el vostre compte no te permissos per a esborrar "
+"d'objectes relacionats, però el vostre compte no te permisos per esborrar "
 "els tipus d'objecte següents:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:23
+#: .\contrib\admin\templates\admin\delete_confirmation.html.py:23
 #, python-format
 msgid ""
 "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? "
 "Esteu segurs de voler esborrar els/les %(object_name)s \"%(escaped_object)s"
 "\"? S'esborraran els següents elements relacionats:"
 
-#: contrib/admin/templates/admin/delete_confirmation.html:28
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:33
+#: .\contrib\admin\templates\admin\delete_confirmation.html.py:28
+#: .\contrib\admin\templates\admin\delete_selected_confirmation.html.py:33
 msgid "Yes, I'm sure"
-msgstr "Si, estic segur"
-
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:9
+msgstr "Sí, n'estic segur"
+
+#: .\contrib\admin\templates\admin\delete_selected_confirmation.html.py:9
 msgid "Delete multiple objects"
-msgstr "Eliminar multiples objectes"
-
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:15
+msgstr "Eliminar múltiples objectes"
+
+#: .\contrib\admin\templates\admin\delete_selected_confirmation.html.py:15
 #, python-format
 msgid ""
 "Deleting the %(object_name)s would result in deleting related objects, but "
 "objects:"
 msgstr ""
 "Eliminar el/la %(object_name)s provocaria l'eliminació d'objectes "
-"relacionats, però el vostre compte no te permissos per a esborrar els tipus "
+"relacionats, però el vostre compte no te permisos per esborrar els tipus "
 "d'objecte següents:"
 
-#: contrib/admin/templates/admin/delete_selected_confirmation.html:22
+#: .\contrib\admin\templates\admin\delete_selected_confirmation.html.py:22
 #, python-format
 msgid ""
 "Are you sure you want to delete the selected %(object_name)s objects? All of "
 "the following objects and their related items will be deleted:"
 msgstr ""
-"Esteu segurs de voler esborrar els/les %(object_name)s seleccionats? Tots "
+"Esteu segur 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
+#: .\contrib\admin\templates\admin\filter.html.py:2
 #, python-format
 msgid " By %(filter_title)s "
 msgstr "Per %(filter_title)s "
 
-#: contrib/admin/templates/admin/index.html:18
+#: .\contrib\admin\templates\admin\index.html.py:18
 #, python-format
 msgid "Models available in the %(name)s application."
 msgstr "Models disponibles a l'aplicació %(name)s."
 
-#: contrib/admin/templates/admin/index.html:35
+#: .\contrib\admin\templates\admin\index.html.py:35
 msgid "Change"
 msgstr "Modificar"
 
-#: contrib/admin/templates/admin/index.html:45
+#: .\contrib\admin\templates\admin\index.html.py:45
 msgid "You don't have permission to edit anything."
 msgstr "No teniu permís per editar res."
 
-#: contrib/admin/templates/admin/index.html:53
+#: .\contrib\admin\templates\admin\index.html.py:53
 msgid "Recent Actions"
 msgstr "Accions recents"
 
-#: contrib/admin/templates/admin/index.html:54
+#: .\contrib\admin\templates\admin\index.html.py:54
 msgid "My Actions"
 msgstr "Les meves accions"
 
-#: contrib/admin/templates/admin/index.html:58
+#: .\contrib\admin\templates\admin\index.html.py:58
 msgid "None available"
 msgstr "Cap disponible"
 
-#: contrib/admin/templates/admin/index.html:72
+#: .\contrib\admin\templates\admin\index.html.py:72
 msgid "Unknown content"
 msgstr "Contingut desconegut"
 
-#: contrib/admin/templates/admin/invalid_setup.html:7
+#: .\contrib\admin\templates\admin\invalid_setup.html.py:7
 msgid ""
 "Something's wrong with your database installation. Make sure the appropriate "
 "database tables have been created, and make sure the database is readable by "
 "the appropriate user."
 msgstr ""
-"Alguna cosa està malament en la instal·lació de la vostra base de dades. "
-"Assegureu-vos de que s'han creat les taules, i de que la base de dades és "
-"llegible per l'usuari apropiat."
-
-#: contrib/admin/templates/admin/login.html:19
+"Hi ha algun problema a la instal·lació de la vostra base de dades. Assegureu-"
+"vos que s'han creat les taules adients, i que la base de dades és llegible "
+"per l'usuari apropiat."
+
+#: .\contrib\admin\templates\admin\login.html.py:19
 msgid "Username:"
-msgstr "Usuari:"
-
-#: contrib/admin/templates/admin/login.html:22
+msgstr "Nom d'usuari:"
+
+#: .\contrib\admin\templates\admin\login.html.py:22
 msgid "Password:"
 msgstr "Contrasenya:"
 
-#: contrib/admin/templates/admin/object_history.html:22
+#: .\contrib\admin\templates\admin\object_history.html.py:22
 msgid "Date/time"
 msgstr "Data/hora"
 
-#: contrib/admin/templates/admin/object_history.html:23
+#: .\contrib\admin\templates\admin\object_history.html.py:23
 msgid "User"
 msgstr "Usuari"
 
-#: contrib/admin/templates/admin/object_history.html:24
+#: .\contrib\admin\templates\admin\object_history.html.py:24
 msgid "Action"
 msgstr "Acció"
 
-#: contrib/admin/templates/admin/object_history.html:30
-#: utils/translation/trans_real.py:400
-msgid "DATETIME_FORMAT"
-msgstr "j \\de F \\de Y, H:i"
-
-#: contrib/admin/templates/admin/object_history.html:38
+#: .\contrib\admin\templates\admin\object_history.html.py:38
 msgid ""
 "This object doesn't have a change history. It probably wasn't added via this "
 "admin site."
 msgstr ""
-"Aquest objecte no té historial de canvis. Probablement no va ser afegit "
+"Aquest objecte no té historial de canvis. Probablement no es va afegir "
 "utilitzant aquest lloc administratiu."
 
-#: contrib/admin/templates/admin/pagination.html:10
+#: .\contrib\admin\templates\admin\pagination.html.py:10
 msgid "Show all"
 msgstr "Mostrar tots"