Changeset 5081

Timestamp:

04/26/07 04:53:45 (2 years ago)

Author:

mtredinnick

Message:

unicode: Merged from trunk up to [5080].

Files:

• django/branches/unicode (modified) (1 prop)
• django/branches/unicode/AUTHORS (modified) (3 diffs)
• django/branches/unicode/django/conf/global_settings.py (modified) (1 diff)
• django/branches/unicode/django/conf/locale/fr/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/unicode/django/conf/locale/fr/LC_MESSAGES/django.po (modified) (57 diffs)
• django/branches/unicode/django/conf/locale/ko/LC_MESSAGES/django.mo (modified) (previous)
• django/branches/unicode/django/conf/locale/ko/LC_MESSAGES/django.po (modified) (13 diffs)
• django/branches/unicode/django/contrib/admin/views/decorators.py (modified) (1 diff)
• django/branches/unicode/django/contrib/auth/decorators.py (modified) (3 diffs)
• django/branches/unicode/django/contrib/auth/__init__.py (modified) (2 diffs)
• django/branches/unicode/django/contrib/auth/models.py (modified) (3 diffs)
• django/branches/unicode/django/contrib/auth/views.py (modified) (3 diffs)
• django/branches/unicode/django/contrib/comments/templates/comments/form.html (modified) (1 diff)
• django/branches/unicode/django/contrib/comments/templatetags/comments.py (modified) (2 diffs)
• django/branches/unicode/django/contrib/localflavor/is_ (copied) (copied from django/trunk/django/contrib/localflavor/is_)
• django/branches/unicode/django/contrib/localflavor/is_/forms.py (copied) (copied from django/trunk/django/contrib/localflavor/is_/forms.py)
• django/branches/unicode/django/contrib/localflavor/is_/__init__.py (copied) (copied from django/trunk/django/contrib/localflavor/is_/__init__.py)
• django/branches/unicode/django/contrib/localflavor/is_/is_postalcodes.py (copied) (copied from django/trunk/django/contrib/localflavor/is_/is_postalcodes.py)
• django/branches/unicode/django/core/serializers/base.py (modified) (1 diff)
• django/branches/unicode/django/core/serializers/json.py (modified) (2 diffs)
• django/branches/unicode/django/db/backends/ado_mssql/base.py (modified) (1 diff)
• django/branches/unicode/django/db/backends/dummy/base.py (modified) (1 diff)
• django/branches/unicode/django/db/backends/mysql/base.py (modified) (1 diff)
• django/branches/unicode/django/db/backends/mysql_old/base.py (modified) (1 diff)
• django/branches/unicode/django/db/backends/oracle/base.py (modified) (1 diff)
• django/branches/unicode/django/db/backends/postgresql/base.py (modified) (1 diff)
• django/branches/unicode/django/db/backends/postgresql_psycopg2/base.py (modified) (1 diff)
• django/branches/unicode/django/db/backends/sqlite3/base.py (modified) (1 diff)
• django/branches/unicode/django/db/__init__.py (modified) (2 diffs)
• django/branches/unicode/django/newforms/widgets.py (modified) (2 diffs)
• django/branches/unicode/django/template/defaultfilters.py (modified) (2 diffs)
• django/branches/unicode/django/template/defaulttags.py (modified) (1 diff)
• django/branches/unicode/django/template/__init__.py (modified) (1 diff)
• django/branches/unicode/django/utils/cache.py (modified) (1 diff)
• django/branches/unicode/django/utils/datastructures.py (modified) (4 diffs)
• django/branches/unicode/django/utils/synch.py (modified) (7 diffs)
• django/branches/unicode/django/utils/timesince.py (modified) (3 diffs)
• django/branches/unicode/docs/api_stability.txt (modified) (2 diffs)
• django/branches/unicode/docs/authentication.txt (modified) (9 diffs)
• django/branches/unicode/docs/db-api.txt (modified) (3 diffs)
• django/branches/unicode/docs/faq.txt (modified) (1 diff)
• django/branches/unicode/docs/flatpages.txt (modified) (1 diff)
• django/branches/unicode/docs/forms.txt (modified) (1 diff)
• django/branches/unicode/docs/generic_views.txt (modified) (1 diff)
• django/branches/unicode/docs/i18n.txt (modified) (1 diff)
• django/branches/unicode/docs/model-api.txt (modified) (2 diffs)
• django/branches/unicode/docs/redirects.txt (modified) (1 diff)
• django/branches/unicode/docs/request_response.txt (modified) (1 diff)
• django/branches/unicode/docs/serialization.txt (modified) (1 diff)
• django/branches/unicode/docs/settings.txt (modified) (4 diffs)
• django/branches/unicode/docs/sites.txt (modified) (1 diff)
• django/branches/unicode/docs/syndication_feeds.txt (modified) (1 diff)
• django/branches/unicode/docs/tutorial01.txt (modified) (1 diff)
• django/branches/unicode/docs/tutorial04.txt (modified) (1 diff)
• django/branches/unicode/tests/regressiontests/datastructures/tests.py (modified) (1 diff)
• django/branches/unicode/tests/regressiontests/forms/localflavor.py (modified) (1 diff)
• django/branches/unicode/tests/regressiontests/forms/tests.py (modified) (2 diffs)
• django/branches/unicode/tests/regressiontests/templates/tests.py (modified) (1 diff)

