newforms-admin: Merged from trunk up to [5625]. This includes the Uni…

…code

merge, however, not all of admin/ (and none of admindocs/) has been ported and
checked yet.


git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@5627 bcc190cf-cafb-0310-a4f2-bffc1f526a37

AUTHORS

@@ -44,6 +44,7 @@ answer newbie questions, and generally made Django that much better:
     alang@bright-green.com
     Marty Alchin <gulopine@gamemusic.org>
     Daniel Alves Barbosa de Oliveira Vaz <danielvaz@gmail.com>
+    AgarFu <heaven@croasanaso.sytes.net>
     Andreas
     andy@jadedplanet.net
     Fabrice Aneche <akh@nobugware.com>
@@ -60,9 +61,11 @@ answer newbie questions, and generally made Django that much better:
     Ben <afternoon@uk2.net>
     Paul Bissex <http://e-scribe.com/>
     Simon Blanchard
+    boobsd@gmail.com
     Andrew Brehaut <http://brehaut.net/blog>
     brut.alll@gmail.com
     Jonathan Buchanan <jonathan.buchanan@gmail.com>
+    Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
     Antonio Cavedoni <http://cavedoni.com/>
     C8E
     Chris Chamberlin <dja@cdc.msbx.net>
@@ -106,13 +109,16 @@ answer newbie questions, and generally made Django that much better:
     Eric Floehr <eric@intellovations.com>
     Jorge Gajon <gajon@gajon.org>
     gandalf@owca.info
+    Marc Garcia <marc.garcia@accopensys.com>
     Baishampayan Ghose
     glin@seznam.cz
     martin.glueck@gmail.com
     GomoX <gomo@datafull.com>
+    Mario Gonzalez <gonzalemario @t gmail.com>
     Simon Greenhill <dev@simon.net.nz>
     Owen Griffiths
     Espen Grindhaug <http://grindhaug.org/>
+    Thomas Güttler <hv@tbz-pariv.de>
     Brian Harring <ferringb@gmail.com>
     Brant Harris
     Hawkeye
@@ -141,12 +147,15 @@ answer newbie questions, and generally made Django that much better:
     Sune Kirkeby <http://ibofobi.dk/>
     Bastian Kleineidam <calvin@debian.org>
     Cameron Knight (ckknight)
+    Nena Kojadin <nena@kiberpipa.org>
+    Igor Kolar <ike@email.si>
     Gasper Koren
     Martin Kosír <martin@martinkosir.net>
     Meir Kriheli <http://mksoft.co.il/>
     Bruce Kroeze <http://coderseye.com/>
     Joseph Kocherhans
     konrad@gwu.edu
+    kurtiss@meetro.com
     lakin.wecker@gmail.com
     Nick Lane <nick.lane.au@gmail.com>
     Stuart Langridge <http://www.kryogenix.org/>
@@ -214,6 +223,7 @@ answer newbie questions, and generally made Django that much better:
     scott@staplefish.com
     serbaut@gmail.com
     Pete Shinners <pete@shinners.org>
+    Jozko Skrablin <jozko.skrablin@gmail.com>
     SmileyChris <smileychris@gmail.com>
     smurf@smurf.noris.de
     sopel

django/bin/make-messages.py

@@ -103,7 +103,7 @@ def make_messages():
                         open(os.path.join(dirpath, '%s.py' % file), "wb").write(templatize(src))
                         thefile = '%s.py' % file
                     if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath))
-                    cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (
+                    cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --keyword=ugettext_noop --keyword=ugettext_lazy --keyword=ungettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % (
                         os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile))
                     (stdin, stdout, stderr) = os.popen3(cmd, 'b')
                     msgs = stdout.read()

django/conf/global_settings.py

@@ -97,6 +97,9 @@
 DEFAULT_CONTENT_TYPE = 'text/html'
 DEFAULT_CHARSET = 'utf-8'
 
+# Encoding of files read from disk (template and initial SQL files).
+FILE_CHARSET = 'utf-8'
+
 # E-mail address that error messages come from.
 SERVER_EMAIL = 'root@localhost'
 
@@ -280,6 +283,7 @@
 # possible values.
 CACHE_BACKEND = 'simple://'
 CACHE_MIDDLEWARE_KEY_PREFIX = ''
+CACHE_MIDDLEWARE_SECONDS = 600
 
 ####################
 # COMMENTS         #

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

@@ -237,7 +237,7 @@ msgstr "Coreà"
 
 #: conf/global_settings.py:61
 msgid "Kannada"
-msgstr ""
+msgstr "Canès"
 
 #: conf/global_settings.py:62
 msgid "Latvian"
@@ -1230,7 +1230,7 @@ msgstr "Pot editar-lo de nou abaix."
 
 #: contrib/admin/views/auth.py:30
 msgid "Add user"
-msgstr "Agregar usuari"
+msgstr "Afegir usuari"
 
 #: contrib/admin/views/auth.py:57
 msgid "Password changed successfully."
@@ -1248,12 +1248,12 @@ msgstr "Lloc administratiu"
 #: contrib/admin/views/main.py:276 contrib/admin/views/main.py:361
 #, python-format
 msgid "You may add another %s below."
-msgstr "Pot agregar un altre %s abaix."
+msgstr "Pot afegir un altre %s a baix."
 
 #: contrib/admin/views/main.py:294
 #, python-format
 msgid "Add %s"
-msgstr "Agregar %s"
+msgstr "Afegir %s"
 
 #: contrib/admin/views/main.py:340
 #, python-format