From 6c83f8ed9282d18323e0d1fa8754f235ef256d27 Mon Sep 17 00:00:00 2001
From: Georg Bauer <gb@hugo.westfalen.de>
Date: Wed, 16 Nov 2005 18:28:42 +0000
Subject: [PATCH 01/10] fixes #807, #809 and #818 - updated translations for
 fr, zh_CN and ru.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1270 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/conf/locale/fr/LC_MESSAGES/django.mo   | Bin 17549 -> 17820 bytes
 django/conf/locale/fr/LC_MESSAGES/django.po   | 429 ++++++++---------
 django/conf/locale/ru/LC_MESSAGES/django.mo   | Bin 5134 -> 11784 bytes
 django/conf/locale/ru/LC_MESSAGES/django.po   | 444 +++++++++---------
 .../conf/locale/zh_CN/LC_MESSAGES/django.mo   | Bin 16720 -> 17047 bytes
 .../conf/locale/zh_CN/LC_MESSAGES/django.po   | 182 +++----
 6 files changed, 472 insertions(+), 583 deletions(-)

diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index ef76060be32bdf47be3fa04f9db75853d9329a56..f18a72d89052781f619f10f8d79d78c80343b012 100644
GIT binary patch
delta 4599
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

delta 4331
zcmYk;3v|wP9LMqR+J$UmHkWOTjoBWCZP+Y@q1w`1Vuni5<`&5+L(((ll1mqfGFD1v
zr5jI@A`?Z2PNbVohjb&(sYIPRqTZk9|J%v`?DM>SzyI?*zu)iw`~Cj^XKR;+Ji0i<
ze=Ig^rE%;dtx0i&S#*fmvM8N3tBWza4tHaFY|xa?U<MAsO1uLPVLWz^HKPeD!cZKJ
z;W!d!;1~?UBgp6c_7#O@oH&kG;(6~4yM+8%c$`@ij7Rz~AEsh2RKvF;e>R>MeSbEp
zgNLypK7v=_a%_$VQ0<(+6#BPw6x2a;M$ryCU;`|~G#rXPoQd6W9VX#ts2TYk)o=@5
z^!d)1jl=OqT!0$TVbp-Wz&t#T74&cMExajv+_?(%!D?5pL0##qt{%XA>hGWidI8lz
zXiKvKY>2v`p*R=Ey81EH=YBzb?;QGd;(~ia3#hdVM=gI8>VpZGjwzUnH((A{q6YRB
zYOQymK3|7wXFoQ=PcRz4#tb}#jj>q*^REH4Pw=kThpK0z8p=g|u@82|BGeb>pssKU
zCSsL4zZLnjy}W2I977G@6h`7XRD1toAB;|9{zp?NqLpN<!G*XFAHu<{yv=qPyHWoW
zHIR<nDvNLwYCzwjHr21Ffrqd`w1iipW+)alpm?MSYlqt0ef$(kDcpqm;#Snu?L>`m
zFX{?I+pyEI4YJ(!AZl~1L@mV$)YP_Y>)pl!P@8is>VoFu2#iejzCR9iLH=13w5FS|
z1Ad32uwe@KERMrW+>ZR&&%E@(NN$w^9EiHoCs7x$2DKN~qh@v^reg@B@nJ{Q5)VUW
z#BU=hXo|+6I+}<R@oDUd|KbGfnd(j9v#1VhQERywb>+Ko0G`1#%;ah`b0w&b%Tarv
z%2|UEy8pLO&>C(>HM}2nC5KUW!BJF4KcN~p@6M|i)uU10Pe5%-pF5w2+I-id)_#bq
zk4FBijF)iwx25il<){y?MKxUG>RT|3`VLp$?cP6t8t9j(fgg9CLT#?It{%qx>jI)t
z?Y2Vola78KLY7UT0T!UHcnIo)x1t)Jgc?9OhGPZla}OXt3$_^5L6v*I7WKW?uwRJT
zHXKa-Z=ZLU6?XLY#^jF7zjoywPTYwJoxIy)K1NVqhYfHes^izO0=J?D)H%a58+H5T
zqOPnEHGpBrt!}rVZo3)CS8X}!QNAOC`Bw+OaUv4`!bTX@*=x87s-b3hJtiR!FDpat
zD4UC2u^QF!LF8KO3sk$-#oN>kkyDn3eQ`XpI<~=2fmyMGsD}T*tFSSx_Qygj!=<Pz
z{teaeAJ_{o;!Bvvt)qc{=RD&)@4Seb(TFVX`_ZWO{mm)pibuIOO0k&w6x5W~VKsh=
zF*u!{HVtGRY9I@pkGb=!urcS?pf2cTjKV#r2hJfZ#84^)y8nwPsKKW&6j!4fu12l-
z2Gr7QLT%P<n1>%DzuXqVLhAd8s2OPM>ONFEU65aB%fTERh&(K<65Hwie~v;jC*DV`
z$@j=DZjE|)BhNz3P;b;g3Xva7E5_kC74@X6L!Q=_NH0~G=RAVEWz%@f>H)PLHT5TP
z7yVl&9&?)7)2NYMKwWtvm#H;NM%B|%o2&~aV^7pTM&UG^j+%kv&QqvI^;zV1$+Fm3
zQ*aQr!0qTCLE#Vu`m{856#LI^L)|XRkjJ;xqV~W6EXB!JdkuVyv~542c6HJ<-tHfR
zv#2jZwQs$>sV_lpFk6NL@$KHszosyhVd@G;I>(^)LMfKxL}a<`DCT1ny=f^1VN)E9
z+GJCZvDhrE#5Y|%C!gOJ>gA{zI)Yl#Z}R=#<~Yd-UCBRKggO0~E_?`6Fn~V%9OLj3
zs^eG|QUgy#Ek!5P!1|*$-(YNlC8#ByfU!6eb(bvhyTWSJ$Z9bWH={Z@h}r|kP!0cx
zy3(_lj+ap1OJiqgV40|y8-VJd0Hd+QoiB6sNvMJOD=27FEksSp6Q~Z>U^A>mb-WYx
zg^y4T9z}ibBsRzMs4H%Ct(zIt08&u{?2ci04Qj^vA>a2~0R>G>F{*>{?gKMWGcX53
zFhKOVGIBF%LtZ4yhz>n=UnW(AZ4x{dIWI>$ztEi+tNWk!Z5WwH#*wK+$Gsl5+4&@P
zB{#YHb@&KLB}<8BL2JuI*e;@@oLoVIw=H%j?+_hx$q@PvPKyseAUdA*2>t`QoU%67
z0(Wi|YCo)Wb@rjnCwqyexrpp0kCSS0E77esg}g~-k}c$Yau@M$=S2s%q}@*{RN=Uj
z=nlC2*hys$X-%|OmJl7Rqdh?;5cXs6S+WW14;}--qqzPAK2ILi`d3oeK<*%KlUqm%
z$s{_uk-?;dB$F4&jpTKbMzqNmllo(jD?EeKNe0O$wM2&=NPEa^5~uawMnM}-M|+Rp
zf54AXUPqoK50L9gJSiac$9)v;CgaIQ@-9gr3yF@~$@*Z)`)^vs=Lip6@6h_!xpG_F
z>dLuJF`3-v>TfvHaWv^fJ|xq~3ZmmZ5=wfI8AQiD9#-Sb!AR0{2QLqkmxu;)^@^r3
zaY?UIDkUAr7;*!tKh~`17Zc}STVKV#WGI<PdJ!G%Jc6&;mz7&lev9a7yPE7H!^tb;
zHKJn@=^QNm|MHY8K8Q)Wsb&Q}k7*qq7}4TDRG>%uN#T*%Imy}GdiBWal9e0S=sOV+
PIGuS{lfcxzSrPvMOtYwz

diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index 5f0ed1e39a..1996f4d879 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -1,13 +1,13 @@
-# translation of django.po to french
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
-# Laurent Rahuel <laurent.rahuel@gmail.com>, 2005.
-# 
+# translation of django.po to french
+# This file is distributed under the same license as the PACKAGE package.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# Laurent Rahuel <laurent.rahuel@gmail.com>, 2005.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 12:40-0600\n"
+"POT-Creation-Date: 2005-11-03 12:26+0100\n"
 "PO-Revision-Date: 2005-10-18 12:27+0200\n"
 "Last-Translator: Laurent Rahuel <laurent.rahuel@gmail.com>\n"
 "Language-Team: fran�ais <fr@li.org>\n"
@@ -15,34 +15,6 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: contrib/admin/models/admin.py:6
-msgid "action time"
-msgstr "heure de l'action"
-
-#: contrib/admin/models/admin.py:9
-msgid "object id"
-msgstr "id de l'objet"
-
-#: contrib/admin/models/admin.py:10
-msgid "object repr"
-msgstr "repr de l'objet"
-
-#: contrib/admin/models/admin.py:11
-msgid "action flag"
-msgstr "drapeau de l'action"
-
-#: contrib/admin/models/admin.py:12
-msgid "change message"
-msgstr "message de modification"
-
-#: contrib/admin/models/admin.py:15
-msgid "log entry"
-msgstr "entr�e de log"
-
-#: contrib/admin/models/admin.py:16
-msgid "log entries"
-msgstr "entr�es de log"
-
 #: contrib/admin/templates/admin/object_history.html:5
 #: contrib/admin/templates/admin/500.html:4
 #: contrib/admin/templates/admin/base.html:29
@@ -314,103 +286,33 @@ msgstr "Merci d'utiliser notre site!"
 msgid "The %(site_name)s team"
 msgstr "L'�quipe %(site_name)s"
 
-#: contrib/redirects/models/redirects.py:7
-msgid "redirect from"
-msgstr "redirig� depuis"
+#: contrib/admin/models/admin.py:6
+msgid "action time"
+msgstr "heure de l'action"
 
-#: contrib/redirects/models/redirects.py:8
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-"Ceci doit �tre un chemin absolu, sans nom de domaine. Par exemple: '/events/"
-"search/'."
+#: contrib/admin/models/admin.py:9
+msgid "object id"
+msgstr "id de l'objet"
 
-#: contrib/redirects/models/redirects.py:9
-msgid "redirect to"
-msgstr "redirig� vers"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "repr de l'objet"
 
-#: contrib/redirects/models/redirects.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-"Ceci peut �tre soit un chemin absolu (voir ci-dessus) soit une URL compl�te "
-"d�butant par 'http://'."
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "drapeau de l'action"
 
-#: contrib/redirects/models/redirects.py:12
-msgid "redirect"
-msgstr "redirection"
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "message de modification"
 
-#: contrib/redirects/models/redirects.py:13
-msgid "redirects"
-msgstr "redirections"
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "entr�e de log"
 
-#: contrib/flatpages/models/flatpages.py:6
-msgid "URL"
-msgstr "URL"
-
-#: contrib/flatpages/models/flatpages.py:7
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-"Par exemple : '/about/contact/'. V�rifiez la pr�sence du caract�re '/' en "
-"d�but et en fin de chaine."
-
-#: contrib/flatpages/models/flatpages.py:8
-msgid "title"
-msgstr "titre"
-
-#: contrib/flatpages/models/flatpages.py:9
-msgid "content"
-msgstr "contenu"
-
-#: contrib/flatpages/models/flatpages.py:10
-msgid "enable comments"
-msgstr "autoriser les commentaires"
-
-#: contrib/flatpages/models/flatpages.py:11
-msgid "template name"
-msgstr "nom du template"
-
-#: contrib/flatpages/models/flatpages.py:12
-#, fuzzy
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-"Par exemple: 'flatfiles/contact_page'. Sans d�finition, le syst�me utilisera "
-"'flatfiles/default'."
-
-#: contrib/flatpages/models/flatpages.py:13
-msgid "registration required"
-msgstr "enregistrement requis"
-
-#: contrib/flatpages/models/flatpages.py:13
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-"Si coch�, seuls les utilisateurs connect�s auront la possibilit� de voir "
-"cette page."
-
-#: contrib/flatpages/models/flatpages.py:17
-msgid "flat page"
-msgstr "page � plat"
-
-#: contrib/flatpages/models/flatpages.py:18
-msgid "flat pages"
-msgstr "pages � plat"
-
-#: utils/translation.py:335
-msgid "DATE_FORMAT"
-msgstr ""
-
-#: utils/translation.py:336
-msgid "DATETIME_FORMAT"
-msgstr ""
-
-#: utils/translation.py:337
-msgid "TIME_FORMAT"
-msgstr ""
+#: contrib/admin/models/admin.py:16
+msgid "log entries"
+msgstr "entr�es de log"
 
 #: utils/dates.py:6
 msgid "Monday"
@@ -516,67 +418,152 @@ msgstr "Nov."
 msgid "Dec."
 msgstr "D�c."
 
-#: models/core.py:7
+#: models/core.py:5
 msgid "domain name"
 msgstr "nom de domaine"
 
-#: models/core.py:8
+#: models/core.py:6
 msgid "display name"
 msgstr "nom � afficher"
 
-#: models/core.py:10
+#: models/core.py:8
 msgid "site"
 msgstr "site"
 
-#: models/core.py:11
+#: models/core.py:9
 msgid "sites"
 msgstr "sites"
 
-#: models/core.py:28
+#: models/core.py:22
 msgid "label"
 msgstr "intitul�"
 
-#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
+#: models/core.py:23 models/core.py:34 models/auth.py:6 models/auth.py:19
 msgid "name"
 msgstr "nom"
 
-#: models/core.py:31
+#: models/core.py:25
 msgid "package"
 msgstr "paquetage"
 
-#: models/core.py:32
+#: models/core.py:26
 msgid "packages"
 msgstr "paquetages"
 
-#: models/core.py:42
+#: models/core.py:36
 msgid "python module name"
 msgstr "nom du module python"
 
-#: models/core.py:44
+#: models/core.py:38
 msgid "content type"
 msgstr "type de contenu"
 
-#: models/core.py:45
+#: models/core.py:39
 msgid "content types"
 msgstr "types de contenu"
 
+#: models/core.py:62
+msgid "redirect from"
+msgstr "redirig� depuis"
+
+#: models/core.py:63
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
+msgstr ""
+"Ceci doit �tre un chemin absolu, sans nom de domaine. Par exemple: '/events/"
+"search/'."
+
+#: models/core.py:64
+msgid "redirect to"
+msgstr "redirig� vers"
+
+#: models/core.py:65
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
+msgstr ""
+"Ceci peut �tre soit un chemin absolu (voir ci-dessus) soit une URL compl�te "
+"d�butant par 'http://'."
+
 #: models/core.py:67
+msgid "redirect"
+msgstr "redirection"
+
+#: models/core.py:68
+msgid "redirects"
+msgstr "redirections"
+
+#: models/core.py:81
+msgid "URL"
+msgstr "URL"
+
+#: models/core.py:82
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgstr ""
+"Par exemple : '/about/contact/'. V�rifiez la pr�sence du caract�re '/' en "
+"d�but et en fin de chaine."
+
+#: models/core.py:83
+msgid "title"
+msgstr "titre"
+
+#: models/core.py:84
+msgid "content"
+msgstr "contenu"
+
+#: models/core.py:85
+msgid "enable comments"
+msgstr "autoriser les commentaires"
+
+#: models/core.py:86
+msgid "template name"
+msgstr "nom du template"
+
+#: models/core.py:87
+msgid ""
+"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
+"use 'flatfiles/default'."
+msgstr ""
+"Par exemple: 'flatfiles/contact_page'. Sans d�finition, le syst�me utilisera "
+"'flatfiles/default'."
+
+#: models/core.py:88
+msgid "registration required"
+msgstr "enregistrement requis"
+
+#: models/core.py:88
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr ""
+"Si coch�, seuls les utilisateurs connect�s auront la possibilit� de voir "
+"cette page."
+
+#: models/core.py:92
+msgid "flat page"
+msgstr "page � plat"
+
+#: models/core.py:93
+msgid "flat pages"
+msgstr "pages � plat"
+
+#: models/core.py:114
 msgid "session key"
 msgstr "cl� de session"
 
-#: models/core.py:68
+#: models/core.py:115
 msgid "session data"
 msgstr "donn�e de session"
 
-#: models/core.py:69
+#: models/core.py:116
 msgid "expire date"
 msgstr "date d'expiration"
 
-#: models/core.py:71
+#: models/core.py:118
 msgid "session"
 msgstr "session"
 
-#: models/core.py:72
+#: models/core.py:119
 msgid "sessions"
 msgstr "sessions"
 
@@ -669,157 +656,124 @@ msgstr "Information personnelle"
 msgid "Important dates"
 msgstr "Dates importantes"
 
-#: models/auth.py:195
+#: models/auth.py:182
 msgid "Message"
 msgstr "Message"
 
-#: conf/global_settings.py:36
-msgid "Bengali"
-msgstr ""
-
 #: conf/global_settings.py:37
 msgid "Czech"
 msgstr "Tch�que"
 
 #: conf/global_settings.py:38
-msgid "Welsh"
-msgstr ""
-
-#: conf/global_settings.py:39
-#, fuzzy
-msgid "Danish"
-msgstr "Espagnol"
-
-#: conf/global_settings.py:40
 msgid "German"
 msgstr "Allemand"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:39
 msgid "English"
 msgstr "Anglais"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:40
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:41
 msgid "French"
 msgstr "Fran�ais"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:42
 msgid "Galician"
 msgstr "Galicien"
 
-#: conf/global_settings.py:45
-msgid "Icelandic"
-msgstr ""
-
-#: conf/global_settings.py:46
+#: conf/global_settings.py:43
 #, fuzzy
 msgid "Italian"
 msgstr "Italien"
 
-#: conf/global_settings.py:47
-msgid "Norwegian"
-msgstr ""
-
-#: conf/global_settings.py:48
+#: conf/global_settings.py:44
 msgid "Brazilian"
 msgstr "Br�silien"
 
-#: conf/global_settings.py:49
-msgid "Romanian"
-msgstr ""
-
-#: conf/global_settings.py:50
+#: conf/global_settings.py:45
 msgid "Russian"
 msgstr "Russe"
 
-#: conf/global_settings.py:51
-msgid "Slovak"
-msgstr ""
-
-#: conf/global_settings.py:52
+#: conf/global_settings.py:46
 #, fuzzy
 msgid "Serbian"
 msgstr "Serbe"
 
-#: conf/global_settings.py:53
-msgid "Swedish"
-msgstr ""
+#: conf/global_settings.py:47
+msgid "Traditional Chinese"
+msgstr "Chinois traditionnel"
 
-#: conf/global_settings.py:54
-msgid "Simplified Chinese"
-msgstr ""
-
-#: core/validators.py:59
+#: core/validators.py:58
 msgid "This value must contain only letters, numbers and underscores."
 msgstr ""
 "Ce champ ne doit contenir que des lettres, des nombres et des sous-tirets."
 
-#: core/validators.py:63
+#: core/validators.py:62
 msgid "This value must contain only letters, numbers, underscores and slashes."
 msgstr ""
 "Ce champ ne doit contenir que des lettres, des nombres, des sous-tirets et "
 "des '/'."
 
-#: core/validators.py:71
+#: core/validators.py:70
 msgid "Uppercase letters are not allowed here."
 msgstr "Les lettres majuscules ne sont pas autoris�es ici."
 
-#: core/validators.py:75
+#: core/validators.py:74
 msgid "Lowercase letters are not allowed here."
 msgstr "Les lettres minuscules ne sont pas autoris�es ici."
 
-#: core/validators.py:82
+#: core/validators.py:81
 msgid "Enter only digits separated by commas."
 msgstr "Seulement des chiffres ([0-9]), s�par�s par des virgules."
 
-#: core/validators.py:94
+#: core/validators.py:93
 msgid "Enter valid e-mail addresses separated by commas."
 msgstr "Entrez des adresses de courriel valides s�par�es par des virgules."
 
-#: core/validators.py:98
+#: core/validators.py:100
 msgid "Please enter a valid IP address."
 msgstr "Entrez une adresse IP valide."
 
-#: core/validators.py:102
+#: core/validators.py:104
 msgid "Empty values are not allowed here."
 msgstr "Vous ne pouvez pas laisser ce champ vide."
 
-#: core/validators.py:106
+#: core/validators.py:108
 msgid "Non-numeric characters aren't allowed here."
 msgstr "Les caract�res non num�riques ne sont pas autoris�s ici."
 
-#: core/validators.py:110
+#: core/validators.py:112
 msgid "This value can't be comprised solely of digits."
 msgstr "Cette valeur ne peut contenir que des chiffres [0-9]."
 
-#: core/validators.py:115
+#: core/validators.py:117
 msgid "Enter a whole number."
 msgstr "Entrez un nombre entier."
 
-#: core/validators.py:119
+#: core/validators.py:121
 msgid "Only alphabetical characters are allowed here."
 msgstr "Seules les lettres de l'alphabet sont autoris�es ici."
 
-#: core/validators.py:123
+#: core/validators.py:125
 msgid "Enter a valid date in YYYY-MM-DD format."
 msgstr "Entrez une date valide au format AAAA-MM-JJ."
 
-#: core/validators.py:127
+#: core/validators.py:129
 msgid "Enter a valid time in HH:MM format."
 msgstr "Entrez une heure valide au format HH:MM."
 
-#: core/validators.py:131
+#: core/validators.py:133
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
 msgstr "Entrez une date et une heure valide au format AAAA-MM-JJ HH:MM."
 
-#: core/validators.py:135
+#: core/validators.py:137
 msgid "Enter a valid e-mail address."
 msgstr "Entrez une adresse de courriel valide."
 
-#: core/validators.py:147
+#: core/validators.py:149
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
@@ -827,28 +781,28 @@ msgstr ""
 "Envoyez une image valide. Le fichier que vous avez transfer� n'est pas une "
 "image ou bien est une image corrompue."
 
-#: core/validators.py:154
+#: core/validators.py:156
 #, python-format
 msgid "The URL %s does not point to a valid image."
 msgstr "L'URL %s ne pointe pas vers une image valide."
 
-#: core/validators.py:158
+#: core/validators.py:160
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
 msgstr ""
 "Les num�ros de t�l�phone doivent �tre au format XX XX XX XX XX. \"%s\" est "
 "incorrect."
 
-#: core/validators.py:166
+#: core/validators.py:168
 #, python-format
 msgid "The URL %s does not point to a valid QuickTime video."
 msgstr "L'URL %s ne pointe pas vers une vid�o QuickTime valide."
 
-#: core/validators.py:170
+#: core/validators.py:172
 msgid "A valid URL is required."
 msgstr "Une URL valide est requise."
 
-#: core/validators.py:184
+#: core/validators.py:186
 #, python-format
 msgid ""
 "Valid HTML is required. Specific errors are:\n"
@@ -857,69 +811,69 @@ msgstr ""
 "Du HTML valide est requis. Les erreurs sp�cifiques sont:\n"
 "%s"
 
-#: core/validators.py:191
+#: core/validators.py:193
 #, python-format
 msgid "Badly formed XML: %s"
 msgstr "XML mal form�: %s"
 
-#: core/validators.py:201
+#: core/validators.py:203
 #, python-format
 msgid "Invalid URL: %s"
 msgstr "URL invalide: %s"
 
-#: core/validators.py:205 core/validators.py:207
+#: core/validators.py:205
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "L'URL %s est un lien cass�."
 
-#: core/validators.py:213
+#: core/validators.py:211
 msgid "Enter a valid U.S. state abbreviation."
 msgstr "Entrez une abr�viation d'�tat am�ricain valide."
 
-#: core/validators.py:228
+#: core/validators.py:226
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
 msgstr[0] "Attention � votre langage,! Le mot %s n'est pas autoris� ici."
 msgstr[1] "Attention � votre langage,! Les mots %s ne sont pas autoris�s ici."
 
-#: core/validators.py:235
+#: core/validators.py:233
 #, python-format
 msgid "This field must match the '%s' field."
 msgstr "Ce champ doit correspondre au champ '%s'."
 
-#: core/validators.py:254
+#: core/validators.py:252
 msgid "Please enter something for at least one field."
 msgstr "S'il vous pla�t, saisissez au moins une valeur dans un des champs."
 
-#: core/validators.py:263 core/validators.py:274
+#: core/validators.py:261 core/validators.py:272
 msgid "Please enter both fields or leave them both empty."
 msgstr "S'il vous pla�t, renseignez chaque champ ou laissez les deux vides."
 
-#: core/validators.py:281
+#: core/validators.py:279
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr "Ce champ doit �tre renseign� si %(field)s vaut %(value)s"
 
-#: core/validators.py:293
+#: core/validators.py:291
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr "Ce champ doit �tre renseign� si %(field)s ne vaut pas %(value)s"
 
-#: core/validators.py:312
+#: core/validators.py:310
 msgid "Duplicate values are not allowed."
 msgstr "Des valeurs identiques ne sont pas autoris�es."
 
-#: core/validators.py:335
+#: core/validators.py:333
 #, python-format
 msgid "This value must be a power of %s."
 msgstr "Cette valeur doit �tre une puissance de %s."
 
-#: core/validators.py:346
+#: core/validators.py:344
 msgid "Please enter a valid decimal number."
 msgstr "S'il vous pla�t, saisissez un nombre d�cimal valide."
 
-#: core/validators.py:348
+#: core/validators.py:346
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@@ -929,7 +883,7 @@ msgstr[0] ""
 msgstr[1] ""
 "S'il vous pla�t, saisissez un nombre d�cimal valide avec au plus %s chiffres."
 
-#: core/validators.py:351
+#: core/validators.py:349
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@@ -939,32 +893,32 @@ msgstr[0] ""
 msgstr[1] ""
 "S'il vous pla�t, saisissez un nombre d�cimal valide avec au plus %s d�cimales"
 
-#: core/validators.py:361
+#: core/validators.py:359
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr ""
 "V�rifiez que le fichier transf�r� fait au moins une taille de %s octets."
 
-#: core/validators.py:362
+#: core/validators.py:360
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr ""
 "V�rifiez que le fichier transf�r� fait au plus une taille de %s octets."
 
-#: core/validators.py:375
+#: core/validators.py:373
 msgid "The format for this field is wrong."
 msgstr "Le format de ce champ est mauvais."
 
-#: core/validators.py:390
+#: core/validators.py:388
 msgid "This field is invalid."
 msgstr "Ce champ est invalide."
 
-#: core/validators.py:425
+#: core/validators.py:423
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr "Impossible de r�cup�rer quoi que ce soit depuis %s."
 
-#: core/validators.py:428
+#: core/validators.py:426
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
@@ -972,7 +926,7 @@ msgstr ""
 "L'ent�te Content-Type '%(contenttype)s', renvoy�e par l'url %(url)s n'est "
 "pas valide."
 
-#: core/validators.py:461
+#: core/validators.py:459
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
@@ -981,7 +935,7 @@ msgstr ""
 "Veuillez fermer le tag %(tag)s de la ligne %(line)s. (La ligne d�butant par "
 "\"%(start)s\".)"
 
-#: core/validators.py:465
+#: core/validators.py:463
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
@@ -990,7 +944,7 @@ msgstr ""
 "Du texte commen�ant � la ligne %(line)s n'est pas autoris� dans ce contexte. "
 "(Ligne d�butant par \"%(start)s\".)"
 
-#: core/validators.py:470
+#: core/validators.py:468
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
@@ -999,7 +953,7 @@ msgstr ""
 "\"%(attr)s\" ligne %(line)s n'est pas un attribut valide. (Ligne d�butant "
 "par \"%(start)s\".)"
 
-#: core/validators.py:475
+#: core/validators.py:473
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
@@ -1008,7 +962,7 @@ msgstr ""
 "\"<%(tag)s>\" ligne %(line)s n'est pas un tag valide. (Ligne d�butant par \"%"
 "(start)s\".)"
 
-#: core/validators.py:479
+#: core/validators.py:477
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
@@ -1017,7 +971,7 @@ msgstr ""
 "Un tag, ou un ou plusieurs attributs, de la ligne %(line)s est manquant. "
 "(Ligne d�butant par \"%(start)s\".)"
 
-#: core/validators.py:484
+#: core/validators.py:482
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -1026,19 +980,16 @@ msgstr ""
 "La valeur de l'attribut \"%(attr)s\" de la ligne %(line)s n'est pas valide. "
 "(Ligne d�butant par \"%(start)s\".)"
 
-#: core/meta/fields.py:111
+#: core/meta/fields.py:95
 msgid " Separate multiple IDs with commas."
 msgstr "S�parez les ID par des virgules."
 
-#: core/meta/fields.py:114
+#: core/meta/fields.py:98
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Maintenez \"Control\", or \"Command\" sur un Mac, pour en s�lectionner plus "
 "d'une."
 
-#~ msgid "Traditional Chinese"
-#~ msgstr "Chinois traditionnel"
-
 #~ msgid "Messages"
 #~ msgstr "Messages"
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 0a6adbba276a89b99b191cc89d53fa88bf489c3c..ea8a9e44abd448c6922611918849bbccee29f886 100644
GIT binary patch
literal 11784
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

delta 1552
zcmYMze@xVM9LMobg<zT&KSbq3`3ee$pdQ9aUB;lY4N1ziS}o^xb(e7w7>MLXo___j
z)vAxItv?!8np?k|Yt0{jVO|bKd=ZY0t95@g){jk{t*x!qs^{yt^t12#`}ll5-|zSH
z`#ZSj4PPu>m@{lh+lW$P;ud3Cu>Ur0q>&tBa`70d>Lm8!C)xV)MaC3TuEslYI~L%>
zScH4=cI?Jt?9V=b8+kuwJ|uHD55B;Icomy4Os{!(9O=t^iW<miZg=2W)bp=#2~OfN
zOrZyV&X)hkmUDPn11v%>R-lLeO(U5SDt4hpx(^5NB~(LyqGq&su`#RBi<<E^Y{V8+
zgM+vNKfqV<96pK7G^+RBMNK4y>L<;uf&R@eWS&EZY4D91K+WV$tikv20UXCl^ekQI
zFn~VFkD}@i;TE=U1l7(I%Oq2{4}Z*-chY!1<;O6lOqh)Jsu%gz3?Y4)VO)hHsIzev
zxy-lRf;f*+EMuAc_!_cU<~-)&SEw0}BbRZxvAZUX+QNCQzZ(3F3U&A|a+xJ;lm=9S
z8sH|Z#zxeK&*Mt$MRoW(S{%mAVdNvVvmMu9D=x=&ycZ8+IiAaB{nwKDfr_K}H@4$j
zZ1{cn7plX1XjL<L2<x#GU%(@%vvCFW-aohjmoobMu@2SI0n~us!7BV5^~WV+WZ1Gy
z(&19tMED7fxPnk(VmFcwnHu{)Z6TBWTg_eMHDe97j8NxF>U1li<=2_eYAVGTaAxE>
zK-y!@;*F&LRey$Ntfa#hAl4HOp;KQ&C}}oY$<2h$kdn5xE|Xi>UTqZ%oY~rJb$w>J
zHd3l3w3N3JI&|7U9inwaCN)2MpuMZpG>5}>a9N*qJWtypPlG*^f6De3wAq%z(!j1m
z&ca(grY+Lv><{(y^mTQIgQl&kGvb5}hT1zq&vZo0BOT$J5AE)vF8k5)lXicxFW2z}
z{Qhcty13V#STSTjUip;WvnuF$yeHCabn6Vg7zx^=CGXoN?{#}|b(OtT+Ljk^>b3^!
z{kC+?_xbbj@tH(&EN<rA3!}-ggnfB!)aI2vVWVXa+RxUVu+j1+>r{B_uexJS_T|gw
znww0GJ5!_6?!;WsT#H|HXA-khldkzaF*<$oiCwh*72CbxOS_}8)*h+Mv$pcE9ja=z
zvsF9oF<;c~t!^y1P8;93$<ai7V$S^f&E=pywQ;~Z<xb3|#}ac+{F3Xq>G<TFb0Ia8
Qn07bY-8EP2PqhvI0ZwuQOaK4?

diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index f82d0a3c4b..aec5077111 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 12:40-0600\n"
+"POT-Creation-Date: 2005-11-10 05:53-0600\n"
 "PO-Revision-Date: 2005-10-05 00:00\n"
 "Last-Translator: Dmitry Sorokin <ds@@dial.com.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -92,9 +92,8 @@ msgid "Django administration"
 msgstr "����������������� Django"
 
 #: contrib/admin/templates/admin/500.html:4
-#, fuzzy
 msgid "Server error"
-msgstr "������ ������� (500)"
+msgstr "������ �������"
 
 #: contrib/admin/templates/admin/500.html:6
 msgid "Server error (500)"
@@ -109,7 +108,7 @@ 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 ""
-"��������� ������. ����� �� ������ ��������� ��������������� ����� �� e-mail� "
+"��������� ������. ����� �� ������ ��������� ��������������� ����� �� e-mail � "
 "��� ������ ���� ������ ����������. ���������� ��� �� �������� � ������."
 
 #: contrib/admin/templates/admin/404.html:4
@@ -254,7 +253,7 @@ msgid ""
 "should be receiving it shortly."
 msgstr ""
 "�� ��������� ����� ������ �� ���������� ���� ������ ����������� �����. �� "
-"������ �������� ��� ����� ������."
+"������ ��� ������ ��������."
 
 #: contrib/admin/templates/registration/password_change_form.html:12
 msgid ""
@@ -311,216 +310,129 @@ msgstr "
 msgid "The %(site_name)s team"
 msgstr "������� ����� di %(site_name)s"
 
-#: contrib/redirects/models/redirects.py:7
-msgid "redirect from"
-msgstr ""
-
-#: contrib/redirects/models/redirects.py:8
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
-msgstr ""
-
-#: contrib/redirects/models/redirects.py:9
-msgid "redirect to"
-msgstr ""
-
-#: contrib/redirects/models/redirects.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
-msgstr ""
-
-#: contrib/redirects/models/redirects.py:12
-msgid "redirect"
-msgstr ""
-
-#: contrib/redirects/models/redirects.py:13
-msgid "redirects"
-msgstr ""
-
-#: contrib/flatpages/models/flatpages.py:6
-msgid "URL"
-msgstr ""
-
-#: contrib/flatpages/models/flatpages.py:7
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
-msgstr ""
-
-#: contrib/flatpages/models/flatpages.py:8
-msgid "title"
-msgstr ""
-
-#: contrib/flatpages/models/flatpages.py:9
-msgid "content"
-msgstr ""
-
-#: contrib/flatpages/models/flatpages.py:10
-msgid "enable comments"
-msgstr ""
-
-#: contrib/flatpages/models/flatpages.py:11
-msgid "template name"
-msgstr ""
-
-#: contrib/flatpages/models/flatpages.py:12
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-
-#: contrib/flatpages/models/flatpages.py:13
-msgid "registration required"
-msgstr ""
-
-#: contrib/flatpages/models/flatpages.py:13
-msgid "If this is checked, only logged-in users will be able to view the page."
-msgstr ""
-
-#: contrib/flatpages/models/flatpages.py:17
-msgid "flat page"
-msgstr ""
-
-#: contrib/flatpages/models/flatpages.py:18
-msgid "flat pages"
-msgstr ""
-
-#: utils/translation.py:335
-msgid "DATE_FORMAT"
-msgstr ""
-
-#: utils/translation.py:336
-msgid "DATETIME_FORMAT"
-msgstr ""
-
-#: utils/translation.py:337
-msgid "TIME_FORMAT"
-msgstr ""
-
 #: utils/dates.py:6
 msgid "Monday"
-msgstr ""
+msgstr "�����������"
 
 #: utils/dates.py:6
 msgid "Tuesday"
-msgstr ""
+msgstr "�������"
 
 #: utils/dates.py:6
 msgid "Wednesday"
-msgstr ""
+msgstr "�����"
 
 #: utils/dates.py:6
 msgid "Thursday"
-msgstr ""
+msgstr "�������"
 
 #: utils/dates.py:6
 msgid "Friday"
-msgstr ""
+msgstr "�������"
 
 #: utils/dates.py:7
 msgid "Saturday"
-msgstr ""
+msgstr "�������"
 
 #: utils/dates.py:7
 msgid "Sunday"
-msgstr ""
+msgstr "�����������"
 
 #: utils/dates.py:14
 msgid "January"
-msgstr ""
+msgstr "������"
 
 #: utils/dates.py:14
 msgid "February"
-msgstr ""
+msgstr "�������"
 
 #: utils/dates.py:14 utils/dates.py:27
 msgid "March"
-msgstr ""
+msgstr "����"
 
 #: utils/dates.py:14 utils/dates.py:27
 msgid "April"
-msgstr ""
+msgstr "������"
 
 #: utils/dates.py:14 utils/dates.py:27
 msgid "May"
-msgstr ""
+msgstr "���"
 
 #: utils/dates.py:14 utils/dates.py:27
 msgid "June"
-msgstr ""
+msgstr "����"
 
 #: utils/dates.py:15 utils/dates.py:27
 msgid "July"
-msgstr ""
+msgstr "����"
 
 #: utils/dates.py:15
 msgid "August"
-msgstr ""
+msgstr "������"
 
 #: utils/dates.py:15
 msgid "September"
-msgstr ""
+msgstr "��������"
 
 #: utils/dates.py:15
 msgid "October"
-msgstr ""
+msgstr "�������"
 
 #: utils/dates.py:15
 msgid "November"
-msgstr ""
+msgstr "������"
 
 #: utils/dates.py:16
 msgid "December"
-msgstr ""
+msgstr "�������"
 
 #: utils/dates.py:27
 msgid "Jan."
-msgstr ""
+msgstr "���."
 
 #: utils/dates.py:27
 msgid "Feb."
-msgstr ""
+msgstr "���."
 
 #: utils/dates.py:28
 msgid "Aug."
-msgstr ""
+msgstr "���."
 
 #: utils/dates.py:28
 msgid "Sept."
-msgstr ""
+msgstr "���."
 
 #: utils/dates.py:28
 msgid "Oct."
-msgstr ""
+msgstr "���."
 
 #: utils/dates.py:28
 msgid "Nov."
-msgstr ""
+msgstr "����."
 
 #: utils/dates.py:28
 msgid "Dec."
-msgstr ""
+msgstr "���."
 
 #: models/core.py:7
 msgid "domain name"
-msgstr ""
+msgstr "�����"
 
 #: models/core.py:8
 msgid "display name"
-msgstr ""
+msgstr "��������� ���"
 
 #: models/core.py:10
 msgid "site"
-msgstr ""
+msgstr "����"
 
 #: models/core.py:11
 msgid "sites"
-msgstr ""
+msgstr "�����"
 
 #: models/core.py:28
 msgid "label"
-msgstr ""
+msgstr "�����"
 
 #: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
 #, fuzzy
@@ -529,76 +441,158 @@ msgstr "
 
 #: models/core.py:31
 msgid "package"
-msgstr ""
+msgstr "�����"
 
 #: models/core.py:32
 msgid "packages"
-msgstr ""
+msgstr "������"
 
 #: models/core.py:42
 msgid "python module name"
-msgstr ""
+msgstr "��� python ������"
 
 #: models/core.py:44
 msgid "content type"
-msgstr ""
+msgstr "��� ����������"
 
 #: models/core.py:45
 msgid "content types"
-msgstr ""
-
-#: models/core.py:67
-msgid "session key"
-msgstr ""
+msgstr "���� ����������"
 
 #: models/core.py:68
-msgid "session data"
-msgstr ""
+msgid "redirect from"
+msgstr "������������� ��"
 
 #: models/core.py:69
-msgid "expire date"
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
+"��� ������ ���� ���������� ����, �������� �������� ���. ������: '/"
+"events/search/'."
+
+#: models/core.py:70
+msgid "redirect to"
+msgstr "������������� ��"
 
 #: models/core.py:71
-msgid "session"
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
 msgstr ""
+"��� ������ ����, ���� ���������� ���� (��� ����) ��� ������ URL ������������ � "
+"'http://'."
 
-#: models/core.py:72
-msgid "sessions"
+#: models/core.py:73
+msgid "redirect"
+msgstr "�������������"
+
+#: models/core.py:74
+msgid "redirects"
+msgstr "���������������"
+
+#: models/core.py:87
+msgid "URL"
+msgstr "URL"
+
+#: models/core.py:88
+msgid ""
+"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr ""
+"������: '/about/contact/'. ������ ��������, ��� �������� ������������ ����."
+
+#: models/core.py:89
+msgid "title"
+msgstr "���������"
+
+#: models/core.py:90
+msgid "content"
+msgstr "����������"
+
+#: models/core.py:91
+msgid "enable comments"
+msgstr "������������ �����������"
+
+#: models/core.py:92
+msgid "template name"
+msgstr "��� �������"
+
+#: models/core.py:93
+msgid ""
+"Example: 'flatfiles/contact_page'. If this isn't provided, the system will "
+"use 'flatfiles/default'."
+msgstr ""
+"������: 'flatfiles/contact_page'. ���� �� �������������, ������� ����� "
+"������������ 'flatfiles/default'."
+
+#: models/core.py:94
+msgid "registration required"
+msgstr "����������� �����������"
+
+#: models/core.py:94
+msgid "If this is checked, only logged-in users will be able to view the page."
+msgstr "���� ��������, ������ �������� ������������ ������ ������ ��������"
+
+#: models/core.py:98
+msgid "flat page"
+msgstr "������� ��������"
+
+#: models/core.py:99
+msgid "flat pages"
+msgstr "������� ��������"
+
+#: models/core.py:117
+msgid "session key"
+msgstr "���� ������"
+
+#: models/core.py:118
+msgid "session data"
+msgstr "������ ������"
+
+#: models/core.py:119
+msgid "expire date"
+msgstr "���� ���������"
+
+#: models/core.py:121
+msgid "session"
+msgstr "������"
+
+#: models/core.py:122
+msgid "sessions"
+msgstr "������"
 
 #: models/auth.py:8
 msgid "codename"
-msgstr ""
+msgstr "���"
 
 #: models/auth.py:10
 msgid "Permission"
-msgstr ""
+msgstr "�����"
 
 #: models/auth.py:11 models/auth.py:58
 msgid "Permissions"
-msgstr ""
+msgstr "�����"
 
 #: models/auth.py:22
 msgid "Group"
-msgstr ""
+msgstr "������"
 
 #: models/auth.py:23 models/auth.py:60
 msgid "Groups"
-msgstr ""
+msgstr "������"
 
 #: models/auth.py:33
 #, fuzzy
 msgid "username"
-msgstr "���:"
+msgstr "���:"
 
 #: models/auth.py:34
 msgid "first name"
-msgstr ""
+msgstr "���"
 
 #: models/auth.py:35
 msgid "last name"
-msgstr ""
+msgstr "�������"
 
 #: models/auth.py:36
 #, fuzzy
@@ -612,7 +606,7 @@ msgstr "
 
 #: models/auth.py:37
 msgid "Use an MD5 hash -- not the raw password."
-msgstr ""
+msgstr "����������� MD5 ��� -- ������ �� �������������� ������"
 
 #: models/auth.py:38
 msgid "staff status"
@@ -624,19 +618,19 @@ msgstr ""
 
 #: models/auth.py:39
 msgid "active"
-msgstr ""
+msgstr "�������"
 
 #: models/auth.py:40
 msgid "superuser status"
-msgstr ""
+msgstr "������ ������"
 
 #: models/auth.py:41
 msgid "last login"
-msgstr ""
+msgstr "��������� ����"
 
 #: models/auth.py:42
 msgid "date joined"
-msgstr ""
+msgstr "���� �����������"
 
 #: models/auth.py:44
 msgid ""
@@ -651,15 +645,15 @@ msgstr "
 
 #: models/auth.py:57
 msgid "Personal info"
-msgstr ""
+msgstr "������������ ����������"
 
 #: models/auth.py:59
 msgid "Important dates"
-msgstr ""
+msgstr "������ ����"
 
-#: models/auth.py:195
+#: models/auth.py:182
 msgid "Message"
-msgstr ""
+msgstr "���������"
 
 #: conf/global_settings.py:36
 msgid "Bengali"
@@ -674,66 +668,54 @@ msgid "Welsh"
 msgstr ""
 
 #: conf/global_settings.py:39
-msgid "Danish"
-msgstr ""
-
-#: conf/global_settings.py:40
 msgid "German"
 msgstr ""
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:40
 msgid "English"
 msgstr ""
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:41
 msgid "Spanish"
 msgstr ""
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:42
 msgid "French"
 msgstr ""
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:43
 msgid "Galician"
 msgstr ""
 
-#: conf/global_settings.py:45
-msgid "Icelandic"
-msgstr ""
-
-#: conf/global_settings.py:46
+#: conf/global_settings.py:44
 msgid "Italian"
 msgstr ""
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:45
 msgid "Norwegian"
 msgstr ""
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:46
 msgid "Brazilian"
 msgstr ""
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:47
 msgid "Romanian"
 msgstr ""
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:48
 msgid "Russian"
-msgstr ""
+msgstr "������"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:49
 msgid "Slovak"
 msgstr ""
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:50
 msgid "Serbian"
 msgstr ""
 
-#: conf/global_settings.py:53
-msgid "Swedish"
-msgstr ""
-
-#: conf/global_settings.py:54
+#: conf/global_settings.py:51
 msgid "Simplified Chinese"
 msgstr ""
 
@@ -748,31 +730,31 @@ msgstr "
 
 #: core/validators.py:71
 msgid "Uppercase letters are not allowed here."
-msgstr ""
+msgstr "��������� ����� �� ���������"
 
 #: core/validators.py:75
 msgid "Lowercase letters are not allowed here."
-msgstr ""
+msgstr "�������� ����� �� ���������"
 
 #: core/validators.py:82
 msgid "Enter only digits separated by commas."
-msgstr ""
+msgstr "������� ������ ����� �����̣���� ��������"
 
 #: core/validators.py:94
 msgid "Enter valid e-mail addresses separated by commas."
-msgstr ""
+msgstr "������� �������� e-mail ������ �����̣���� ��������"
 
 #: core/validators.py:98
 msgid "Please enter a valid IP address."
-msgstr ""
+msgstr "����������, ������� �������� IP �����"
 
 #: core/validators.py:102
 msgid "Empty values are not allowed here."
-msgstr ""
+msgstr "������ �������� �� ���������"
 
 #: core/validators.py:106
 msgid "Non-numeric characters aren't allowed here."
-msgstr ""
+msgstr "�� �������� ������� �� ����������"
 
 #: core/validators.py:110
 msgid "This value can't be comprised solely of digits."
@@ -780,23 +762,23 @@ msgstr ""
 
 #: core/validators.py:115
 msgid "Enter a whole number."
-msgstr ""
+msgstr "������� �����"
 
 #: core/validators.py:119
 msgid "Only alphabetical characters are allowed here."
-msgstr ""
+msgstr "������ ����� ����� ������������"
 
 #: core/validators.py:123
 msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr ""
+msgstr "������� �������� ���� � ������� YYYY-MM-DD."
 
 #: core/validators.py:127
 msgid "Enter a valid time in HH:MM format."
-msgstr ""
+msgstr "������� �������� ����� � ������� HH:MM."
 
 #: core/validators.py:131
 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format."
-msgstr ""
+msgstr "������� �������� ����/����� � ������� YYYY-MM-DD HH:MM."
 
 #: core/validators.py:135
 #, fuzzy
@@ -807,26 +789,27 @@ msgstr "E-mail 
 msgid ""
 "Upload a valid image. The file you uploaded was either not an image or a "
 "corrupted image."
-msgstr ""
+msgstr "��������� �������� �����������. ����, ������� �� ���������, ���� ���� �� �����������"
+"��� ��������� ������."
 
 #: core/validators.py:154
 #, python-format
 msgid "The URL %s does not point to a valid image."
-msgstr ""
+msgstr "URL %s �� ��������� �� �������� �����������."
 
 #: core/validators.py:158
 #, python-format
 msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid."
-msgstr ""
+msgstr "���������� ����� ������ ���� � ������� XXX-XXX-XXXX. \"%s\" �� �����."
 
 #: core/validators.py:166
 #, python-format
 msgid "The URL %s does not point to a valid QuickTime video."
-msgstr ""
+msgstr "URL %s �� ��������� �� �������� ����� QuickTime."
 
 #: core/validators.py:170
 msgid "A valid URL is required."
-msgstr ""
+msgstr "�������� URL ����������."
 
 #: core/validators.py:184
 #, python-format
@@ -834,70 +817,72 @@ msgid ""
 "Valid HTML is required. Specific errors are:\n"
 "%s"
 msgstr ""
+"�������� HTML ����������. ����������� ������:\n"
+"%s"
 
 #: core/validators.py:191
 #, python-format
 msgid "Badly formed XML: %s"
-msgstr ""
+msgstr "�������� ������� XML: %s"
 
 #: core/validators.py:201
 #, python-format
 msgid "Invalid URL: %s"
-msgstr ""
+msgstr "�������� URL: %s"
 
-#: core/validators.py:205 core/validators.py:207
+#: core/validators.py:203
 #, python-format
 msgid "The URL %s is a broken link."
-msgstr ""
+msgstr "URL %s ��������� �������."
 
-#: core/validators.py:213
+#: core/validators.py:209
 msgid "Enter a valid U.S. state abbreviation."
-msgstr ""
+msgstr "������� �������� ����������� ������ ���."
 
-#: core/validators.py:228
+#: core/validators.py:224
 #, python-format
 msgid "Watch your mouth! The word %s is not allowed here."
 msgid_plural "Watch your mouth! The words %s are not allowed here."
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/validators.py:235
+#: core/validators.py:231
 #, python-format
 msgid "This field must match the '%s' field."
-msgstr ""
+msgstr "��� ���� ������ ��������� � '%s' �����."
 
-#: core/validators.py:254
+#: core/validators.py:250
 msgid "Please enter something for at least one field."
-msgstr ""
+msgstr "����������, ���������� ���� �� ���� ����."
 
-#: core/validators.py:263 core/validators.py:274
+#: core/validators.py:259 core/validators.py:270
 msgid "Please enter both fields or leave them both empty."
-msgstr ""
+msgstr "����������, ��������� ��� ���� ���� ������� �� �������."
 
-#: core/validators.py:281
+#: core/validators.py:277
 #, python-format
 msgid "This field must be given if %(field)s is %(value)s"
 msgstr ""
 
-#: core/validators.py:293
+#: core/validators.py:289
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
 msgstr ""
 
-#: core/validators.py:312
+#: core/validators.py:308
 msgid "Duplicate values are not allowed."
 msgstr ""
 
-#: core/validators.py:335
+#: core/validators.py:331
 #, python-format
 msgid "This value must be a power of %s."
 msgstr ""
 
-#: core/validators.py:346
+#: core/validators.py:342
 msgid "Please enter a valid decimal number."
 msgstr ""
 
-#: core/validators.py:348
+#: core/validators.py:344
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
 msgid_plural ""
@@ -905,7 +890,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/validators.py:351
+#: core/validators.py:347
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
 msgid_plural ""
@@ -913,71 +898,71 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: core/validators.py:361
+#: core/validators.py:357
 #, python-format
 msgid "Make sure your uploaded file is at least %s bytes big."
 msgstr ""
 
-#: core/validators.py:362
+#: core/validators.py:358
 #, python-format
 msgid "Make sure your uploaded file is at most %s bytes big."
 msgstr ""
 
-#: core/validators.py:375
+#: core/validators.py:371
 msgid "The format for this field is wrong."
 msgstr ""
 
-#: core/validators.py:390
+#: core/validators.py:386
 msgid "This field is invalid."
 msgstr ""
 
-#: core/validators.py:425
+#: core/validators.py:421
 #, python-format
 msgid "Could not retrieve anything from %s."
 msgstr ""
 
-#: core/validators.py:428
+#: core/validators.py:424
 #, python-format
 msgid ""
 "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr ""
 
-#: core/validators.py:461
+#: core/validators.py:457
 #, python-format
 msgid ""
 "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
 "\"%(start)s\".)"
 msgstr ""
 
-#: core/validators.py:465
+#: core/validators.py:461
 #, python-format
 msgid ""
 "Some text starting on line %(line)s is not allowed in that context. (Line "
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/validators.py:470
+#: core/validators.py:466
 #, python-format
 msgid ""
 "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""
 
-#: core/validators.py:475
+#: core/validators.py:471
 #, python-format
 msgid ""
 "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
 "(start)s\".)"
 msgstr ""
 
-#: core/validators.py:479
+#: core/validators.py:475
 #, python-format
 msgid ""
 "A tag on line %(line)s is missing one or more required attributes. (Line "
 "starts with \"%(start)s\".)"
 msgstr ""
 
-#: core/validators.py:484
+#: core/validators.py:480
 #, python-format
 msgid ""
 "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
@@ -992,6 +977,7 @@ msgstr ""
 msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
+" ����������� \"Control\", ��� \"Command\" �� ��������, ��� ������ ������ ��� ������."
 
 #~ msgid "Server error <em>(500)</em>"
 #~ msgstr "������ ������� <em>(500)</em>"
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index 065b308b948c5affe6004ca0792eb19b4475cde3..c1ca2f9f73f993fcb395141ff9fb4912cadc7ad6 100644
GIT binary patch
delta 4848
zcmZA43w(|D9mny1BqVW-TivS8sD!#i)WkI?YUVb@uo{l!glGgwP(_bs72-12&UHzw
z8ZAjhQ^dV=YjqUsi*~j0dUfT5ZJp|iy<WA=_W7RYr}NtX<$K=$|NnWO|MP$T&-0uU
z7xN-EFN+9XYY_FCqkKXhC#5x<YZl>LpE~MwuDHH)gK;Oe!73b!wHi1#3a8>UEXStU
zu%UAd;W}a@K8@8e8RubNjKT_Jzo4t6(uj_e7>$=O7QgUza3N%D_chi-?aUlp96pJy
zQ70IJ?BYhCCg4YnGXr(PY>dGLSb|HjC+Bwwjh*A4^YfvB7vK-D0CmE>*cy+bCU_0w
zF@)`~&SP99cE^@D6SYz+kX>9UYX8%igtu@QwrJv9D(838sc430Q8T=VJ@9j!j}2H?
zT~UF#4z=HAYZs$dV7Il)us`j0Q4_w08voy@6{*&Y)xz2s)D@1UvINsm?LVUq{1$cK
zeQW>6+R@Fu{@SRC)yLY{6m?u%Ou$aq9mnAhaW!h9r%}(wndYp&4md}L2D*eb@lUAd
zFN7WNF4jd~3-1aNQ4{NlT8R{E4?&GL9CiFy?2OY;$FE0SU@<bJD{sO2Yr|POxHxwO
zwM2JO6M2BOFqT(C12)DKY=aYV8v5`U=Hpe&!!#a*C$S2<V(llqiS)zew6jp>{YQ|B
z9=htSyenyfx&oiI+o6^$2{o}~+dcr9n;VK+`T*)J$u^gvR&)!dVi9WGNT1hV3)K!b
zpprtRIciBJ;uOq99#nS;^|byKbq|wyHFQg6As6emqMr7Hs1>+^<IvA5qvH>uR^UA9
zS%_fgw%7wF=>4BeWxRI8M6AcUF^21hnwTGlU@_`m-$c#)4(b+shY2`_QQP4njKW>0
z6?+S-V+Csb!#EvpVY1%;(eciu(@}sr;2YG5?xPNjWOUv8Sk#p_!GSms*~KkKt=!wF
z34DZlX1+BaU=7+e*{FM7A2q%YqdC88Peu1I33Z|r)BwY+e}c6Gr~&4pp5mp}zYg`V
z?m%6@ZfoyHP4F1%LcX&8Td4i+Vo)b~U>!BvdrQ{{wL>%1_BI%ei5P>)W`EQ}H`Lmb
zP!|wD9hZZ#7{ta{fV$8k)b`T$tiSG6B^{dKaogd2jH7)KHQ<-F{WfX>_wYyr6UR}s
z4|nk1hS-kbhsw1@JsU6M&+(7Qi{`p_@@~aAb5bYPU-u@Jj!8JvHhgHFN4|yKWvq=~
zV=Ugc?NOb*6{v;U{sijQbU+?>*BiC}WOIg@jdkc>9JG#=<|bUohC<Zq(v(M51CBy1
z^%T@nW?TOX)Rk>PUC1Hid2=VQ3x=>SHle|b;>ID1<zB*i7%ZWp0}dh=<*wlXtj$l=
z^EeVU@E&tNYQIW+6+_nl0x!9)G#fSWV$^Y~F%mbLo3R`1?cVmFyXaNiXQ%<LVNbk?
zTGH11wq{`>*2O|pe;MioN6b^^8S{eqDQf?#*8U4>#qMB|-v2nJ!$r7fPy^<gi_ARK
z#0pRYZ8VEfUsPq*zJS{A3o~SXgBtg~8Nt`6#)-kEdjA_!X@H$=!vJfKw6@>cS*R1d
zf*Np@xdAocR_uo*sBhE|@}=rhc#wMIH0*(esEL1u!9G;JqoRA-J=wXHn1&kgHfm!3
zLfzAP9IX?#LQN#z+Fi_K)P5<bB_3(*S=fm764baGtiPxS>z_);KHJcc8?S+V=2NH%
zc0&y~7boC4)PT2e5I#Wuxq-dBpV=j-*RK?Hr58{S>m5wN`7B3cJkXo<r_Y_GL$65<
z&Zd<Zgd;H<N8l;c>r;=NG;lZMMRDU%CtiV?_-XST>cT!nO}rOp)iX8`!?zB@D-pDg
zBIK2KC8&Wfqh8Az+|X?7j5@(ib1!Ou1E^bc8lS++$XwlBjK`$@UjGEtcneU+6`8?O
zDw@$@>v+%n*!r(n`%Clh=08yris8#b$2UL?+{}zOpSJD&tv$pXi>zqS`E7@M+pq>B
z8EBie3(dW#6IG&q15R518Pxul&CgN$T}3^N*HII_i<;mAv(_`}5AqID(T3Jo2NTV{
zsDXx=&!P64h+6V=YcI6z`KS}E!3Z2rrV&kU2B}Xr5S3q%_sDY2?<z?#QPIFE`9$|q
zPy72Mo&1RWn!H3*GKnUnGL8%<zb9RZo~5Nk<z4boxaNJFhnCh39<s_WaS~zj;Xk+Z
zbKH!mR3opGEHx;5iQbyuk#=MUd02izWf@su9S1Ry>>)hU?m5CYulF|T{-2_uW!p;l
z!g4<*M@bRUFO^EPNBG;Vh1DO&g;t+~sYJK0qxFd;<VA8q4a!<llblq8vPk#;F|Qu}
zY|UqnN7}0D7HuJu$zbv`vX7LLw@EgcO?*V<0}r<tdDg=J*^IKjcq}D{$r#dVDjyF^
z1(lWLr{n_B7tem8l1KRc2$#)#wk7k)6!I}yN6wOoL}erCL`H5L9oJA-5dI#NDt@AO
zXgcAWkH3SxzmvedrVmPEGM5}6{mCe@o%A8?iAqzC@K>j*&s$pr{#OsWXK8#w-XW{V
zZ^$vyhWvp%EDfo=OnQ<dWEj~*W|Fsv%5kzgTyySC)DJ<1wM7|ugEUctlB+vd!>fn?
zrc!kvd5Sbw!^(P`W%XKS7aU6lk>8R+qH=~5glpc%E~rb=$VIQqox{=O7kV+bS*N~)
zbI3fBM0S!DMCC&=mBf*uL}d+mg}gvklUFN7)c>GbR8~gLjMw8DMNS+1qJP$$%s?++
zLVBh@caDF0ASW?(c2=%GHFt_y37vgI(|x%!GID$wIavw0zB$>m=Vzn^(mK)^@Z~Jb
z$qmf%Ey&2s^v%l&JUU8RAl*MNGdH24Zj)XSF{yz}e^y#XYQ?inqobq8EC{4AgNos;
zrq+z=?n~-gQQrPuWbF0I!?%u<+}u}Iv8&UiYU59=x>1sM``EVd)Y3CD|9@&<EzM(x
zP~ncyjy<8Z>#m>Je*4(!s*0mkM~iNh=U+d5vTD<tj~x5`gmSv{jEKoEzwyp?ooY`~
mVvUwnYs;z%w$gN=Ek&UnMWM}axT^JqH<ndum%k;a#r_w)2}REU

delta 4544
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
F`9D4i!~*~T

diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index 0534a77b88..07796991e9 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: django v1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-11-15 12:40-0600\n"
-"PO-Revision-Date: 2005-11-11 13:55+0800\n"
+"PO-Revision-Date: 2005-11-16 12:55+0800\n"
 "Last-Translator: limodou <limodou@gmail.com>\n"
 "Language-Team: Simplified Chinese <limodou@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -66,7 +66,8 @@ msgstr "历史"
 msgid "Date/time"
 msgstr "日期/时间"
 
-#: contrib/admin/templates/admin/object_history.html:19 models/auth.py:47
+#: contrib/admin/templates/admin/object_history.html:19
+#: models/auth.py:47
 msgid "User"
 msgstr "用户"
 
@@ -79,9 +80,7 @@ msgid "DATE_WITH_TIME_FULL"
 msgstr "N j, Y, P"
 
 #: contrib/admin/templates/admin/object_history.html:36
-msgid ""
-"This object doesn't have a change history. It probably wasn't added via this "
-"admin site."
+msgid "This object doesn't have a change history. It probably wasn't added via this admin site."
 msgstr "此对象没有修改历史。可能不能通过这个管理站点来增加。"
 
 #: contrib/admin/templates/admin/base_site.html:4
@@ -105,12 +104,8 @@ msgid "Server Error <em>(500)</em>"
 msgstr "服务器错误 <em>(500)</em>"
 
 #: contrib/admin/templates/admin/500.html: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 ""
-"存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢"
-"谢你的关心。"
+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 "存在一个错误。它已经通过电子邮件被报告给站点管理员了，并且应该很快被改正。谢谢你的关心。"
 
 #: contrib/admin/templates/admin/404.html:4
 #: contrib/admin/templates/admin/404.html:8
@@ -175,21 +170,13 @@ msgstr "注销"
 
 #: contrib/admin/templates/admin/delete_confirmation.html:7
 #, python-format
-msgid ""
-"Deleting the %(object_name)s '%(object)s' would result in deleting related "
-"objects, but your account doesn't have permission to delete the following "
-"types of objects:"
-msgstr ""
-"删除 %(object_name)s  '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下"
-"列类型的对象："
+msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:"
+msgstr "删除 %(object_name)s  '%(object)s' 会导致删除相关的对象，但你的帐号无权删除下列类型的对象："
 
 #: contrib/admin/templates/admin/delete_confirmation.html:14
 #, python-format
-msgid ""
-"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of "
-"the following related items will be deleted:"
-msgstr ""
-"你确信相要删除 %(object_name)s \"%(object)s\"？所有相关的项目都将被删除："
+msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:"
+msgstr "你确信相要删除 %(object_name)s \"%(object)s\"？所有相关的项目都将被删除："
 
 #: contrib/admin/templates/admin/delete_confirmation.html:18
 msgid "Yes, I'm sure"
@@ -218,12 +205,8 @@ msgid "Password reset"
 msgstr "口令重设"
 
 #: contrib/admin/templates/registration/password_reset_form.html:12
-msgid ""
-"Forgotten your password? Enter your e-mail address below, and we'll reset "
-"your password and e-mail the new one to you."
-msgstr ""
-"忘记你的口令？在下面输入你的邮箱地址，我们将重设你的口令并且将新的口令通过邮"
-"件发送给你。"
+msgid "Forgotten your password? Enter your e-mail address below, and we'll reset your password and e-mail the new one to you."
+msgstr "忘记你的口令？在下面输入你的邮箱地址，我们将重设你的口令并且将新的口令通过邮件发送给你。"
 
 #: contrib/admin/templates/registration/password_reset_form.html:16
 msgid "E-mail address:"
@@ -247,19 +230,12 @@ msgid "Password reset successful"
 msgstr "口令重设成功"
 
 #: contrib/admin/templates/registration/password_reset_done.html:12
-msgid ""
-"We've e-mailed a new password to the e-mail address you submitted. You "
-"should be receiving it shortly."
-msgstr ""
-"我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。"
+msgid "We've e-mailed a new password to the e-mail address you submitted. You should be receiving it shortly."
+msgstr "我们已经按你所提交的邮箱地址发送了一个新的口令给你。你应该很会收到这封邮件。"
 
 #: contrib/admin/templates/registration/password_change_form.html:12
-msgid ""
-"Please enter your old password, for security's sake, and then enter your new "
-"password twice so we can verify you typed it in correctly."
-msgstr ""
-"请输入你的旧口令，为了安全起见，接着要输入你的新口令两遍，这样我们可以校验你"
-"输入的是否正确。"
+msgid "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly."
+msgstr "请输入你的旧口令，为了安全起见，接着要输入你的新口令两遍，这样我们可以校验你输入的是否正确。"
 
 #: contrib/admin/templates/registration/password_change_form.html:17
 msgid "Old password:"
@@ -313,9 +289,7 @@ msgid "redirect from"
 msgstr "重定向自"
 
 #: contrib/redirects/models/redirects.py:8
-msgid ""
-"This should be an absolute path, excluding the domain name. Example: '/"
-"events/search/'."
+msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'."
 msgstr "应该是一个绝对路径，不包括域名。例如：'/events/search/'。"
 
 #: contrib/redirects/models/redirects.py:9
@@ -323,9 +297,7 @@ msgid "redirect to"
 msgstr "重定向到"
 
 #: contrib/redirects/models/redirects.py:10
-msgid ""
-"This can be either an absolute path (as above) or a full URL starting with "
-"'http://'."
+msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'."
 msgstr "可以是绝对路径(同上)或以'http://'开始的全URL。"
 
 #: contrib/redirects/models/redirects.py:12
@@ -341,8 +313,7 @@ msgid "URL"
 msgstr ""
 
 #: contrib/flatpages/models/flatpages.py:7
-msgid ""
-"Example: '/about/contact/'. Make sure to have leading and trailing slashes."
+msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes."
 msgstr "例如：'/about/contact/'。请确保前导和结尾的除号。"
 
 #: contrib/flatpages/models/flatpages.py:8
@@ -362,12 +333,8 @@ msgid "template name"
 msgstr "模板名称"
 
 #: contrib/flatpages/models/flatpages.py:12
-#, fuzzy
-msgid ""
-"Example: 'flatpages/contact_page'. If this isn't provided, the system will "
-"use 'flatpages/default'."
-msgstr ""
-"例如：'flatfiles/contact_page'。如果未提供，系统将使用'flatfiles/default'。"
+msgid "Example: 'flatpages/contact_page'. If this isn't provided, the system will use 'flatpages/default'."
+msgstr "例如：'flatfiles/contact_page'。如果未提供，系统将使用'flatfiles/default'。"
 
 #: contrib/flatpages/models/flatpages.py:13
 msgid "registration required"
@@ -433,23 +400,28 @@ msgstr "一月"
 msgid "February"
 msgstr "二月"
 
-#: utils/dates.py:14 utils/dates.py:27
+#: utils/dates.py:14
+#: utils/dates.py:27
 msgid "March"
 msgstr "三月"
 
-#: utils/dates.py:14 utils/dates.py:27
+#: utils/dates.py:14
+#: utils/dates.py:27
 msgid "April"
 msgstr "四月"
 
-#: utils/dates.py:14 utils/dates.py:27
+#: utils/dates.py:14
+#: utils/dates.py:27
 msgid "May"
 msgstr "五月"
 
-#: utils/dates.py:14 utils/dates.py:27
+#: utils/dates.py:14
+#: utils/dates.py:27
 msgid "June"
 msgstr "六月"
 
-#: utils/dates.py:15 utils/dates.py:27
+#: utils/dates.py:15
+#: utils/dates.py:27
 msgid "July"
 msgstr "七月"
 
@@ -521,7 +493,10 @@ msgstr "站点"
 msgid "label"
 msgstr "标签"
 
-#: models/core.py:29 models/core.py:40 models/auth.py:6 models/auth.py:19
+#: models/core.py:29
+#: models/core.py:40
+#: models/auth.py:6
+#: models/auth.py:19
 msgid "name"
 msgstr "名称"
 
@@ -573,7 +548,8 @@ msgstr "代码名称"
 msgid "Permission"
 msgstr "许可"
 
-#: models/auth.py:11 models/auth.py:58
+#: models/auth.py:11
+#: models/auth.py:58
 msgid "Permissions"
 msgstr "许可"
 
@@ -581,7 +557,8 @@ msgstr "许可"
 msgid "Group"
 msgstr "组"
 
-#: models/auth.py:23 models/auth.py:60
+#: models/auth.py:23
+#: models/auth.py:60
 msgid "Groups"
 msgstr "组"
 
@@ -634,11 +611,8 @@ msgid "date joined"
 msgstr "加入日期"
 
 #: models/auth.py:44
-msgid ""
-"In addition to the permissions manually assigned, this user will also get "
-"all permissions granted to each group he/she is in."
-msgstr ""
-"除了手动设置权限以外，用户也会从他(她)所在的小组获得所赋组小组的所有权限。"
+msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in."
+msgstr "除了手动设置权限以外，用户也会从他(她)所在的小组获得所赋组小组的所有权限。"
 
 #: models/auth.py:48
 msgid "Users"
@@ -669,9 +643,8 @@ msgid "Welsh"
 msgstr "威尔士语"
 
 #: conf/global_settings.py:39
-#, fuzzy
 msgid "Danish"
-msgstr "西斑牙语"
+msgstr "丹麦语"
 
 #: conf/global_settings.py:40
 msgid "German"
@@ -683,7 +656,7 @@ msgstr "英语"
 
 #: conf/global_settings.py:42
 msgid "Spanish"
-msgstr "西斑牙语"
+msgstr "西班牙语"
 
 #: conf/global_settings.py:43
 msgid "French"
@@ -695,7 +668,7 @@ msgstr "加利西亚语"
 
 #: conf/global_settings.py:45
 msgid "Icelandic"
-msgstr ""
+msgstr "冰岛语"
 
 #: conf/global_settings.py:46
 msgid "Italian"
@@ -727,7 +700,7 @@ msgstr "塞尔维亚语"
 
 #: conf/global_settings.py:53
 msgid "Swedish"
-msgstr ""
+msgstr "瑞典语"
 
 #: conf/global_settings.py:54
 msgid "Simplified Chinese"
@@ -798,9 +771,7 @@ msgid "Enter a valid e-mail address."
 msgstr "输入一个有效的邮件地址。"
 
 #: core/validators.py:147
-msgid ""
-"Upload a valid image. The file you uploaded was either not an image or a "
-"corrupted image."
+msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
 msgstr "上传一个有效的图片。您所上传的文件或者不是图片或是一个破坏的图片。"
 
 #: core/validators.py:154
@@ -841,7 +812,8 @@ msgstr "格式错误的 XML: %s"
 msgid "Invalid URL: %s"
 msgstr "无效 URL: %s"
 
-#: core/validators.py:205 core/validators.py:207
+#: core/validators.py:205
+#: core/validators.py:207
 #, python-format
 msgid "The URL %s is a broken link."
 msgstr "URL %s 是一个断开的链接。"
@@ -865,7 +837,8 @@ msgstr "这个字段必须与 '%s' 字段相匹配。"
 msgid "Please enter something for at least one field."
 msgstr "请至少在一个字段上输入些什么。"
 
-#: core/validators.py:263 core/validators.py:274
+#: core/validators.py:263
+#: core/validators.py:274
 msgid "Please enter both fields or leave them both empty."
 msgstr "请要么两个字段都输入或者两个字段都空着。"
 
@@ -895,15 +868,13 @@ msgstr "请输入一个有效的小数。"
 #: core/validators.py:348
 #, python-format
 msgid "Please enter a valid decimal number with at most %s total digit."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s total digits."
+msgid_plural "Please enter a valid decimal number with at most %s total digits."
 msgstr[0] "请输入一个有效的小数，最多 %s 个数字。 "
 
 #: core/validators.py:351
 #, python-format
 msgid "Please enter a valid decimal number with at most %s decimal place."
-msgid_plural ""
-"Please enter a valid decimal number with at most %s decimal places."
+msgid_plural "Please enter a valid decimal number with at most %s decimal places."
 msgstr[0] "请输入一个有效的小数，最多 %s 个小数位。 "
 
 #: core/validators.py:361
@@ -931,63 +902,44 @@ msgstr "不能从 %s 得到任何东西。"
 
 #: core/validators.py:428
 #, python-format
-msgid ""
-"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
+msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'."
 msgstr "URL %(url)s 返回了无效的 Content-Type 头 '%(contenttype)s'。"
 
 #: core/validators.py:461
 #, python-format
-msgid ""
-"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with "
-"\"%(start)s\".)"
-msgstr ""
-"请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)"
+msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)"
+msgstr "请关闭未关闭的 %(tag)s 标签从第 %(line)s 行。(行开始于 \"%(start)s\"。)"
 
 #: core/validators.py:465
 #, python-format
-msgid ""
-"Some text starting on line %(line)s is not allowed in that context. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)"
+msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)"
+msgstr "在 %(line)s 行开始的一些文本不允许在那个上下文中。(行开始于 \"%(start)s\"。)"
 
 #: core/validators.py:470
 #, python-format
-msgid ""
-"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)"
+msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)"
+msgstr "在 %(line)s 行的\"%(attr)s\"不是一个有效的属性。(行开始于 \"%(start)s\"。)"
 
 #: core/validators.py:475
 #, python-format
