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

6 files changed, 471 insertions, 582 deletions

diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index ef76060be3..f18a72d890 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.mo
+++ b/django/conf/locale/fr/LC_MESSAGES/django.mo
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/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/redirects/models/redirects.py:9
-msgid "redirect to"
-msgstr "redirig� vers"
-
-#: 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/redirects/models/redirects.py:12
-msgid "redirect"
-msgstr "redirection"
-
-#: contrib/redirects/models/redirects.py:13
-msgid "redirects"
-msgstr "redirections"
-
-#: 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/admin/models/admin.py:6
+msgid "action time"
+msgstr "heure de l'action"
 
-#: 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/admin/models/admin.py:9
+msgid "object id"
+msgstr "id de l'objet"
 
-#: contrib/flatpages/models/flatpages.py:17
-msgid "flat page"
-msgstr "page � plat"
+#: contrib/admin/models/admin.py:10
+msgid "object repr"
+msgstr "repr de l'objet"
 
-#: contrib/flatpages/models/flatpages.py:18
-msgid "flat pages"
-msgstr "pages � plat"
+#: contrib/admin/models/admin.py:11
+msgid "action flag"
+msgstr "drapeau de l'action"
 
-#: utils/translation.py:335
-msgid "DATE_FORMAT"
-msgstr ""
+#: contrib/admin/models/admin.py:12
+msgid "change message"
+msgstr "message de modification"
 
-#: utils/translation.py:336
-msgid "DATETIME_FORMAT"
-msgstr ""
+#: contrib/admin/models/admin.py:15
+msgid "log entry"
+msgstr "entr�e de log"
 
-#: 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:54
-msgid "Simplified Chinese"
-msgstr ""
+#: conf/global_settings.py:47
+msgid "Traditional Chinese"
+msgstr "Chinois traditionnel"
 
-#: 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 0a6adbba27..ea8a9e44ab 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ru/LC_MESSAGES/django.mo
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:68
+msgid "redirect from"
+msgstr "������������� ��"
+
+#: models/core.py:69
+msgid ""
+"This should be an absolute path, excluding the domain name. Example: '/"
+"events/search/'."
 msgstr ""
+"��� ������ ���� ���������� ����, �������� �������� ���. ������: '/"
+"events/search/'."
 
-#: models/core.py:67
-msgid "session key"
+#: models/core.py:70
+msgid "redirect to"
+msgstr "������������� ��"
+
+#: models/core.py:71
+msgid ""
+"This can be either an absolute path (as above) or a full URL starting with "
+"'http://'."
 msgstr ""
+"��� ������ ����, ���� ���������� ���� (��� ����) ��� ������ URL ������������ � "
+"'http://'."
 
-#: models/core.py:68
-msgid "session data"
+#: 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:69
-msgid "expire date"
+#: 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:71
+#: 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 ""
+msgstr "������"
 
-#: models/core.py:72
+#: models/core.py:122
 msgid "sessions"
-msgstr ""
+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 065b308b94..c1ca2f9f73 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
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\" 来选择一个或多个值。"
+