django/branches/unicode/AUTHORS

@@ -50 +50 @@
-    David Ascher <http://ascher.ca/>
-    Arthur <avandorp@gmail.com>
+    axiak@mit.edu
-    Jiri Barton
-    Ned Batchelder <http://www.nedbatchelder.com/>
@@ -85 +86 @@
-    Andy Dustman <farcepest@gmail.com>
-    Clint Ecker
+    enlight
-    Enrico <rico.bl@gmail.com>
-    Ludvig Ericson <ludvig.ericson@gmail.com>
@@ -109 +111 @@
-    Ian Holsman <http://feh.holsman.net/>
-    Kieran Holland <http://www.kieranholland.com>
+    Sung-Jin Hong <serialx.net@gmail.com>
-    Robert Rock Howard <http://djangomojo.com/>
-    Jason Huggins <http://www.jrandolph.com/blog/>

django/branches/unicode/django/conf/global_settings.py

@@ -316 +316 @@
-AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend',)
-
+LOGIN_URL = '/accounts/login/'
+
+LOGOUT_URL = '/accounts/logout/'
+
+LOGIN_REDIRECT_URL = '/accounts/profile/'
+
-###########
-# TESTING #

django/branches/unicode/django/conf/locale/fr/LC_MESSAGES/django.po