-msgid ""
-"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%"
-"(start)s\".)"
-msgstr ""
-"在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)"
+msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)"
+msgstr "在 %(line)s 行的\"<%(tag)s>\"不是一个有效的标签。(行开始于 \"%(start)s\"。)"
 
 #: core/validators.py:479
 #, python-format
-msgid ""
-"A tag on line %(line)s is missing one or more required attributes. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)"
+msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)"
+msgstr "在行 %(line)s 的标签少了一个或多个必须的属性。(行开始于 \"%(start)s\"。)"
 
 #: core/validators.py:484
 #, python-format
-msgid ""
-"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line "
-"starts with \"%(start)s\".)"
-msgstr ""
-"在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
+msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)"
+msgstr "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)"
 
 #: core/meta/fields.py:111
 msgid " Separate multiple IDs with commas."
 msgstr " 用逗号分隔多个ID。"
 
 #: core/meta/fields.py:114
-msgid ""
-" Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr " 按下 \"Control\"，或者在Mac上按 \"Command\" 来选择一个或多个值。"
+

From 6be021076394e1bfd7b11e13f0392e8f52f8c04c Mon Sep 17 00:00:00 2001
From: Georg Bauer <gb@hugo.westfalen.de>
Date: Wed, 16 Nov 2005 23:22:27 +0000
Subject: [PATCH 02/10] fixes #728, updated no translation

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1271 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/conf/locale/no/LC_MESSAGES/django.mo | Bin 17184 -> 17439 bytes
 django/conf/locale/no/LC_MESSAGES/django.po |  20 ++++++++------------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index f4a59d3323745b3827a0c9a818076d1b844febff..10165e229bb283181e138b338ba3f7cb061aeca1 100644
GIT binary patch
delta 4765
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

delta 4518
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
G8~%T~pTvm(

diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index 75b198bcc7..308411a794 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.po
+++ b/django/conf/locale/no/LC_MESSAGES/django.po
@@ -669,7 +669,7 @@ msgstr "Meldinger"
 
 #: conf/global_settings.py:36
 msgid "Bengali"
-msgstr ""
+msgstr "Bengalsk"
 
 #: conf/global_settings.py:37
 msgid "Czech"
@@ -677,12 +677,11 @@ msgstr "Tsjekkisk"
 
 #: conf/global_settings.py:38
 msgid "Welsh"
-msgstr ""
+msgstr "Walisisk"
 
 #: conf/global_settings.py:39
-#, fuzzy
 msgid "Danish"
-msgstr "Spansk"
+msgstr "Dnask"
 
 #: conf/global_settings.py:40
 msgid "German"
@@ -706,7 +705,7 @@ msgstr "Galisisk"
 
 #: conf/global_settings.py:45
 msgid "Icelandic"
-msgstr ""
+msgstr "Islandsk"
 
 #: conf/global_settings.py:46
 msgid "Italian"
@@ -722,7 +721,7 @@ msgstr "Brasiliansk"
 
 #: conf/global_settings.py:49
 msgid "Romanian"
-msgstr ""
+msgstr "Romansk"
 
 #: conf/global_settings.py:50
 msgid "Russian"
@@ -730,7 +729,7 @@ msgstr "Russisk"
 
 #: conf/global_settings.py:51
 msgid "Slovak"
-msgstr ""
+msgstr "Slovakisk"
 
 #: conf/global_settings.py:52
 msgid "Serbian"
@@ -738,11 +737,11 @@ msgstr "Serbisk"
 
 #: conf/global_settings.py:53
 msgid "Swedish"
-msgstr ""
+msgstr "Svensk"
 
 #: conf/global_settings.py:54
 msgid "Simplified Chinese"
-msgstr "Simpel Kinesisk"
+msgstr "Simplifisert Kinesisk"
 
 #: core/validators.py:59
 msgid "This value must contain only letters, numbers and underscores."
@@ -1021,6 +1020,3 @@ msgid ""
 " Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
 msgstr ""
 "Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mere enn en."
-
-#~ msgid "Traditional Chinese"
-#~ msgstr "Tradisjonell Kinesisk"

From b1603563a3514eeab29780b0f4e5a54d70a7e4ff Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Thu, 17 Nov 2005 03:10:03 +0000
Subject: [PATCH 03/10] Fixed #822 -- Changed 500 view to use disclosure
 triangles instead of up/down arrows. Thanks, aaronsw

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/views/debug.py | 46 +++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/django/views/debug.py b/django/views/debug.py
index 4eb95c91d9..482d149d90 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -33,8 +33,8 @@ def technical_500_response(request, exc_type, exc_value, tb):
             'pre_context_lineno' : pre_context_lineno,
         })
         tb = tb.tb_next