@@ -8 +8 @@
-"Project-Id-Version: django\n"
-"Report-Msgid-Bugs-To: \n"
-3-11 11:46+01
+4-22 09:06+02
-"PO-Revision-Date: 2006-05-08 15:12+0200\n"
-"Last-Translator: Baptiste Goupil <baptiste.goupil_at_google_email.com>\n"
@@ -16 +16 @@
-"Content-Transfer-Encoding: 8bit\n"
-
-6
-3 db/models/fields/__init__.py:609
-20 newforms/models.py:177
-78 newforms/fields.py:374 newforms/fields.py:450
-1
+4
+1 db/models/fields/__init__.py:607
+18 newforms/models.py:178
+80 newforms/fields.py:376 newforms/fields.py:452
+3
-msgid "This field is required."
-msgstr "Ce champ est obligatoire."
@@ -40 +40 @@
-msgstr "Sélectionnez un choix valide ; '%(data)s' n'est pas dans %(choices)s."
-
-7
+8
-#: contrib/admin/filterspecs.py:150
-msgid "Unknown"
-msgstr "Inconnu"
-
-7
+8
-#: contrib/admin/filterspecs.py:143
-msgid "Yes"
-msgstr "Oui"
-
-7
+8
-#: contrib/admin/filterspecs.py:143
-msgid "No"
@@ -75 +75 @@
-msgstr "Entrez un nombre entier entre 0 et 32 767."
-
-7
+2
-#, python-format
-msgid "%(object)s with this %(type)s already exists for the given %(field)s."
-msgstr ""
-
-
-
+
-msgid "and"
-msgstr "et"
-
-2
+1
-#, python-format
-msgid "%(optname)s with this %(fieldname)s already exists."
-msgstr "%(optname)s avec le champ %(fieldname)s existe déjà."
-
-6
+4
-msgid "This value must be an integer."
-msgstr "Cette valeur doit être un entier."
-
-401
+399
-msgid "This value must be either True or False."
-msgstr "Cette valeur doit être soit Vraie soit Fausse."
-
-2
+0
-msgid "This field cannot be null."
-msgstr "Ce champ ne peut pas être vide."
-
-6
+4
-msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Entrez une date valide au format AAAA-MM-JJ."
-
-5
+3
-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."
-
-9
+7
-msgid "Enter a valid filename."
-msgstr "Entrez un nom de fichier valide."
-
+#: db/models/fields/__init__.py:748
+msgid "This value must be either None, True or False."
+msgstr "Cette valeur doit être Nulle, Vraie ou Fausse."
+
-#: db/models/fields/related.py:53
-#, python-format
@@ -119 +122 @@
-msgstr "Entrez un %s valide."
-
-
-
-
-
-
+
-msgid ""
-"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
@@ -130 +129 @@
-"pour en sélectionner plusieurs."
-
-91
+68
-#, python-format
-msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid."
@@ -240 +239 @@
-
-#: conf/global_settings.py:64
+msgid "Portugese"
+msgstr ""
+
+#: conf/global_settings.py:65
-msgid "Brazilian"
-msgstr "Brésilien"
-
-5
+6
-msgid "Romanian"
-msgstr "Roumain"
-
-6
+7
-msgid "Russian"
-msgstr "Russe"
-
-7
+8
-msgid "Slovak"
-msgstr "Slovaque"
-
-8
+9
-msgid "Slovenian"
-msgstr "Slovaque"
-
-69
+70
-msgid "Serbian"
-msgstr "Serbe"
-
-0
+1
-msgid "Swedish"
-msgstr "Suédois"
-
-1
+2
-msgid "Tamil"
-msgstr "Tamoul"
-
-2
+3
-msgid "Telugu"
-msgstr "Télougou"
-
-3
+4
-msgid "Turkish"
-msgstr "Turc"
-
-4
+5
-msgid "Ukrainian"
-msgstr "Ukrainien"
-
-5
+6
-msgid "Simplified Chinese"
-msgstr "Chinois simplifié"
-
-6
+7
-msgid "Traditional Chinese"
-msgstr "Chinois traditionnel"
@@ -343 +346 @@
-msgstr "Cette valeur ne peut pas être composé uniquement de chiffres."
-
-6
+8
-msgid "Enter a whole number."
-msgstr "Entrez un nombre entier."
@@ -356 +359 @@
-
-#: core/validators.py:143
-fuzzy, 
+
-msgid "Invalid date: %s"
-URL invalide 
+Date invalide&amp;nbsp;
-
-#: core/validators.py:153
@@ -364 +367 @@
-msgstr "Entrez une heure valide au format HH:MM."
-
-69
+71
-msgid "Enter a valid e-mail address."
-msgstr "Entrez une adresse de courriel valide."
@@ -403 +406 @@
-"%s"
-msgstr ""
- 
+&amp;nbsp;
-"%s"
-
@@ -409 +412 @@
-#, python-format
-msgid "Badly formed XML: %s"
- 
+&amp;nbsp;
-
-#: core/validators.py:239
-#, python-format
-msgid "Invalid URL: %s"
- 
+&amp;nbsp;
-
-#: core/validators.py:244 core/validators.py:246
@@ -461 +464 @@
-
-#: core/validators.py:367
-fuzzy, 
+
-msgid "This value must be between %(lower)s and %(upper)s."
-
+comprise 
-
-#: core/validators.py:369
-fuzzy, 
+
-msgid "This value must be at least %s."
-msgstr "Cette valeur doit être au moins %s."
-
-#: core/validators.py:371
-fuzzy, 
+
-msgid "This value must be no more than %s."
-msgstr "Cette valeur ne doit pas dépasser %s."
@@ -613 +616 @@
-msgstr "L'objet %(verbose_name)s a été supprimé."
-
-4 newforms/fields.py:360
+5 newforms/fields.py:362
-msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr ""
@@ -619 +622 @@
-"disponibles."
-
-1 newforms/fields.py:378 newforms/fields.py:454
+2 newforms/fields.py:380 newforms/fields.py:456
-msgid "Enter a list of values."
-msgstr "Entrez une liste de valeur."
-
-7 newforms/fields.py:387
+8 newforms/fields.py:389
-#, python-format
-msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Sélectionnez un choix valide ; %s n'en fait pas partie."
-
-1 newforms/fields.py:254
+3 newforms/fields.py:256
-#, python-format
-msgid "Ensure this value has at most %d characters."
-msgstr "Assurez-vous que cette valeur fait moins de %d caractère."
-
-3 newforms/fields.py:256
+5 newforms/fields.py:258
-#, python-format
-msgid "Ensure this value has at least %d characters."
-msgstr "Assurez-vous que cette valeur fait au moins %d caractère."
-
-28
+30
-#, python-format
-msgid "Ensure this value is less than or equal to %s."
-msgstr "Assurez-vous que cette valeur soit plus petite ou égale à %s."
-
-0
+2
-#, python-format
-msgid "Ensure this value is greater than or equal to %s."
-msgstr "Assurez-vous que cette valeur soit plus grande ou égale à %s."
-
-3
+5
-msgid "Enter a valid date."
-msgstr "Entrez une date valide."
-
-0
+2
-msgid "Enter a valid time."
-msgstr "Entrez une heure valide."
-
-6
+8
-msgid "Enter a valid date/time."
-msgstr "Entrez une date et une heure valides."
-
-0
+2
-msgid "Enter a valid value."
-msgstr "Entrez une valeur valide."
-
-7 newforms/fields.py:309
+9 newforms/fields.py:311
-msgid "Enter a valid URL."
-msgstr "Entrez une URL valide."
-
-1
+3
-msgid "This URL appears to be a broken link."
-msgstr "L'URL est un lien cassé."
-
-6
+7
-msgid "th"
-msgstr "<sup>e</sup>"
-
-6
+7
-msgid "st"
-msgstr "<sup>er</sup>"
-
-6
+7
-msgid "nd"
-msgstr "<sup>d</sup>"
-
-6
+7
-msgid "rd"
-msgstr "<sup>e</sup>"
-
-8
+7
-#, python-format
-msgid "%(value).1f million"
@@ -695 +698 @@
-msgstr[1] "%(value).1f millions"
-
-1
+0
-#, python-format
-msgid "%(value).1f billion"
@@ -702 +705 @@
-msgstr[1] "%(value).1f milliards"
-
-4
+3
-#, python-format
-msgid "%(value).1f trillion"
@@ -709 +712 @@
-msgstr[1] "%(value).1f billions"
-
-9
+8
-msgid "one"
-msgstr "un"
-
-9
+8
-msgid "two"
-msgstr "deux"
-
-9
+8
-msgid "three"
-msgstr "trois"
-
-9
+8
-msgid "four"
-msgstr "quatre"
-
-9
+8
-msgid "five"
-msgstr "cinq"
-
-9
+8
-msgid "six"
-msgstr "six"
-
-9
+8
-msgid "seven"
-msgstr "sept"
-
-9
+8
-msgid "eight"
-msgstr "huit"
-
-9
+8
-msgid "nine"
-msgstr "neuf"
@@ -777 +780 @@
-msgstr "redirige"
-
-6
+5
-msgid "object ID"
-msgstr "ID de l'objet"
@@ -785 +788 @@
-msgstr "titre"
-
-0
-6
+1
+5
-msgid "comment"
-msgstr "commentaire"
@@ -826 +829 @@
-msgstr "est un vote valide"
-
-6
+5
-msgid "date/time submitted"
-msgstr "date et heure soumises"
-
-7
+6
-msgid "is public"
-msgstr "est public"
-
-/views/doc
+docs/views
-msgid "IP address"
-msgstr "adresse IP"
@@ -850 +853 @@
-"commentaire a été supprimé\" sera affiché en lieu et place de celui-ci."
-
-1
+2
-msgid "comments"
-msgstr "commentaires"
-
-31 contrib/comments/models.py:207
+21 contrib/comments/models.py:188
-msgid "Content object"
-msgstr "Type de contenu"
-
-5
+4
-#, python-format
-msgid ""
@@ -873 +876 @@
-"http://%(domain)s%(url)s"
-
-6
+5
-msgid "person's name"
-msgstr "nom"
-
-7
+6
-msgid "ip address"
-msgstr "adresse IP"
-
-7
+6
-msgid "approved by staff"
-msgstr "approuvé par l'équipe"
-
-76
+67
-msgid "free comment"
-msgstr "commentaire libre"
-
-77
+68
-msgid "free comments"
-msgstr "commentaires libres"
-
-33
+14
-msgid "score"
-msgstr "evaluation"
-
-34
+15
-msgid "score date"
-msgstr "date d'évaluation"
-
-37
+19
-msgid "karma score"
-msgstr "point de Karma"
-
-38
+20
-msgid "karma scores"
-msgstr "points de Karma"
-
-42
+24
-#, python-format
-msgid "%(score)d rating by %(user)s"
-msgstr "%(score)d évalué par %(user)s"
-
-58
+40
-#, python-format
-msgid ""
@@ -925 +928 @@
-"%(text)s"
-
-65
+47
-msgid "flag date"
-msgstr "date d'indicateur"
-
-68
+51
-msgid "user flag"
-msgstr "indicateur utilisateur"
-
-69
+52
-msgid "user flags"
-msgstr "indicateurs utilisateur"
-
-73
+56
-#, python-format
-msgid "Flag by %r"
-msgstr "Indicateur par %r"
-
-78
+61
-msgid "deletion date"
-msgstr "date de suppression"
-
-80
+64
-msgid "moderator deletion"
-msgstr "suppression de modérateur"
-
-81
+65
-msgid "moderator deletions"
-msgstr "suppressions de modérateur"
-
-85
+69
-#, python-format
-msgid "Moderator deletion by %r"
@@ -991 +994 @@
-msgstr[0] ""
-"Ce commentaire a été posté par un utilisateur qui a posté moins de %(count)s "
- 
+&amp;nbsp;
-"\n"
-"%(text)s"
-msgstr[1] ""
-"Ce commentaire a été posté par un utilisateur qui a posté moins de %(count)s "
- 
+&amp;nbsp;
-"\n"
-"%(text)s"
@@ -1007 +1010 @@
-"%(text)s"
-msgstr ""
- 
+&amp;nbsp;
-"\n"
-"%(text)s"
@@ -1046 +1049 @@
-#: contrib/comments/templates/comments/freeform.html:4
-msgid "Your name:"
- 
+&amp;nbsp;
-
-#: contrib/comments/templates/comments/freeform.html:5
-#: contrib/comments/templates/comments/form.html:28
-msgid "Comment:"
- 
+&amp;nbsp;
-
-#: contrib/comments/templates/comments/freeform.html:10
@@ -1060 +1063 @@
-#: contrib/comments/templates/comments/form.html:6
-#: contrib/comments/templates/comments/form.html:8
-7
+9
-msgid "Username:"
-msgstr "Nom d'utilisateur"
-
-#: contrib/comments/templates/comments/form.html:6
-3
-5
-0
+4
+8
+6
-#: contrib/admin/templates/admin/base.html:25
-3
+4
-#: contrib/admin/templates/admin/auth/user/change_password.html:9
-#: contrib/admin/templates/registration/password_change_done.html:3
@@ -1087 +1090 @@
-
-#: contrib/comments/templates/comments/form.html:8
-0
+2
-msgid "Password:"
-msgstr "Mot de passe"
@@ -1121 +1124 @@
-msgstr "nom à afficher"
-
-5
+6
-msgid "site"
-msgstr "site"
-
-6
+7
-msgid "sites"
-msgstr "sites"
@@ -1135 +1138 @@
-"<ul>\n"
-msgstr ""
- 
+&amp;nbsp;
-"<ul>\n"
-
@@ -1163 +1166 @@
-msgstr "Cette année"
-
+#: contrib/admin/options.py:307 contrib/admin/views/auth.py:19
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was added successfully."
+msgstr "L'objet %(name)s \"%(obj)s\" a été ajouté avec succès."
+
+#: contrib/admin/options.py:311 contrib/admin/options.py:363
+#: contrib/admin/views/auth.py:24
+msgid "You may edit it again below."
+msgstr "Vous pouvez continuez de l'éditez ci-dessous."
+
+#: contrib/admin/options.py:321 contrib/admin/options.py:372
+#, python-format
+msgid "You may add another %s below."
+msgstr "Vous pouvez ajouter un autre %s ci-dessous."
+
+#: contrib/admin/options.py:358
+msgid "No fields changed."
+msgstr "Aucun champ modifié."
+
+#: contrib/admin/options.py:361
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was changed successfully."
+msgstr "L'objet %(name)s \"%(obj)s\" a été modifié avec succès."
+
+#: contrib/admin/options.py:369
+#, python-format
+msgid ""
+"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below."
+msgstr ""
+"L'objet %(name)s \"%(obj)s\" a été ajouté avec succès.Vous pouvez continuez "
+"de l'éditez ci-dessous."
+
+#: contrib/admin/options.py:408
+#, python-format
+msgid "Add %s"
+msgstr "Ajouter %s"
+
+#: contrib/admin/options.py:468
+#, python-format
+msgid "Change %s"
+msgstr "Changement %s"
+
+#: contrib/admin/options.py:494
+msgid "Database error"
+msgstr "Erreur de base de données"
+
+#: contrib/admin/options.py:539
+#, python-format
+msgid "The %(name)s \"%(obj)s\" was deleted successfully."
+msgstr "L'objet %(name)s \"%(obj)s\" a été supprimé avec succès."
+
+#: contrib/admin/options.py:542
+msgid "Are you sure?"
+msgstr "Êtes-vous sûr ?"
+
+#: contrib/admin/options.py:564
+#, python-format
+msgid "Change history: %s"
+msgstr "Historique des changements&amp;nbsp;: %s"
+
-#: contrib/admin/models.py:16
-msgid "action time"
@@ -1191 +1254 @@
-msgstr "entrées d'historique"
-
+#: contrib/admin/widgets.py:43
+msgid "Date:"
+msgstr "Date&amp;nbsp;:"
+
+#: contrib/admin/widgets.py:43
+msgid "Time:"
+msgstr "Heure&amp;nbsp;:"
+
+#: contrib/admin/sites.py:13 contrib/admin/views/decorators.py:10
+#: contrib/auth/forms.py:60
+msgid ""
+"Please enter a correct username and password. Note that both fields are case-"
+"sensitive."
+msgstr ""
+"Saisissez s'il vous plaît un nom d'utilisateur et un mot de passe valide. "
+"Remarquez que chacun de ces champs est sensible à la casse (différenciation "
+"des majuscules/minuscules)."
+
+#: contrib/admin/sites.py:33 contrib/admin/views/decorators.py:24
+#: contrib/admin/templates/admin/login.html:27
+msgid "Log in"
+msgstr "Connectez-vous"
+
+#: contrib/admin/sites.py:186 contrib/admin/views/decorators.py:62
+msgid ""
+"Please log in again, because your session has expired. Don't worry: Your "
+"submission has been saved."
+msgstr ""
+"Votre session a expiré, connectez-vous de nouveau s'il vous plaît. Ne vous "
+"inquiétez pas, votre travail précédement éffectué a été sauvé."
+
+#: contrib/admin/sites.py:193 contrib/admin/views/decorators.py:69
+msgid ""
+"Looks like your browser isn't configured to accept cookies. Please enable "
+"cookies, reload this page, and try again."
+msgstr ""
+"Il semblerait que votre navigateur n'accepte pas les cookies. Activez-les, "
+"rechargez cette page et rééssayez s'il vous plaît."
+
+#: contrib/admin/sites.py:207 contrib/admin/views/decorators.py:83
+msgid "Usernames cannot contain the '@' character."
+msgstr "Les noms d'utilisateur ne peuvent contenir le caractère '@'"
+
+#: contrib/admin/sites.py:209 contrib/admin/views/decorators.py:85
+#, python-format
+msgid "Your e-mail address is not your username. Try '%s' instead."
+msgstr ""
+"Votre courriel n'est pas votre nom d'utilisateur. Essayez '%s' à la place."
+
+#: contrib/admin/sites.py:263 contrib/admin/views/main.py:136
+msgid "Site administration"
+msgstr "Gestion du site"
+
-#: contrib/admin/templatetags/admin_list.py:247
-msgid "All dates"
-msgstr "Toutes les dates"
-
-#: contrib/admin/views/decorators.py:10 contrib/auth/forms.py:60
-msgid ""
-"Please enter a correct username and password. Note that both fields are case-"
-"sensitive."
-msgstr ""
-"Saisissez s'il vous plaît un nom d'utilisateur et un mot de passe valide. "
-"Remarquez que chacun de ces champs est sensible à la casse (différenciation "
-"des majuscules/minuscules)."
-
-#: contrib/admin/views/decorators.py:24
-#: contrib/admin/templates/admin/login.html:25
-msgid "Log in"
-msgstr "Connectez-vous"
-
-#: contrib/admin/views/decorators.py:62
-msgid ""
-"Please log in again, because your session has expired. Don't worry: Your "
-"submission has been saved."
-msgstr ""
-"Votre session a expiré, connectez-vous de nouveau s'il vous plaît. Ne vous "
-"inquiétez pas, votre travail précédement éffectué a été sauvé."
-
-#: contrib/admin/views/decorators.py:69
-msgid ""
-"Looks like your browser isn't configured to accept cookies. Please enable "
-"cookies, reload this page, and try again."
-msgstr ""
-"Il semblerait que votre navigateur n'accepte pas les cookies. Activez-les, "
-"rechargez cette page et rééssayez s'il vous plaît."
-
-#: contrib/admin/views/decorators.py:83
-msgid "Usernames cannot contain the '@' character."
-msgstr "Les noms d'utilisateur ne peuvent contenir le caractère '@'"
-
-#: contrib/admin/views/decorators.py:85
-#, python-format
-msgid "Your e-mail address is not your username. Try '%s' instead."
-msgstr ""
-"Votre courriel n'est pas votre nom d'utilisateur. Essayez '%s' à la place."
-
-#: contrib/admin/views/auth.py:19 contrib/admin/views/main.py:257
-#, python-format
-msgid "The %(name)s \"%(obj)s\" was added successfully."
-msgstr "L'objet %(name)s \"%(obj)s\" a été ajouté avec succès."
-
-#: contrib/admin/views/auth.py:24 contrib/admin/views/main.py:261
-#: contrib/admin/views/main.py:347
-msgid "You may edit it again below."
-msgstr "Vous pouvez continuez de l'éditez ci-dessous."
-
-#: contrib/admin/views/auth.py:30
-#, fuzzy
-msgid "Add user"
-
-
-
-
+
+
+
-msgid "Password changed successfully."
-msgstr "Mot de passe modifié avec succés"
-
-4
-fuzzy, 
+2
+
-msgid "Change password: %s"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-