-    
-    # Turn the settings module into a dict, filtering out anything that 
+
+    # Turn the settings module into a dict, filtering out anything that
     # matches HIDDEN_SETTINGS along the way.
     settings_dict = {}
     for k in dir(settings):
@@ -43,7 +43,7 @@ def technical_500_response(request, exc_type, exc_value, tb):
                 settings_dict[k] = '********************'
             else:
                 settings_dict[k] = getattr(settings, k)
-                
+
     t = Template(TECHNICAL_500_TEMPLATE)
     c = Context({
         'exception_type' : exc_type.__name__,
@@ -53,7 +53,7 @@ def technical_500_response(request, exc_type, exc_value, tb):
         'request' : request,
         'request_protocol' : os.environ.get("HTTPS") == "on" and "https" or "http",
         'settings' : settings_dict,
-        
+
     })
     return HttpResponseServerError(t.render(c))
 
@@ -66,7 +66,7 @@ def technical_404_response(request, exception):
         tried = exception.args[0]['tried']
     except (IndexError, TypeError):
         tried = []
-        
+
     t = Template(TECHNICAL_404_TEMPLATE)
     c = Context({
         'root_urlconf' : settings.ROOT_URLCONF,
@@ -80,7 +80,7 @@ def technical_404_response(request, exception):
 
 def _get_lines_from_file(filename, lineno, context_lines):
     """
-    Returns context_lines before and after lineno from file.  
+    Returns context_lines before and after lineno from file.
     Returns (pre_context_lineno, pre_context, context_line, post_context).
     """
     try:
@@ -91,7 +91,7 @@ def _get_lines_from_file(filename, lineno, context_lines):
         pre_context = [line.strip('\n') for line in source[lower_bound:lineno]]
         context_line = source[lineno].strip('\n')
         post_context = [line.strip('\n') for line in source[lineno+1:upper_bound]]
-        
+
         return lower_bound, pre_context, context_line, post_context
     except (OSError, IOError):
         return None, [], None, []
@@ -147,23 +147,23 @@ TECHNICAL_500_TEMPLATE = """
   <script type="text/javascript">
     function getElementsByClassName(oElm, strTagName, strClassName){
         // Written by Jonathan Snook, http://www.snook.ca/jon; Add-ons by Robert Nyman, http://www.robertnyman.com
-        var arrElements = (strTagName == "*" && document.all)? document.all : 
+        var arrElements = (strTagName == "*" && document.all)? document.all :
         oElm.getElementsByTagName(strTagName);
         var arrReturnElements = new Array();
         strClassName = strClassName.replace(/\-/g, "\\-");
         var oRegExp = new RegExp("(^|\\s)" + strClassName + "(\\s|$)");
         var oElement;
         for(var i=0; i<arrElements.length; i++){
-            oElement = arrElements[i];      
+            oElement = arrElements[i];
             if(oRegExp.test(oElement.className)){
                 arrReturnElements.push(oElement);
-            }   
+            }
         }
         return (arrReturnElements)
     }
     function hideAll(elems) {
-      for (var e = 0; e < elems.length; e++) { 
-        elems[e].style.display = 'none'; 
+      for (var e = 0; e < elems.length; e++) {
+        elems[e].style.display = 'none';
       }
     }
     window.onload = function() {
@@ -183,8 +183,8 @@ TECHNICAL_500_TEMPLATE = """
     function varToggle(link, id) {
       toggle('v' + id);
       var s = link.getElementsByTagName('span')[0];
-      var uarr = String.fromCharCode(0x2191);
-      var darr = String.fromCharCode(0x2193);
+      var uarr = String.fromCharCode(0x25b6);
+      var darr = String.fromCharCode(0x25bc);
       s.innerHTML = s.innerHTML == uarr ? darr : uarr;
       return false;
     }
@@ -225,7 +225,7 @@ TECHNICAL_500_TEMPLATE = """
     {% for frame in frames %}
       <li class="frame">
         <code>{{ frame.filename }}</code> in <code>{{ frame.function }}</code>
-        
+
         {% if frame.context_line %}
           <div class="context" id="c{{ frame.id }}">
             {% if frame.pre_context %}
@@ -237,10 +237,10 @@ TECHNICAL_500_TEMPLATE = """
             {% endif %}
           </div>
         {% endif %}
-    
+
         {% if frame.vars %}
           <div class="commands">
-              <a href="#" onclick="return varToggle(this, '{{ frame.id }}')">Local vars <span>&darr;</span> </a>
+              <a href="#" onclick="return varToggle(this, '{{ frame.id }}')"><span>&#x25b6;</span> Local vars</a>
           </div>
           <table class="vars" id="v{{ frame.id }}">
             <thead>
@@ -266,7 +266,7 @@ TECHNICAL_500_TEMPLATE = """
 
 <div id="requestinfo">
   <h2>Request information</h2>
-  
+
   <h3 id="get-info">GET</h3>
   {% if request.GET %}
     <table class="req">
@@ -288,7 +288,7 @@ TECHNICAL_500_TEMPLATE = """
   {% else %}
     <p>No GET data<p>
   {% endif %}
-  
+
   <h3 id="post-info">POST</h3>
   {% if request.POST %}
     <table class="req">
@@ -310,7 +310,7 @@ TECHNICAL_500_TEMPLATE = """
   {% else %}
     <p>No POST data<p>
   {% endif %}
-  
+
   <h3 id="cookie-info">COOKIES</h3>
   {% if request.COOKIES %}
     <table class="req">
@@ -332,7 +332,7 @@ TECHNICAL_500_TEMPLATE = """
   {% else %}
     <p>No cookie data<p>
   {% endif %}
-  
+
   <h3 id="meta-info">META</h3>
   <table class="req">
     <thead>
@@ -434,12 +434,12 @@ TECHNICAL_404_TEMPLATE = """
           <li>{{ pattern|escape }}</li>
         {% endfor %}
       </ol>
-      <p>The current URL, <code>{{ request.path }}</code>, didn't match any of these.</p> 
+      <p>The current URL, <code>{{ request.path }}</code>, didn't match any of these.</p>
     {% else %}
       <p>{{ reason|escape }}</p>
     {% endif %}
   </div>
-  
+
   <div id="explanation">
     <p>
       You're seeing this error because you have <code>DEBUG = True</code> in

From bb505a87ac473250dbff48ac8390013461aa7f1b Mon Sep 17 00:00:00 2001
From: Jacob Kaplan-Moss <jacob@jacobian.org>
Date: Thu, 17 Nov 2005 14:19:33 +0000
Subject: [PATCH 04/10] Fixed #823 - cleaned up invalid HTML in debug error
 template. Thanks, Sune

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/views/debug.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/django/views/debug.py b/django/views/debug.py
index 482d149d90..047ee2d553 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -145,6 +145,7 @@ TECHNICAL_500_TEMPLATE = """
     #requestinfo h3 { margin-bottom:-1em; }
   </style>
   <script type="text/javascript">
+  //<!--
     function getElementsByClassName(oElm, strTagName, strClassName){
         // Written by Jonathan Snook, http://www.snook.ca/jon; Add-ons by Robert Nyman, http://www.robertnyman.com
         var arrElements = (strTagName == "*" && document.all)? document.all :
@@ -188,6 +189,7 @@ TECHNICAL_500_TEMPLATE = """
       s.innerHTML = s.innerHTML == uarr ? darr : uarr;
       return false;
     }
+    //-->
   </script>
 </head>
 <body>
@@ -276,7 +278,7 @@ TECHNICAL_500_TEMPLATE = """
           <th>Value</th>
         </tr>
       </thead>
-      </tbody>
+      <tbody>
         {% for var in request.GET.items %}
           <tr>
             <td>{{ var.0 }}</td>
@@ -286,7 +288,7 @@ TECHNICAL_500_TEMPLATE = """
       </tbody>
     </table>
   {% else %}
-    <p>No GET data<p>
+    <p>No GET data</p>
   {% endif %}
 
   <h3 id="post-info">POST</h3>
@@ -298,7 +300,7 @@ TECHNICAL_500_TEMPLATE = """
           <th>Value</th>
         </tr>
       </thead>
-      </tbody>
+      <tbody>
         {% for var in request.POST.items %}
           <tr>
             <td>{{ var.0 }}</td>
@@ -308,7 +310,7 @@ TECHNICAL_500_TEMPLATE = """
       </tbody>
     </table>
   {% else %}
-    <p>No POST data<p>
+    <p>No POST data</p>
   {% endif %}
 
   <h3 id="cookie-info">COOKIES</h3>
@@ -320,7 +322,7 @@ TECHNICAL_500_TEMPLATE = """
           <th>Value</th>
         </tr>
       </thead>
-      </tbody>
+      <tbody>
         {% for var in request.COOKIES.items %}
           <tr>
             <td>{{ var.0 }}</td>
@@ -330,7 +332,7 @@ TECHNICAL_500_TEMPLATE = """
       </tbody>
     </table>
   {% else %}
-    <p>No cookie data<p>
+    <p>No cookie data</p>
   {% endif %}
 
   <h3 id="meta-info">META</h3>
@@ -341,7 +343,7 @@ TECHNICAL_500_TEMPLATE = """
         <th>Value</th>
       </tr>
     </thead>
-    </tbody>
+    <tbody>
       {% for var in request.META.items|dictsort:"0" %}
         <tr>
           <td>{{ var.0 }}</td>
@@ -360,7 +362,7 @@ TECHNICAL_500_TEMPLATE = """
         <th>Value</th>
       </tr>
     </thead>
-    </tbody>
+    <tbody>
       {% for var in settings.items|dictsort:"0" %}
         <tr>
           <td>{{ var.0 }}</td>

From 56e40c5884e17f037ddbe7091d42fe6f8e602814 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Thu, 17 Nov 2005 15:00:23 +0000
Subject: [PATCH 05/10] Fixed #815 -- 'select' keyword in DB API calls is now
 quoted correctly. Thanks, Hugo

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/core/meta/__init__.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/django/core/meta/__init__.py b/django/core/meta/__init__.py
index 328a2f449c..a8cd4112a1 100644
--- a/django/core/meta/__init__.py
+++ b/django/core/meta/__init__.py
@@ -1380,8 +1380,13 @@ def function_get_sql_clause(opts, **kwargs):
         _fill_table_cache(opts, select, tables, where, opts.db_table, [opts.db_table])
 
     # Add any additional SELECTs passed in via kwargs.
+    def quote_only_if_word(word):
+        if word.find(' ')>=0:
+            return word
+        else:
+            return db.db.quote_name(word)
     if kwargs.get('select'):
-        select.extend(['(%s) AS %s' % (db.db.quote_name(s[1]), db.db.quote_name(s[0])) for s in kwargs['select']])
+        select.extend(['(%s) AS %s' % (quote_only_if_word(s[1]), db.db.quote_name(s[0])) for s in kwargs['select']])
 
     # ORDER BY clause
     order_by = []

From 33ffa72e40390255df361bfb5f1cee40dc3de508 Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Thu, 17 Nov 2005 15:26:50 +0000
Subject: [PATCH 06/10] Fixed #827 -- For admin list_display functions without
 a short_description, Django now converts underscores to spaces. Thanks, Aaron
 Swartz

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1275 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/admin/views/main.py | 2 +-
 docs/tutorial02.txt                | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py
index 849a774e0a..fd2849ba5e 100644
--- a/django/contrib/admin/views/main.py
+++ b/django/contrib/admin/views/main.py
@@ -361,7 +361,7 @@ def change_list(request, app_label, module_name):
                     try:
                         header = func.short_description
                     except AttributeError:
-                        header = func.__name__
+                        header = func.__name__.replace('_', ' ')
                 # Non-field list_display values don't get ordering capability.
                 raw_template.append('<th>%s</th>' % capfirst(header))
             else:
diff --git a/docs/tutorial02.txt b/docs/tutorial02.txt
index 5dc326b1d4..97d9be53b7 100644
--- a/docs/tutorial02.txt
+++ b/docs/tutorial02.txt
@@ -331,12 +331,13 @@ Now the poll change list page looks like this:
 You can click on the column headers to sort by those values -- except in the
 case of the ``was_published_today`` header, because sorting by the output of
 an arbitrary method is not supported. Also note that the column header for
-``was_published_today`` is, by default, the name of the method. But you can
-change that by giving that method a ``short_description`` attribute::
+``was_published_today`` is, by default, the name of the method (with
+underscores replaced with spaces). But you can change that by giving that
+method a ``short_description`` attribute::
 
     def was_published_today(self):
         return self.pub_date.date() == datetime.date.today()
-    was_published_today.short_description = 'Was published today'
+    was_published_today.short_description = 'Published today?'
 
 
 Let's add another improvement to the Poll change list page: Filters. Add the

From 3bbc2bd09153b84f20aa04b4b28784515a0a429d Mon Sep 17 00:00:00 2001
From: Jacob Kaplan-Moss <jacob@jacobian.org>
Date: Thu, 17 Nov 2005 15:27:19 +0000
Subject: [PATCH 07/10] Fixed #825; thanks for the suggestions, aaronsw

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1276 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/views/debug.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/django/views/debug.py b/django/views/debug.py
index 047ee2d553..0ddaa44a7f 100644
--- a/django/views/debug.py
+++ b/django/views/debug.py
@@ -131,8 +131,9 @@ TECHNICAL_500_TEMPLATE = """
     ul.traceback li.frame { margin-bottom:1em; }
     div.context { margin: 10px 0; }
     div.context ol { padding-left:30px; margin:0 10px; list-style-position: inside; }
-    div.context ol li { font-family:monospace; white-space:pre; color:#666; }
-    div.context ol.context-line li { color:black; background-color:#ccc; cursor:pointer; }
+    div.context ol li { font-family:monospace; white-space:pre; color:#666; cursor:pointer; }
+    div.context ol.context-line li { color:black; background-color:#ccc; }
+    div.context ol.context-line li span { float: right; }
     div.commands { margin-left: 40px; }
     div.commands a { color:black; text-decoration:none; }
     #summary { background: #ffc; }
@@ -231,11 +232,11 @@ TECHNICAL_500_TEMPLATE = """
         {% if frame.context_line %}
           <div class="context" id="c{{ frame.id }}">
             {% if frame.pre_context %}
-              <ol start="{{ frame.pre_context_lineno }}" class="pre-context" id="pre{{ frame.id }}">{% for line in frame.pre_context %}<li>{{ line|escape }}</li>{% endfor %}</ol>
+              <ol start="{{ frame.pre_context_lineno }}" class="pre-context" id="pre{{ frame.id }}">{% for line in frame.pre_context %}<li onclick="toggle('pre{{ frame.id }}', 'post{{ frame.id }}')">{{ line|escape }}</li>{% endfor %}</ol>
             {% endif %}
-            <ol start="{{ frame.lineno }}" class="context-line"><li onclick="toggle('pre{{ frame.id }}', 'post{{ frame.id }}')">{{ frame.context_line|escape }}</li></ol>
+            <ol start="{{ frame.lineno }}" class="context-line"><li onclick="toggle('pre{{ frame.id }}', 'post{{ frame.id }}')">{{ frame.context_line|escape }} <span>...</span></li></ol>
             {% if frame.post_context %}
-              <ol start='{{ frame.lineno|add:"1" }}' class="post-context" id="post{{ frame.id }}">{% for line in frame.post_context %}<li>{{ line|escape }}</li>{% endfor %}</ol>
+              <ol start='{{ frame.lineno|add:"1" }}' class="post-context" id="post{{ frame.id }}">{% for line in frame.post_context %}<li onclick="toggle('pre{{ frame.id }}', 'post{{ frame.id }}')">{{ line|escape }}</li>{% endfor %}</ol>
             {% endif %}
           </div>
         {% endif %}

From 3478fb51d6a1b7f27d2a6696c0e4b1f8b79fd9a8 Mon Sep 17 00:00:00 2001
From: Georg Bauer <gb@hugo.westfalen.de>
Date: Thu, 17 Nov 2005 15:55:04 +0000
Subject: [PATCH 08/10] fixed two failing i18n tests - they only failed when
 using ./runtests, now they work both ways. And template tests give tracebacks
 when they fail.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1277 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 tests/othertests/templates.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/othertests/templates.py b/tests/othertests/templates.py
index ec6c55fb05..729105d8fc 100644
--- a/tests/othertests/templates.py
+++ b/tests/othertests/templates.py
@@ -1,6 +1,8 @@
+import traceback
+
 from django.core import template
 from django.core.template import loader
-from django.utils.translation import activate, deactivate
+from django.utils.translation import activate, deactivate, install
 
 # Helper objects for template tests
 class SomeClass:
@@ -273,8 +275,11 @@ def run_tests(verbosity=0, standalone=False):
     tests = TEMPLATE_TESTS.items()
     tests.sort()
     for name, vals in tests:
+        install()
         if 'LANGUAGE_CODE' in vals[1]:
             activate(vals[1]['LANGUAGE_CODE'])
+        else:
+            activate('en-us')
         try:
             output = loader.get_template(name).render(template.Context(vals[1]))
         except Exception, e:
@@ -283,6 +288,7 @@ def run_tests(verbosity=0, standalone=False):
                     print "Template test: %s -- Passed" % name
             else:
                 if verbosity:
+                    traceback.print_exc()
                     print "Template test: %s -- FAILED. Got %s, exception: %s" % (name, e.__class__, e)
                 failed_tests.append(name)
             continue

From 90639553844e74a404e19039afed06bc85cad563 Mon Sep 17 00:00:00 2001
From: Georg Bauer <gb@hugo.westfalen.de>
Date: Thu, 17 Nov 2005 16:00:01 +0000
Subject: [PATCH 09/10] fixes #821 - updated slovak translation

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1278 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/conf/locale/sk/LC_MESSAGES/django.mo | Bin 17905 -> 18161 bytes
 django/conf/locale/sk/LC_MESSAGES/django.po |  57 ++++++++++----------
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index 2d1d2277e991e65566b371ba46e743c929932681..e05a3f7e89edde4aaba1d3004085c736191a9fd7 100644
GIT binary patch
delta 4818
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

delta 4596
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

diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 3f22b1efa7..c6e1d9f265 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-15 14:02-0500\n"
+"POT-Creation-Date: 2005-11-16 19:51-0500\n"
 "PO-Revision-Date: 2005-11-10 23:22-0500\n"
 "Last-Translator: Vladimir Labath <vlado@labath.org>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -471,31 +471,31 @@ msgstr "December"
 
 #: utils/dates.py:27
 msgid "Jan."
-msgstr ""
+msgstr "Jan."
 
 #: utils/dates.py:27
 msgid "Feb."
-msgstr ""
+msgstr "Feb."
 
 #: utils/dates.py:28
 msgid "Aug."
-msgstr ""
+msgstr "Aug."
 
 #: utils/dates.py:28
 msgid "Sept."
-msgstr ""
+msgstr "Sept."
 
 #: utils/dates.py:28
 msgid "Oct."
-msgstr ""
+msgstr "Oct."
 
 #: utils/dates.py:28
 msgid "Nov."
-msgstr ""
+msgstr "Nov."
 
 #: utils/dates.py:28
 msgid "Dec."
-msgstr ""
+msgstr "Dec."
 
 #: utils/translation.py:335
 msgid "DATE_FORMAT"
@@ -599,7 +599,7 @@ msgstr "užívateľské meno"
 
 #: models/auth.py:34
 msgid "first name"
-msgstr "meno"
+msgstr "krstné meno"
 
 #: models/auth.py:35
 msgid "last name"
@@ -615,8 +615,7 @@ msgstr "heslo"
 
 #: models/auth.py:37
 msgid "Use an MD5 hash -- not the raw password."
-msgstr ""
-"Vložte takú hodnotu hesla , ako vám ju vráti MD5, nevkladajte ho priamo. "
+msgstr "Vložte takú hodnotu hesla , ako vám ju vráti MD5, nevkladajte ho priamo. "
 
 #: models/auth.py:38
 msgid "staff status"
@@ -679,62 +678,67 @@ msgid "Welsh"
 msgstr "Waleský"
 
 #: conf/global_settings.py:39
+#, fuzzy
+msgid "Danish"
+msgstr "Španielsky"
+
+#: conf/global_settings.py:40
 msgid "German"
 msgstr "Nemecký"
 
-#: conf/global_settings.py:40
+#: conf/global_settings.py:41
 msgid "English"
 msgstr "Anglický"
 
-#: conf/global_settings.py:41
+#: conf/global_settings.py:42
 msgid "Spanish"
 msgstr "Španielsky"
 
-#: conf/global_settings.py:42
+#: conf/global_settings.py:43
 msgid "French"
 msgstr "Francúzsky"
 
-#: conf/global_settings.py:43
+#: conf/global_settings.py:44
 msgid "Galician"
 msgstr "Galicijský"
 
-#: conf/global_settings.py:44
+#: conf/global_settings.py:45
 msgid "Icelandic"
 msgstr "Islandský"
 
-#: conf/global_settings.py:45
+#: conf/global_settings.py:46
 msgid "Italian"
 msgstr "Taliansky"
 
-#: conf/global_settings.py:46
+#: conf/global_settings.py:47
 msgid "Norwegian"
 msgstr "Nórsky"
 
-#: conf/global_settings.py:47
+#: conf/global_settings.py:48
 msgid "Brazilian"
 msgstr "Brazílsky"
 
-#: conf/global_settings.py:48
+#: conf/global_settings.py:49
 msgid "Romanian"
 msgstr "Rumúnsky"
 
-#: conf/global_settings.py:49
+#: conf/global_settings.py:50
 msgid "Russian"
 msgstr "Ruský"
 
-#: conf/global_settings.py:50
+#: conf/global_settings.py:51
 msgid "Slovak"
 msgstr "Slovenský"
 
-#: conf/global_settings.py:51
+#: conf/global_settings.py:52
 msgid "Serbian"
 msgstr "Srbský"
 
-#: conf/global_settings.py:52
+#: conf/global_settings.py:53
 msgid "Swedish"
 msgstr "Švédsky"
 
-#: conf/global_settings.py:53
+#: conf/global_settings.py:54
 msgid "Simplified Chinese"
 msgstr "Zjednodušená činština "
 
@@ -885,8 +889,7 @@ msgstr "Toto pole musí byť vyplnené tak, že %(field)s obsahuje %(value)s"
 #: core/validators.py:293
 #, python-format
 msgid "This field must be given if %(field)s is not %(value)s"
-msgstr ""
-"Toto pole musí byť vyplnené tak, že %(field)s nesmie obsahovať %(value)s"
+msgstr "Toto pole musí byť vyplnené tak, že %(field)s nesmie obsahovať %(value)s"
 
 #: core/validators.py:312
 msgid "Duplicate values are not allowed."

From 1da036040c3edbde3af116d38d4fb7067156239a Mon Sep 17 00:00:00 2001
From: Jacob Kaplan-Moss <jacob@jacobian.org>
Date: Fri, 18 Nov 2005 16:20:26 +0000
Subject: [PATCH 10/10] Added feed configurations for django.contrib.comments

git-svn-id: http://code.djangoproject.com/svn/django/trunk@1281 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/contrib/comments/feeds.py | 48 ++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 django/contrib/comments/feeds.py

diff --git a/django/contrib/comments/feeds.py b/django/contrib/comments/feeds.py
new file mode 100644
index 0000000000..dd6c6ecf15
--- /dev/null
+++ b/django/contrib/comments/feeds.py
@@ -0,0 +1,48 @@
+from django.conf import settings
+from django.contrib.syndication.feeds import Feed
+from django.core.exceptions import ObjectDoesNotExist
+from django.models.core import sites
+from django.models.comments import comments, freecomments
+
+class LatestFreeCommentsFeed(Feed):
+    """Feed of latest comments on the current site"""
+    
+    comments_module = freecomments
+    
+    def title(self):
+        if not hasattr(self, '_site'):
+            self._site = sites.get_current()
+        return "%s comments" % self._site.name
+        
+    def link(self):
+        if not hasattr(self, '_site'):
+            self._site = sites.get_current()
+        return "http://%s/" % (self._site.domain)
+    
+    def description(self):
+        if not hasattr(self, '_site'):
+            self._site = sites.get_current()
+        return "Latest comments on %s" % self._site.name
+
+    def items(self):
+        return self.comments_module.get_list(**self._get_lookup_kwargs())
+
+    def _get_lookup_kwargs(self):
+        return {
+            'site__pk' : settings.SITE_ID,
+            'is_public__exact' : True,
+            'limit' : 40,
+        }
+
+class LatestCommentsFeed(LatestFreeCommentsFeed):
+    """Feed of latest free comments on the current site"""
+    
+    comments_module = comments
+    
+    def _get_lookup_kwargs(self):
+        kwargs = LatestFreeCommentsFeed._get_lookup_kwargs(self)
+        kwargs['is_removed__exact'] = False
+        if settings.COMMENTS_BANNED_USERS_GROUP:
+            kwargs['where'] = ['user_id NOT IN (SELECT user_id FROM auth_users_group WHERE group_id = %s)']
+            kwargs['params'] = [COMMENTS_BANNED_USERS_GROUP]
+        return kwargs
\ No newline at end of file