diff --git a/AUTHORS b/AUTHORS index 763c95222c..a23e4f30a8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -43,6 +43,7 @@ answer newbie questions, and generally made Django that much better: alang@bright-green.com Marty Alchin + atlithorn Daniel Alves Barbosa de Oliveira Vaz AgarFu Dagur Páll Ammendrup @@ -58,6 +59,9 @@ answer newbie questions, and generally made Django that much better: Arthur David Avsajanishvili axiak@mit.edu + Niran Babalola + Morten Bagai + Mikaël Barbero Jiri Barton Ned Batchelder Shannon -jj Behrens @@ -65,6 +69,7 @@ answer newbie questions, and generally made Django that much better: Chris Bennett James Bennett Ben + Arvis Bickovskis Paul Bissex Simon Blanchard David Blewett @@ -142,6 +147,7 @@ answer newbie questions, and generally made Django that much better: Jorge Gajon gandalf@owca.info Marc Garcia + Alex Gaynor Andy Gayton Baishampayan Ghose Dimitris Glezos @@ -184,6 +190,7 @@ answer newbie questions, and generally made Django that much better: junzhang.jn@gmail.com Antti Kaihola Bahadır Kandemir + Karderio Nagy Károly Erik Karulf Ben Dean Kawamura @@ -207,11 +214,13 @@ answer newbie questions, and generally made Django that much better: knox David Krauth kurtiss@meetro.com + Panos Laganakos lakin.wecker@gmail.com Nick Lane Stuart Langridge Paul Lanier Nicola Larosa + Rune Rønde Laursen Eugene Lazutkin Jeong-Min Lee Jannis Leidel @@ -241,6 +250,8 @@ answer newbie questions, and generally made Django that much better: michael.mcewan@gmail.com michal@plovarna.cz Mikko Hellsing + Daniel Lindsley + Orestis Markou Slawek Mikula mitakummaa@gmail.com mmarshall @@ -253,17 +264,21 @@ answer newbie questions, and generally made Django that much better: Robin Munn Robert Myers Nebojša Dorđević + Doug Napoleone Gopal Narayanan Fraser Nevett Sam Newman + Afonso Fernández Nogueira Neal Norwitz Todd O'Bryan oggie rob Jay Parlar + Carlos Eduardo de Paula pavithran s Barry Pederson permonik@mesias.brnonet.cz petr.marhoun@gmail.com + peter@mymart.com pgross@thoughtworks.com phaedo phil@produxion.net @@ -279,6 +294,7 @@ answer newbie questions, and generally made Django that much better: Johann Queuniet Jan Rademaker Michael Radziej + Laurent Rahuel Amit Ramon Philippe Raoult Massimiliano Ravelli @@ -302,6 +318,7 @@ answer newbie questions, and generally made Django that much better: serbaut@gmail.com John Shaffer Pete Shinners + Leo Shklovskii jason.sidabras@gmail.com Jozko Skrablin Ben Slavin @@ -343,6 +360,7 @@ answer newbie questions, and generally made Django that much better: tstromberg@google.com Makoto Tsuyuki tt@gurgle.no + David Tulig Amit Upadhyay Geert Vanderkelen I.S. van Oostveen diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 6be789a853..3917d40943 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -287,7 +287,7 @@ SESSION_COOKIE_PATH = '/' # The path of the sessio SESSION_SAVE_EVERY_REQUEST = False # Whether to save the session data on every request. SESSION_EXPIRE_AT_BROWSER_CLOSE = False # Whether sessions expire when a user closes his browser. SESSION_ENGINE = 'django.contrib.sessions.backends.db' # The module to store session data -SESSION_FILE_PATH = '/tmp/' # Directory to store session files if using the file session module +SESSION_FILE_PATH = None # Directory to store session files if using the file session module. If set to None the backend will use a sensible default. ######### # CACHE # diff --git a/django/conf/locale/ar/LC_MESSAGES/django.mo b/django/conf/locale/ar/LC_MESSAGES/django.mo index 323e53321d..c52a2ab638 100644 Binary files a/django/conf/locale/ar/LC_MESSAGES/django.mo and b/django/conf/locale/ar/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ar/LC_MESSAGES/django.po b/django/conf/locale/ar/LC_MESSAGES/django.po index 203d50d7de..5bbe749c23 100644 --- a/django/conf/locale/ar/LC_MESSAGES/django.po +++ b/django/conf/locale/ar/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django SVN\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-07-03 19:22+0300\n" "PO-Revision-Date: 2006-07-06 23:46+0300\n" diff --git a/django/conf/locale/ar/LC_MESSAGES/djangojs.mo b/django/conf/locale/ar/LC_MESSAGES/djangojs.mo index 02c1d67b58..9e50b91363 100644 Binary files a/django/conf/locale/ar/LC_MESSAGES/djangojs.mo and b/django/conf/locale/ar/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/ar/LC_MESSAGES/djangojs.po b/django/conf/locale/ar/LC_MESSAGES/djangojs.po index 29b16aef26..d08ffcfd87 100644 --- a/django/conf/locale/ar/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/ar/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django SVN\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: 2006-07-06 23:50+0300\n" diff --git a/django/conf/locale/bg/LC_MESSAGES/django.mo b/django/conf/locale/bg/LC_MESSAGES/django.mo index bfa09dcc23..476f1adec8 100644 Binary files a/django/conf/locale/bg/LC_MESSAGES/django.mo and b/django/conf/locale/bg/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/bg/LC_MESSAGES/django.po b/django/conf/locale/bg/LC_MESSAGES/django.po index 9c1030685e..370a3eba43 100644 --- a/django/conf/locale/bg/LC_MESSAGES/django.po +++ b/django/conf/locale/bg/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-05 01:32+1000\n" "PO-Revision-Date: 2007-05-12 17:45+0300\n" diff --git a/django/conf/locale/bg/LC_MESSAGES/djangojs.mo b/django/conf/locale/bg/LC_MESSAGES/djangojs.mo index e912789236..dba4555f99 100644 Binary files a/django/conf/locale/bg/LC_MESSAGES/djangojs.mo and b/django/conf/locale/bg/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/bg/LC_MESSAGES/djangojs.po b/django/conf/locale/bg/LC_MESSAGES/djangojs.po index 2caffdca53..9f5f19773b 100644 --- a/django/conf/locale/bg/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/bg/LC_MESSAGES/djangojs.po @@ -2,7 +2,7 @@ # msgid "" msgstr "" -"Project-Id-Version: djangojs\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: 2007-05-12 17:51+0300\n" diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo index 672e73e816..b4fdb8e9ed 100644 Binary files a/django/conf/locale/bn/LC_MESSAGES/django.mo and b/django/conf/locale/bn/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po index 5171baf3f0..0a23ba79b0 100644 --- a/django/conf/locale/bn/LC_MESSAGES/django.po +++ b/django/conf/locale/bn/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django CVS\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-16 10:12+0200\n" "PO-Revision-Date: 2005-11-12 20:05+0530\n" diff --git a/django/conf/locale/bn/LC_MESSAGES/djangojs.mo b/django/conf/locale/bn/LC_MESSAGES/djangojs.mo index 1db40df910..fae1fdc90e 100644 Binary files a/django/conf/locale/bn/LC_MESSAGES/djangojs.mo and b/django/conf/locale/bn/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/bn/LC_MESSAGES/djangojs.po b/django/conf/locale/bn/LC_MESSAGES/djangojs.po index 4084313848..120d08d70d 100644 --- a/django/conf/locale/bn/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/bn/LC_MESSAGES/djangojs.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-06-28 17:36+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/conf/locale/ca/LC_MESSAGES/django.mo b/django/conf/locale/ca/LC_MESSAGES/django.mo index dca4df41ec..436f3609ce 100644 Binary files a/django/conf/locale/ca/LC_MESSAGES/django.mo and b/django/conf/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ca/LC_MESSAGES/django.po b/django/conf/locale/ca/LC_MESSAGES/django.po index 0914453f94..d9d3194a83 100644 --- a/django/conf/locale/ca/LC_MESSAGES/django.po +++ b/django/conf/locale/ca/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-29 21:28+0100\n" "PO-Revision-Date: 2008-01-22 19:49+0100\n" diff --git a/django/conf/locale/ca/LC_MESSAGES/djangojs.mo b/django/conf/locale/ca/LC_MESSAGES/djangojs.mo index 847ab17739..6f3c9f2a5a 100644 Binary files a/django/conf/locale/ca/LC_MESSAGES/djangojs.mo and b/django/conf/locale/ca/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/ca/LC_MESSAGES/djangojs.po b/django/conf/locale/ca/LC_MESSAGES/djangojs.po index bd8c6ebdb5..95164f3aeb 100644 --- a/django/conf/locale/ca/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/ca/LC_MESSAGES/djangojs.po @@ -6,7 +6,7 @@ # Antoni Aloy , 2007. msgid "" msgstr "" -"Project-Id-Version: djangojs\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-05-20 18:25+0200\n" "PO-Revision-Date: 2008-01-22 19:39+0100\n" diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index aacfcb6f61..1b1e158dbd 100644 Binary files a/django/conf/locale/cs/LC_MESSAGES/django.mo and b/django/conf/locale/cs/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po index 008acdad7c..fdbf4698f2 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django Czech translation\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-06-18 11:26+0200\n" "Language-Team: Czech\n" diff --git a/django/conf/locale/cs/LC_MESSAGES/djangojs.mo b/django/conf/locale/cs/LC_MESSAGES/djangojs.mo index d1e3f81a82..d6eeada273 100644 Binary files a/django/conf/locale/cs/LC_MESSAGES/djangojs.mo and b/django/conf/locale/cs/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/cs/LC_MESSAGES/djangojs.po b/django/conf/locale/cs/LC_MESSAGES/djangojs.po index 652f00f819..1b07931d69 100644 --- a/django/conf/locale/cs/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/cs/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django JavaScript Czech translation\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-06-18 11:26+0200\n" "Language-Team: Czech\n" diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo index 7d5bf1dda8..6c92b2b869 100644 Binary files a/django/conf/locale/cy/LC_MESSAGES/django.mo and b/django/conf/locale/cy/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po index 281c1af5ee..ab07be6701 100644 --- a/django/conf/locale/cy/LC_MESSAGES/django.po +++ b/django/conf/locale/cy/LC_MESSAGES/django.po @@ -1,12 +1,11 @@ # Translation of Django to Welsh. # Copyright (C) 2005 Django. # This file is distributed under the same license as the Django package. -# Jason Davies , 2005. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-16 10:12+0200\n" "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n" diff --git a/django/conf/locale/cy/LC_MESSAGES/djangojs.po b/django/conf/locale/cy/LC_MESSAGES/djangojs.po index 991c2f786c..1da646bbda 100644 --- a/django/conf/locale/cy/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/cy/LC_MESSAGES/djangojs.po @@ -1,7 +1,6 @@ # Translation of Django admin JS to Welsh. # Copyright (C) 2005 Django project # This file is distributed under the same license as the Django package. -# Jason Davies , 2005. # #, fuzzy msgid "" diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo index 9f86e56407..4878b29d06 100644 Binary files a/django/conf/locale/da/LC_MESSAGES/django.mo and b/django/conf/locale/da/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po index 7688907694..81d8af70f1 100644 --- a/django/conf/locale/da/LC_MESSAGES/django.po +++ b/django/conf/locale/da/LC_MESSAGES/django.po @@ -2,11 +2,9 @@ # Rune Rønde Laursen , 2006. # Copyright (C) 2005 and beyond # This file is distributed under the same license as the PACKAGE package. -# Morten Bagai , Nov 2005. -# Rune Rønde Laursen , Sept 2006. msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-16 10:12+0200\n" "PO-Revision-Date: 2006-09-24 10:34+0200\n" diff --git a/django/conf/locale/da/LC_MESSAGES/djangojs.mo b/django/conf/locale/da/LC_MESSAGES/djangojs.mo index 1db40df910..fae1fdc90e 100644 Binary files a/django/conf/locale/da/LC_MESSAGES/djangojs.mo and b/django/conf/locale/da/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/da/LC_MESSAGES/djangojs.po b/django/conf/locale/da/LC_MESSAGES/djangojs.po index 4084313848..120d08d70d 100644 --- a/django/conf/locale/da/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/da/LC_MESSAGES/djangojs.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-06-28 17:36+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index e24a417194..226c64c560 100644 Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index a87babd658..754c840de0 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -5,11 +5,11 @@ # msgid "" msgstr "" -"Project-Id-Version: Django 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-03 15:46+0100\n" +"POT-Creation-Date: 2008-03-18 15:10-0500\n" "PO-Revision-Date: 2008-03-03 16:10+0100\n" -"Last-Translator: Michael Radziej \n" +"Last-Translator: Jannis Leidel \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,6 @@ msgstr "" "X-Poedit-Country: GERMANY\n" "X-Poedit-SourceCharset: utf-8\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -"X-Generator: KBabel 1.11.4\n" #: conf/global_settings.py:39 msgid "Arabic" @@ -217,10 +216,8 @@ msgstr "" "

Nach %s:

\n" "
    \n" -#: contrib/admin/filterspecs.py:74 -#: contrib/admin/filterspecs.py:92 -#: contrib/admin/filterspecs.py:147 -#: contrib/admin/filterspecs.py:173 +#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 msgid "All" msgstr "Alle" @@ -244,20 +241,17 @@ msgstr "Diesen Monat" msgid "This year" msgstr "Dieses Jahr" -#: contrib/admin/filterspecs.py:147 -#: newforms/widgets.py:231 +#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231 #: oldforms/__init__.py:592 msgid "Yes" msgstr "Ja" -#: contrib/admin/filterspecs.py:147 -#: newforms/widgets.py:231 +#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231 #: oldforms/__init__.py:592 msgid "No" msgstr "Nein" -#: contrib/admin/filterspecs.py:154 -#: newforms/widgets.py:231 +#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231 #: oldforms/__init__.py:592 msgid "Unknown" msgstr "Unbekannt" @@ -297,7 +291,8 @@ msgstr "Seite nicht gefunden" #: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." -msgstr "Es tut uns leid, aber die angeforderte Seite konnte nicht gefunden werden." +msgstr "" +"Es tut uns leid, aber die angeforderte Seite konnte nicht gefunden werden." #: contrib/admin/templates/admin/500.html:4 #: contrib/admin/templates/admin/base.html:37 @@ -329,8 +324,13 @@ msgid "Server Error (500)" msgstr "Serverfehler (500)" #: 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 "Ein Fehler ist aufgetreten. Dieser Fehler wurde an die Serververwalter per E-Mail weitergegeben und sollte bald behoben sein. Vielen Dank für Ihr Verständnis." +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 "" +"Ein Fehler ist aufgetreten. Dieser Fehler wurde an die Serververwalter per E-" +"Mail weitergegeben und sollte bald behoben sein. Vielen Dank für Ihr " +"Verständnis." #: contrib/admin/templates/admin/base.html:26 msgid "Welcome," @@ -401,13 +401,23 @@ msgstr "Löschen" #: contrib/admin/templates/admin/delete_confirmation.html:13 #, python-format -msgid "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:" -msgstr "Die Löschung des %(object_name)s '%(escaped_object)s' hätte die Löschung von abhängigen Daten zur Folge, aber Sie haben nicht die nötigen Rechte um die folgenden abhängigen Daten zu löschen:" +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" +"Die Löschung des %(object_name)s '%(escaped_object)s' hätte die Löschung von " +"abhängigen Daten zur Folge, aber Sie haben nicht die nötigen Rechte um die " +"folgenden abhängigen Daten zu löschen:" #: contrib/admin/templates/admin/delete_confirmation.html:20 #, python-format -msgid "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? All of the following related items will be deleted:" -msgstr "Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" löschen wollen? Es werden zusätzlich die folgenden abhängigen Daten mit gelöscht:" +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" +"Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" löschen " +"wollen? Es werden zusätzlich die folgenden abhängigen Daten mit gelöscht:" #: contrib/admin/templates/admin/delete_confirmation.html:25 msgid "Yes, I'm sure" @@ -438,7 +448,7 @@ msgstr "Ändern" #: contrib/admin/templates/admin/index.html:44 msgid "You don't have permission to edit anything." -msgstr "Sie haben keine Berechtigung irgendwas zu ändern." +msgstr "Sie haben keine Berechtigung, irgendetwas zu ändern." #: contrib/admin/templates/admin/index.html:52 msgid "Recent Actions" @@ -453,8 +463,14 @@ msgid "None available" msgstr "Keine vorhanden" #: contrib/admin/templates/admin/invalid_setup.html:8 -msgid "Something's wrong with your database installation. Make sure the appropriate database tables have been created, and make sure the database is readable by the appropriate user." -msgstr "Etwas stimmt nicht mit der Datenbankkonfiguration. Bitte sicherstellen, dass die richtigen Datenbanktabellen angelegt wurden und die Datenbank vom verwendeten Datenbankbenutzer auch lesbar ist." +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" +"Etwas stimmt nicht mit der Datenbankkonfiguration. Bitte sicherstellen, dass " +"die richtigen Datenbanktabellen angelegt wurden und die Datenbank vom " +"verwendeten Datenbankbenutzer auch lesbar ist." #: contrib/admin/templates/admin/login.html:17 #: contrib/comments/templates/comments/form.html:6 @@ -489,8 +505,12 @@ msgid "DATE_WITH_TIME_FULL" msgstr "j. N Y, H:i" #: contrib/admin/templates/admin/object_history.html:35 -msgid "This object doesn't have a change history. It probably wasn't added via this admin site." -msgstr "Dieses Objekt hat keine Änderungsgeschichte. Es wurde möglicherweise nicht über diese Verwaltungsseiten angelegt." +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" +"Dieses Objekt hat keine Änderungsgeschichte. Es wurde möglicherweise nicht " +"über diese Verwaltungsseiten angelegt." #: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" @@ -529,8 +549,12 @@ msgid "Save" msgstr "Sichern" #: contrib/admin/templates/admin/auth/user/add_form.html:6 -msgid "First, enter a username and password. Then, you'll be able to edit more user options." -msgstr "Zuerst einen Benutzer und ein Passwort eingeben. Danach können weitere Optionen für den Benutzer geändert werden." +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Zuerst einen Benutzer und ein Passwort eingeben. Danach können weitere " +"Optionen für den Benutzer geändert werden." #: contrib/admin/templates/admin/auth/user/add_form.html:12 msgid "Username" @@ -554,7 +578,9 @@ msgstr "Bitte das gleiche Passwort zur Überprüfung nochmal eingeben." #: contrib/admin/templates/admin/auth/user/change_password.html:27 #, python-format msgid "Enter a new password for the user %(username)s." -msgstr "Bitte geben Sie ein neues Passwort für den Benutzer %(username)s ein." +msgstr "" +"Bitte geben Sie ein neues Passwort für den Benutzer %(username)s ein." #: contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" @@ -575,9 +601,12 @@ msgid "" "your computer is \"internal\").

    \n" msgstr "" "\n" -"

    Um Bookmarklets zu installieren, müssen diese Links in die\n" -"Browser-Werkzeugleiste gezogen werden, oder mittels rechter Maustaste in die\n" -"Bookmarks gespeichert werden. Danach können die Bookmarklets von jeder Seite\n" +"

    Um Bookmarklets zu installieren, müssen diese Links in " +"die\n" +"Browser-Werkzeugleiste gezogen werden, oder mittels rechter Maustaste in " +"die\n" +"Bookmarks gespeichert werden. Danach können die Bookmarklets von jeder " +"Seite\n" "aufgerufen werden. Einige Bookmarklets sind für den Zugriff von 'internen'\n" "Rechnern eingeschränkt. Falls nicht klar ist, ob ein Rechner als 'intern'\n" "bewertet wird, bitte den Administrator fragen.

    \n" @@ -587,16 +616,24 @@ msgid "Documentation for this page" msgstr "Dokumentation für diese Seite" #: contrib/admin/templates/admin_doc/bookmarklets.html:19 -msgid "Jumps you from any page to the documentation for the view that generates that page." -msgstr "Springt von jeder Seite zu der Dokumentation für den View der diese Seite erzeugt." +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." +msgstr "" +"Springt von jeder Seite zu der Dokumentation für den View der diese Seite " +"erzeugt." #: contrib/admin/templates/admin_doc/bookmarklets.html:21 msgid "Show object ID" msgstr "Objekt-ID anzeigen" #: contrib/admin/templates/admin_doc/bookmarklets.html:22 -msgid "Shows the content-type and unique ID for pages that represent a single object." -msgstr "Zeigt den Content-Type und die eindeutige ID für Seiten die ein einzelnes Objekt repräsentieren." +msgid "" +"Shows the content-type and unique ID for pages that represent a single " +"object." +msgstr "" +"Zeigt den Content-Type und die eindeutige ID für Seiten die ein einzelnes " +"Objekt repräsentieren." #: contrib/admin/templates/admin_doc/bookmarklets.html:24 msgid "Edit this object (current window)" @@ -604,7 +641,9 @@ msgstr "Dieses Objekt im aktuellen Fenster ändern." #: contrib/admin/templates/admin_doc/bookmarklets.html:25 msgid "Jumps to the admin page for pages that represent a single object." -msgstr "Springt zu der Administrationsseite für dieses Objekt, wenn diese Seite ein Objekt repräsentiert." +msgstr "" +"Springt zu der Administrationsseite für dieses Objekt, wenn diese Seite ein " +"Objekt repräsentiert." #: contrib/admin/templates/admin_doc/bookmarklets.html:27 msgid "Edit this object (new window)" @@ -612,7 +651,8 @@ msgstr "Dieses Objekt in einem neuen Fenster ändern." #: contrib/admin/templates/admin_doc/bookmarklets.html:28 msgid "As above, but opens the admin page in a new window." -msgstr "Wie zuvor, aber öffnet die Administrationsseite in einem neuen Fenster." +msgstr "" +"Wie zuvor, aber öffnet die Administrationsseite in einem neuen Fenster." #: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." @@ -639,8 +679,13 @@ msgid "Your password was changed." msgstr "Ihr Passwort wurde geändert." #: contrib/admin/templates/registration/password_change_form.html:11 -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 "Bitte geben Sie aus Sicherheitsgründen erst Ihr altes Passwort und darunter dann zweimal (um sicherzustellen, dass Sie es korrekt eingegeben haben) das neue Kennwort ein." +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 "" +"Bitte geben Sie aus Sicherheitsgründen erst Ihr altes Passwort und darunter " +"dann zweimal (um sicherzustellen, dass Sie es korrekt eingegeben haben) das " +"neue Kennwort ein." #: contrib/admin/templates/registration/password_change_form.html:16 msgid "Old password:" @@ -671,8 +716,12 @@ msgid "Password reset successful" msgstr "Passwort wurde erfolgreich zurückgesetzt" #: 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 "Wir haben ein neues Passwort an die von Ihnen angegebene E-Mail-Adresse geschickt. Sie sollten es in Kürze erhalten." +msgid "" +"We've e-mailed a new password to the e-mail address you submitted. You " +"should be receiving it shortly." +msgstr "" +"Wir haben ein neues Passwort an die von Ihnen angegebene E-Mail-Adresse " +"geschickt. Sie sollten es in Kürze erhalten." #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" @@ -706,8 +755,12 @@ msgid "The %(site_name)s team" msgstr "Das Team von %(site_name)s" #: 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 "Passwort vergessen? Einfach die E-Mail-Adresse eingeben und wir setzen das Passwort zurück und lassen es Ihnen per E-Mail zukommen." +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 "" +"Passwort vergessen? Einfach die E-Mail-Adresse eingeben und wir setzen das " +"Passwort zurück und lassen es Ihnen per E-Mail zukommen." #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" @@ -737,14 +790,12 @@ msgstr "Ändern:" msgid "All dates" msgstr "Alle Tage" -#: contrib/admin/views/auth.py:20 -#: contrib/admin/views/main.py:267 +#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt." -#: contrib/admin/views/auth.py:25 -#: contrib/admin/views/main.py:271 +#: contrib/admin/views/auth.py:25 contrib/admin/views/main.py:271 #: contrib/admin/views/main.py:356 msgid "You may edit it again below." msgstr "Das Element kann jetzt weiter bearbeitet werden." @@ -762,18 +813,29 @@ msgstr "Passwort erfolgreich geändert." msgid "Change password: %s" msgstr "Passwort ändern: %s" -#: contrib/admin/views/decorators.py:17 -#: contrib/auth/forms.py:60 -msgid "Please enter a correct username and password. Note that both fields are case-sensitive." -msgstr "Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder berücksichtigen die Groß-/Kleinschreibung." +#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60 +msgid "" +"Please enter a correct username and password. Note that both fields are case-" +"sensitive." +msgstr "" +"Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder " +"berücksichtigen die Groß-/Kleinschreibung." #: contrib/admin/views/decorators.py:69 -msgid "Please log in again, because your session has expired. Don't worry: Your submission has been saved." -msgstr "Bitte neu anmelden, da die Session ausgelaufen ist. Keine Angst, die Beiträge wurden gesichert." +msgid "" +"Please log in again, because your session has expired. Don't worry: Your " +"submission has been saved." +msgstr "" +"Bitte neu anmelden, da die Session ausgelaufen ist. Keine Angst, die " +"Beiträge wurden gesichert." #: contrib/admin/views/decorators.py:76 -msgid "Looks like your browser isn't configured to accept cookies. Please enable cookies, reload this page, and try again." -msgstr "Es sieht danach aus, dass der Browser keine Cookies akzeptiert. Bitte im Browser Cookies aktivieren und diese Seite neu laden." +msgid "" +"Looks like your browser isn't configured to accept cookies. Please enable " +"cookies, reload this page, and try again." +msgstr "" +"Es sieht danach aus, dass der Browser keine Cookies akzeptiert. Bitte im " +"Browser Cookies aktivieren und diese Seite neu laden." #: contrib/admin/views/decorators.py:90 msgid "Usernames cannot contain the '@' character." @@ -782,22 +844,21 @@ msgstr "Benutzernamen dürfen das Zeichen '@' nicht enthalten." #: contrib/admin/views/decorators.py:92 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." -msgstr "Die E-Mail-Adresse entspricht nicht Ihrem Benutzernamen. Bitte stattdessen '%s' versuchen." +msgstr "" +"Die E-Mail-Adresse entspricht nicht Ihrem Benutzernamen. Bitte stattdessen " +"'%s' versuchen." -#: contrib/admin/views/doc.py:48 -#: contrib/admin/views/doc.py:50 +#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50 #: contrib/admin/views/doc.py:52 msgid "tag:" msgstr "Schlagwort:" -#: contrib/admin/views/doc.py:79 -#: contrib/admin/views/doc.py:81 +#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81 #: contrib/admin/views/doc.py:83 msgid "filter:" msgstr "Filter:" -#: contrib/admin/views/doc.py:137 -#: contrib/admin/views/doc.py:139 +#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139 #: contrib/admin/views/doc.py:141 msgid "view:" msgstr "Ansicht:" @@ -817,10 +878,8 @@ msgstr "Modell %(name)r wurde nicht in Anwendung %(label)r gefunden" msgid "the related `%(label)s.%(type)s` object" msgstr "Das verknüpfte `%(label)s.%(type)s` Objekt" -#: contrib/admin/views/doc.py:185 -#: contrib/admin/views/doc.py:207 -#: contrib/admin/views/doc.py:221 -#: contrib/admin/views/doc.py:226 +#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207 +#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226 msgid "model:" msgstr "Modell:" @@ -844,12 +903,9 @@ msgstr "Anzahl von %s" msgid "Fields on %s objects" msgstr "Felder am %s Objekt" -#: contrib/admin/views/doc.py:293 -#: contrib/admin/views/doc.py:304 -#: contrib/admin/views/doc.py:306 -#: contrib/admin/views/doc.py:312 -#: contrib/admin/views/doc.py:313 -#: contrib/admin/views/doc.py:315 +#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304 +#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312 +#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315 msgid "Integer" msgstr "Ganzzahl" @@ -857,8 +913,7 @@ msgstr "Ganzzahl" msgid "Boolean (Either True or False)" msgstr "Boolscher Wert (True oder False)" -#: contrib/admin/views/doc.py:295 -#: contrib/admin/views/doc.py:314 +#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314 #, python-format msgid "String (up to %(max_length)s)" msgstr "Zeichenkette (bis zu %(max_length)s Zeichen)" @@ -883,8 +938,7 @@ msgstr "Dezimalzahl" msgid "E-mail address" msgstr "E-Mail-Adresse" -#: contrib/admin/views/doc.py:301 -#: contrib/admin/views/doc.py:302 +#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302 #: contrib/admin/views/doc.py:305 msgid "File path" msgstr "Dateipfad" @@ -893,8 +947,7 @@ msgstr "Dateipfad" msgid "Floating point number" msgstr "Fließkommazahl" -#: contrib/admin/views/doc.py:307 -#: contrib/comments/models.py:89 +#: contrib/admin/views/doc.py:307 contrib/comments/models.py:89 msgid "IP address" msgstr "IP-Adresse" @@ -918,8 +971,7 @@ msgstr "Text" msgid "Time" msgstr "Zeit" -#: contrib/admin/views/doc.py:318 -#: contrib/flatpages/models.py:7 +#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:7 msgid "URL" msgstr "Adresse (URL)" @@ -940,8 +992,7 @@ msgstr "%s ist scheinbar kein urlpattern Objekt" msgid "Site administration" msgstr "Website-Verwaltung" -#: contrib/admin/views/main.py:280 -#: contrib/admin/views/main.py:365 +#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365 #, python-format msgid "You may add another %s below." msgstr "Jetzt kann ein weiteres Element vom Typ %s angelegt werden." @@ -956,10 +1007,8 @@ msgstr "%s hinzufügen" msgid "Added %s." msgstr "%s hinzugefügt." -#: contrib/admin/views/main.py:344 -#: contrib/admin/views/main.py:346 -#: contrib/admin/views/main.py:348 -#: core/validators.py:283 +#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346 +#: contrib/admin/views/main.py:348 core/validators.py:283 #: db/models/manipulators.py:309 msgid "and" msgstr "und" @@ -985,8 +1034,11 @@ msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert." #: contrib/admin/views/main.py:362 #, python-format -msgid "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." -msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt geändert werden." +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "" +"%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Das Element kann jetzt " +"geändert werden." #: contrib/admin/views/main.py:400 #, python-format @@ -1031,8 +1083,7 @@ msgstr "%s zur Änderung auswählen" msgid "Database error" msgstr "Datenbankfehler" -#: contrib/auth/forms.py:17 -#: contrib/auth/forms.py:138 +#: contrib/auth/forms.py:17 contrib/auth/forms.py:138 msgid "The two password fields didn't match." msgstr "Die beiden Passwörter sind nicht identisch." @@ -1041,16 +1092,24 @@ msgid "A user with that username already exists." msgstr "Ein Benutzer mit diesem Namen existiert bereits." #: contrib/auth/forms.py:53 -msgid "Your Web browser doesn't appear to have cookies enabled. Cookies are required for logging in." -msgstr "Der Webbrowser scheint keine Cookies aktiviert zu haben. Cookies sind für die Anmeldung zwingend erforderlich." +msgid "" +"Your Web browser doesn't appear to have cookies enabled. Cookies are " +"required for logging in." +msgstr "" +"Der Webbrowser scheint keine Cookies aktiviert zu haben. Cookies sind für " +"die Anmeldung zwingend erforderlich." #: contrib/auth/forms.py:62 msgid "This account is inactive." msgstr "Dieser Benutzer ist inaktiv." #: contrib/auth/forms.py:84 -msgid "That e-mail address doesn't have an associated user account. Are you sure you've registered?" -msgstr "Zu dieser E-Mail-Adresse existiert kein Benutzer. Sicher, dass Sie sich mit dieser Adresse angemeldet haben?" +msgid "" +"That e-mail address doesn't have an associated user account. Are you sure " +"you've registered?" +msgstr "" +"Zu dieser E-Mail-Adresse existiert kein Benutzer. Sicher, dass Sie sich mit " +"dieser Adresse angemeldet haben?" #: contrib/auth/forms.py:107 #, python-format @@ -1065,8 +1124,7 @@ msgstr "Die beiden neuen Passwörter sind nicht identisch." msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Das alte Passwort war falsch. Bitte neu eingeben." -#: contrib/auth/models.py:73 -#: contrib/auth/models.py:93 +#: contrib/auth/models.py:73 contrib/auth/models.py:93 msgid "name" msgstr "Name" @@ -1078,8 +1136,7 @@ msgstr "Codename" msgid "permission" msgstr "Berechtigung" -#: contrib/auth/models.py:79 -#: contrib/auth/models.py:94 +#: contrib/auth/models.py:79 contrib/auth/models.py:94 msgid "permissions" msgstr "Berechtigungen" @@ -1087,8 +1144,7 @@ msgstr "Berechtigungen" msgid "group" msgstr "Gruppe" -#: contrib/auth/models.py:98 -#: contrib/auth/models.py:141 +#: contrib/auth/models.py:98 contrib/auth/models.py:141 msgid "groups" msgstr "Gruppen" @@ -1097,8 +1153,12 @@ msgid "username" msgstr "Benutzername" #: contrib/auth/models.py:131 -msgid "Required. 30 characters or fewer. Alphanumeric characters only (letters, digits and underscores)." -msgstr "Erforderlich. 30 Zeichen oder weniger. Alphanumerische Zeichen (Buchstaben, Ziffern und Unterstriche sind erlaubt)." +msgid "" +"Required. 30 characters or fewer. Alphanumeric characters only (letters, " +"digits and underscores)." +msgstr "" +"Erforderlich. 30 Zeichen oder weniger. Alphanumerische Zeichen (Buchstaben, " +"Ziffern und Unterstriche sind erlaubt)." #: contrib/auth/models.py:132 msgid "first name" @@ -1117,8 +1177,12 @@ msgid "password" msgstr "Passwort" #: contrib/auth/models.py:135 -msgid "Use '[algo]$[salt]$[hexdigest]' or use the change password form." -msgstr "Die Form '[algo]$[salt]$[hexdigest]' verwenden, oder das Passwort ändern Formular benutzen." +msgid "" +"Use '[algo]$[salt]$[hexdigest]' or use the change " +"password form." +msgstr "" +"Die Form '[algo]$[salt]$[hexdigest]' verwenden, oder das Passwort ändern Formular benutzen." #: contrib/auth/models.py:136 msgid "staff status" @@ -1126,23 +1190,33 @@ msgstr "Administrator" #: contrib/auth/models.py:136 msgid "Designates whether the user can log into this admin site." -msgstr "Legt fest, ob sich der Benutzer an der Administrationsseite anmelden kann." +msgstr "" +"Legt fest, ob sich der Benutzer an der Administrationsseite anmelden kann." #: contrib/auth/models.py:137 msgid "active" msgstr "Aktiv" #: contrib/auth/models.py:137 -msgid "Designates whether this user can log into the Django admin. Unselect this instead of deleting accounts." -msgstr "Legt fest, ob sich der Benutzer an der Administrationsseite anmelden kann. Anstatt einen Benutzer zu löschen, kann er hier auch einfach deaktiviert werden." +msgid "" +"Designates whether this user can log into the Django admin. Unselect this " +"instead of deleting accounts." +msgstr "" +"Legt fest, ob sich der Benutzer an der Administrationsseite anmelden kann. " +"Anstatt einen Benutzer zu löschen, kann er hier auch einfach deaktiviert " +"werden." #: contrib/auth/models.py:138 msgid "superuser status" msgstr "Hauptadmin." #: contrib/auth/models.py:138 -msgid "Designates that this user has all permissions without explicitly assigning them." -msgstr "Legt fest, dass der Benutzer alle Berechtigungen hat, ohne diese einzeln zuweisen zu müssen." +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "" +"Legt fest, dass der Benutzer alle Berechtigungen hat, ohne diese einzeln " +"zuweisen zu müssen." #: contrib/auth/models.py:139 msgid "last login" @@ -1153,8 +1227,12 @@ msgid "date joined" msgstr "Mitglied seit" #: contrib/auth/models.py:142 -msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in." -msgstr "Zusätzlich zu den manuell angelegten Rechten erhält dieser Benutzer auch alle Rechte, die seine zugewiesenen Gruppen haben." +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "" +"Zusätzlich zu den manuell angelegten Rechten erhält dieser Benutzer auch " +"alle Rechte, die seine zugewiesenen Gruppen haben." #: contrib/auth/models.py:143 msgid "user permissions" @@ -1192,8 +1270,7 @@ msgstr "Mitteilung" msgid "Logged out" msgstr "Abgemeldet" -#: contrib/comments/models.py:71 -#: contrib/comments/models.py:176 +#: contrib/comments/models.py:71 contrib/comments/models.py:176 msgid "object ID" msgstr "Objekt-ID" @@ -1201,8 +1278,7 @@ msgstr "Objekt-ID" msgid "headline" msgstr "Überschrift" -#: contrib/comments/models.py:73 -#: contrib/comments/models.py:95 +#: contrib/comments/models.py:73 contrib/comments/models.py:95 #: contrib/comments/models.py:177 msgid "comment" msgstr "Kommentar" @@ -1243,13 +1319,11 @@ msgstr "Bewertung #8" msgid "is valid rating" msgstr "ist eine Bewertung" -#: contrib/comments/models.py:87 -#: contrib/comments/models.py:179 +#: contrib/comments/models.py:87 contrib/comments/models.py:179 msgid "date/time submitted" msgstr "Datum/Zeit Erstellung" -#: contrib/comments/models.py:88 -#: contrib/comments/models.py:180 +#: contrib/comments/models.py:88 contrib/comments/models.py:180 msgid "is public" msgstr "ist öffentlich" @@ -1258,15 +1332,18 @@ msgid "is removed" msgstr "ist gelöscht" #: contrib/comments/models.py:90 -msgid "Check this box if the comment is inappropriate. A \"This comment has been removed\" message will be displayed instead." -msgstr "Hier einen Haken setzen, wenn der Kommentar unpassend ist. Stattdessen wird dann \"Dieser Kommentar wurde entfernt\" Meldung angezeigt." +msgid "" +"Check this box if the comment is inappropriate. A \"This comment has been " +"removed\" message will be displayed instead." +msgstr "" +"Hier einen Haken setzen, wenn der Kommentar unpassend ist. Stattdessen wird " +"dann \"Dieser Kommentar wurde entfernt\" Meldung angezeigt." #: contrib/comments/models.py:96 msgid "comments" msgstr "Kommentare" -#: contrib/comments/models.py:140 -#: contrib/comments/models.py:222 +#: contrib/comments/models.py:140 contrib/comments/models.py:222 msgid "Content object" msgstr "Inhaltsobjekt" @@ -1408,25 +1485,32 @@ msgid "Your name:" msgstr "Ihr Name:" #: contrib/comments/views/comments.py:28 -msgid "This rating is required because you've entered at least one other rating." -msgstr "Diese Abstimmung ist zwingend erforderlich, da Sie an mindestens einer weiteren Abstimmung teilnehmen." +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "" +"Diese Abstimmung ist zwingend erforderlich, da Sie an mindestens einer " +"weiteren Abstimmung teilnehmen." #: contrib/comments/views/comments.py:112 #, python-format msgid "" -"This comment was posted by a user who has posted fewer than %(count)s comment:\n" +"This comment was posted by a user who has posted fewer than %(count)s " +"comment:\n" "\n" "%(text)s" msgid_plural "" -"This comment was posted by a user who has posted fewer than %(count)s comments:\n" +"This comment was posted by a user who has posted fewer than %(count)s " +"comments:\n" "\n" "%(text)s" msgstr[0] "" -"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s Kommentar:\n" +"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s " +"Kommentar:\n" "\n" "%(text)s" msgstr[1] "" -"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s Kommentaren:\n" +"Dieser Kommentar ist von einem Benutzer mit weniger als %(count)s " +"Kommentaren:\n" "\n" "%(text)s" @@ -1454,17 +1538,23 @@ msgstr "Eines oder mehrere der erforderlichen Felder fehlen" #: contrib/comments/views/comments.py:198 #: contrib/comments/views/comments.py:289 msgid "Somebody tampered with the comment form (security violation)" -msgstr "Jemand hat mit dem Kommentarformular herumgespielt (Sicherheitsverletzung)" +msgstr "" +"Jemand hat mit dem Kommentarformular herumgespielt (Sicherheitsverletzung)" #: contrib/comments/views/comments.py:208 #: contrib/comments/views/comments.py:295 -msgid "The comment form had an invalid 'target' parameter -- the object ID was invalid" -msgstr "Das Kommentarformular hatte einen falschen 'target' Parameter -- die Objekt-ID ist ungültig." +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" +"Das Kommentarformular hatte einen falschen 'target' Parameter -- die Objekt-" +"ID ist ungültig." #: contrib/comments/views/comments.py:259 #: contrib/comments/views/comments.py:324 msgid "The comment form didn't provide either 'preview' or 'post'" -msgstr "Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt" +msgstr "" +"Das Kommentarformular wurde nicht mit 'preview' oder 'post' abgeschickt" #: contrib/comments/views/karma.py:21 msgid "Anonymous users cannot vote" @@ -1478,21 +1568,23 @@ msgstr "Ungültige Kommentar-ID" msgid "No voting for yourself" msgstr "Keine Abstimmung für dich selbst" -#: contrib/contenttypes/models.py:37 +#: contrib/contenttypes/models.py:67 msgid "python model class name" msgstr "Python Model-Klassenname" -#: contrib/contenttypes/models.py:40 +#: contrib/contenttypes/models.py:71 msgid "content type" msgstr "Inhaltstyp" -#: contrib/contenttypes/models.py:41 +#: contrib/contenttypes/models.py:72 msgid "content types" msgstr "Inhaltstypen" #: contrib/flatpages/models.py:8 -msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "Beispiel: '/about/contact/'. Wichtig: vorne und hinten muss ein / stehen." +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Beispiel: '/about/contact/'. Wichtig: Am Anfang und Ende muss ein / stehen." #: contrib/flatpages/models.py:9 msgid "title" @@ -1511,8 +1603,12 @@ msgid "template name" msgstr "Name der Vorlage" #: contrib/flatpages/models.py:13 -msgid "Example: 'flatpages/contact_page.html'. If this isn't provided, the system will use 'flatpages/default.html'." -msgstr "Beispiel: 'flatpages/contact_page.html'. Wenn dieses Feld nicht gefüllt ist, wird 'flatpages/default.html' als Standard gewählt." +msgid "" +"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " +"will use 'flatpages/default.html'." +msgstr "" +"Beispiel: 'flatpages/contact_page.html'. Wenn dieses Feld nicht gefüllt ist, " +"wird 'flatpages/default.html' als Standard gewählt." #: contrib/flatpages/models.py:14 msgid "registration required" @@ -1520,7 +1616,9 @@ msgstr "Registrierung erforderlich" #: contrib/flatpages/models.py:14 msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "Wenn hier ein Haken gesetzt ist, können nur angemeldete Benutzer diese Seite sehen." +msgstr "" +"Wenn hier ein Haken gesetzt ist, können nur angemeldete Benutzer diese Seite " +"sehen." #: contrib/flatpages/models.py:18 msgid "flat page" @@ -1618,31 +1716,31 @@ msgstr "gestern" #: contrib/localflavor/ar/forms.py:27 #, fuzzy msgid "Enter a postal code in the format NNNN or ANNNNAAA." -msgstr "Bitte eine gültige Postleitzahl im Format XXXXXXX oder XXX-XXXX eingeben." +msgstr "" +"Bitte eine gültige Postleitzahl im Format NNNN oder ANNNNAAA eingeben." -#: contrib/localflavor/ar/forms.py:49 -#: contrib/localflavor/br/forms.py:96 -#: contrib/localflavor/br/forms.py:135 -#: contrib/localflavor/pe/forms.py:23 +#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96 +#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23 #: contrib/localflavor/pe/forms.py:51 #, fuzzy msgid "This field requires only numbers." -msgstr "Dieses Feld ist zwingend erforderlich." +msgstr "Dieses Feld darf nur Ziffern enthalten." #: contrib/localflavor/ar/forms.py:50 #, fuzzy msgid "This field requires 7 or 8 digits." -msgstr "Dieses Feld ist zwingend erforderlich." +msgstr "Dieses Feld benötigt 7 oder 8 Ziffern." #: contrib/localflavor/ar/forms.py:79 #, fuzzy msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format." -msgstr "Bitte eine gültige deutsche Personalausweisnummer im Format XXXXXXXXXXX-XXXXXXX-XXXXXXX-X eingeben." +msgstr "" +"Bitte eine gültige CUIT im Format XX-XXXXXXXX-X oder XXXXXXXXXXXX eingeben." #: contrib/localflavor/ar/forms.py:80 #, fuzzy msgid "Invalid CUIT." -msgstr "Ungültige URL: %s" +msgstr "Ungültige CUIT." #: contrib/localflavor/au/forms.py:16 msgid "Enter a 4 digit post code." @@ -1654,30 +1752,32 @@ msgstr "Bitte eine gültige Postleitzahl im Format XXXXX-XXX eingeben." #: contrib/localflavor/br/forms.py:30 msgid "Phone numbers must be in XX-XXXX-XXXX format." -msgstr "Telefonnummern müssen das Format XXX-XXX-XXXX haben." +msgstr "Telefonnummern müssen das Format XX-XXXX-XXXX haben." #: contrib/localflavor/br/forms.py:58 #, fuzzy -msgid "Select a valid brazilian state. That state is not one of the available states." -msgstr "Bitte eine gültige Auswahl treffen." +msgid "" +"Select a valid brazilian state. That state is not one of the available " +"states." +msgstr "Bitte einen gültigen brasilianischen Bundesstaat auswählen." #: contrib/localflavor/br/forms.py:94 msgid "Invalid CPF number." -msgstr "" +msgstr "Ungültige CPF-Nummer." #: contrib/localflavor/br/forms.py:95 #, fuzzy msgid "This field requires at most 11 digits or 14 characters." -msgstr "Bitte sicherstellen, dass der Text maximal %d Zeichen hat." +msgstr "Dieses Feld benötigt mindestens 11 Ziffern oder 14 Zeichen." #: contrib/localflavor/br/forms.py:134 msgid "Invalid CNPJ number." -msgstr "" +msgstr "Ungültige CNPJ-Nummer." #: contrib/localflavor/br/forms.py:136 #, fuzzy msgid "This field requires at least 14 digits" -msgstr "Dieses Feld ist zwingend erforderlich." +msgstr "Dieses Feld benötigt mindestens 14 Ziffern." #: contrib/localflavor/ca/forms.py:17 #, fuzzy @@ -1687,7 +1787,9 @@ msgstr "Bitte eine gültige Postleitzahl im Format XXXXX eingeben." #: contrib/localflavor/ca/forms.py:88 #, fuzzy msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format." -msgstr "Bitte eine gültige US-amerikanische Sozialversicherungsnummer im Format XXX-XX-XXXX eingeben." +msgstr "" +"Bitte eine gültige kanadische Sozialversicherungsnummer im Format XXX-" +"XXX-XXX eingeben." #: contrib/localflavor/ch/ch_states.py:5 msgid "Aargau" @@ -1712,15 +1814,15 @@ msgstr "" #: contrib/localflavor/ch/ch_states.py:10 #, fuzzy msgid "Berne" -msgstr "Berlin" +msgstr "Bern" #: contrib/localflavor/ch/ch_states.py:11 msgid "Fribourg" -msgstr "" +msgstr "Freiburg" #: contrib/localflavor/ch/ch_states.py:12 msgid "Geneva" -msgstr "" +msgstr "Genf" #: contrib/localflavor/ch/ch_states.py:13 #, fuzzy @@ -1771,7 +1873,7 @@ msgstr "" #: contrib/localflavor/ch/ch_states.py:24 #, fuzzy msgid "Thurgau" -msgstr "Thüringen" +msgstr "" #: contrib/localflavor/ch/ch_states.py:25 msgid "Ticino" @@ -1780,7 +1882,7 @@ msgstr "" #: contrib/localflavor/ch/ch_states.py:26 #, fuzzy msgid "Uri" -msgstr "Fr" +msgstr "" #: contrib/localflavor/ch/ch_states.py:27 msgid "Valais" @@ -1793,31 +1895,34 @@ msgstr "" #: contrib/localflavor/ch/ch_states.py:29 #, fuzzy msgid "Zug" -msgstr "Aug" +msgstr "" #: contrib/localflavor/ch/ch_states.py:30 #, fuzzy msgid "Zurich" -msgstr "Türkisch" +msgstr "Zürich" -#: contrib/localflavor/ch/forms.py:16 -#: contrib/localflavor/no/forms.py:12 +#: contrib/localflavor/ch/forms.py:16 contrib/localflavor/no/forms.py:12 msgid "Enter a zip code in the format XXXX." msgstr "Bitte eine gültige Postleitzahl im Format XXXX eingeben." #: contrib/localflavor/ch/forms.py:64 -msgid "Enter a valid Swiss identity or passport card number in X1234567<0 or 1234567890 format." +msgid "" +"Enter a valid Swiss identity or passport card number in X1234567<0 or " +"1234567890 format." msgstr "" +"Bitte eine gültige Schweizer Identifikations- oder Reisepassnummer im Format" +"X1234567<0 oder 1234567890 eingeben." #: contrib/localflavor/cl/forms.py:29 #, fuzzy msgid "Enter a valid Chilean RUT." -msgstr "Bitte einen gültigen Dateinamen eingeben." +msgstr "Bitte einen gültige chilenische RUT eingeben." #: contrib/localflavor/cl/forms.py:30 #, fuzzy msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X." -msgstr "Bitte eine gültige Postleitzahl im Format XXXXX-XXX eingeben." +msgstr "Bitte eine chilenische RUT im Format XX.XXX.XXX-X eingeben." #: contrib/localflavor/cl/forms.py:31 #, fuzzy @@ -1888,15 +1993,18 @@ msgstr "Schleswig-Holstein" msgid "Thuringia" msgstr "Thüringen" -#: contrib/localflavor/de/forms.py:14 -#: contrib/localflavor/fi/forms.py:12 +#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12 #: contrib/localflavor/fr/forms.py:15 msgid "Enter a zip code in the format XXXXX." msgstr "Bitte eine gültige Postleitzahl im Format XXXXX eingeben." #: contrib/localflavor/de/forms.py:41 -msgid "Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X format." -msgstr "Bitte eine gültige deutsche Personalausweisnummer im Format XXXXXXXXXXX-XXXXXXX-XXXXXXX-X eingeben." +msgid "" +"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X " +"format." +msgstr "" +"Bitte eine gültige deutsche Personalausweisnummer im Format XXXXXXXXXXX-" +"XXXXXXX-XXXXXXX-X eingeben." #: contrib/localflavor/es/es_provinces.py:5 msgid "Arava" @@ -1917,7 +2025,7 @@ msgstr "" #: contrib/localflavor/es/es_provinces.py:9 #, fuzzy msgid "Avila" -msgstr "April" +msgstr "" #: contrib/localflavor/es/es_provinces.py:10 msgid "Badajoz" @@ -1930,7 +2038,7 @@ msgstr "" #: contrib/localflavor/es/es_provinces.py:12 #, fuzzy msgid "Barcelona" -msgstr "Mazedonisch" +msgstr "" #: contrib/localflavor/es/es_provinces.py:13 msgid "Burgos" @@ -1971,7 +2079,7 @@ msgstr "" #: contrib/localflavor/es/es_provinces.py:22 #, fuzzy msgid "Granada" -msgstr "Kannada" +msgstr "" #: contrib/localflavor/es/es_provinces.py:23 msgid "Guadalajara" @@ -1988,17 +2096,17 @@ msgstr "" #: contrib/localflavor/es/es_provinces.py:26 #, fuzzy msgid "Huesca" -msgstr "Dienstag" +msgstr "" #: contrib/localflavor/es/es_provinces.py:27 #, fuzzy msgid "Jaen" -msgstr "Jan." +msgstr "" #: contrib/localflavor/es/es_provinces.py:28 #, fuzzy msgid "Leon" -msgstr "Anmelden" +msgstr "" #: contrib/localflavor/es/es_provinces.py:29 msgid "Lleida" @@ -2041,7 +2149,7 @@ msgstr "" #: contrib/localflavor/es/es_provinces.py:38 #, fuzzy msgid "Palencia" -msgstr "Galicisch" +msgstr "" #: contrib/localflavor/es/es_provinces.py:39 msgid "Las Palmas" @@ -2063,12 +2171,12 @@ msgstr "" #: contrib/localflavor/es/es_regions.py:11 #, fuzzy msgid "Cantabria" -msgstr "Katalanisch" +msgstr "" #: contrib/localflavor/es/es_provinces.py:44 #, fuzzy msgid "Segovia" -msgstr "Slowenisch" +msgstr "" #: contrib/localflavor/es/es_provinces.py:45 msgid "Seville" @@ -2077,7 +2185,7 @@ msgstr "" #: contrib/localflavor/es/es_provinces.py:46 #, fuzzy msgid "Soria" -msgstr "Serbisch" +msgstr "" #: contrib/localflavor/es/es_provinces.py:47 msgid "Tarragona" @@ -2086,7 +2194,7 @@ msgstr "" #: contrib/localflavor/es/es_provinces.py:48 #, fuzzy msgid "Teruel" -msgstr "Di" +msgstr "" #: contrib/localflavor/es/es_provinces.py:49 msgid "Toledo" @@ -2095,7 +2203,7 @@ msgstr "" #: contrib/localflavor/es/es_provinces.py:50 #, fuzzy msgid "Valencia" -msgstr "Galicisch" +msgstr "" #: contrib/localflavor/es/es_provinces.py:51 msgid "Valladolid" @@ -2144,7 +2252,7 @@ msgstr "" #: contrib/localflavor/es/es_regions.py:10 #, fuzzy msgid "Canary Islands" -msgstr "Saarland" +msgstr "" #: contrib/localflavor/es/es_regions.py:12 msgid "Castile-La Mancha" @@ -2157,7 +2265,7 @@ msgstr "" #: contrib/localflavor/es/es_regions.py:14 #, fuzzy msgid "Catalonia" -msgstr "Katalanisch" +msgstr "" #: contrib/localflavor/es/es_regions.py:15 msgid "Extremadura" @@ -2166,7 +2274,7 @@ msgstr "" #: contrib/localflavor/es/es_regions.py:16 #, fuzzy msgid "Galicia" -msgstr "Galicisch" +msgstr "Galicien" #: contrib/localflavor/es/es_regions.py:19 msgid "Region of Murcia" @@ -2183,43 +2291,50 @@ msgstr "" #: contrib/localflavor/es/forms.py:19 #, fuzzy msgid "Enter a valid postal code in the range and format 01XXX - 52XXX." -msgstr "Bitte eine gültige Postleitzahl im Format XXXXXXX oder XXX-XXXX eingeben." +msgstr "" +"Bitte eine gültige Postleitzahl im Format 01XXX bis 52XXX eingeben." #: contrib/localflavor/es/forms.py:39 #, fuzzy -msgid "Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or 9XXXXXXXX." -msgstr "Bitte eine gültige Postleitzahl im Format XXXXXXX oder XXX-XXXX eingeben." +msgid "" +"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or " +"9XXXXXXXX." +msgstr "" +"Bitte eine gültige Telefonnummer in einem der folgenden Formate eingeben " +"6XXXXXXXX, 8XXXXXXXX oder 9XXXXXXXX." #: contrib/localflavor/es/forms.py:66 #, fuzzy msgid "Please enter a valid NIF, NIE, or CIF." -msgstr "Bitte eine gültige IP-Adresse eingeben." +msgstr "Bitte eine gültige NIF, NIE oder CIF eingeben." #: contrib/localflavor/es/forms.py:67 #, fuzzy msgid "Please enter a valid NIF or NIE." -msgstr "Bitte ein gültiges '%s' eingeben." +msgstr "Bitte eine gültige NIF oder NIE eingeben." #: contrib/localflavor/es/forms.py:68 msgid "Invalid checksum for NIF." -msgstr "" +msgstr "Ungültige Prüfsumme für NIF." #: contrib/localflavor/es/forms.py:69 msgid "Invalid checksum for NIE." -msgstr "" +msgstr "Ungültige Prüfsumme für NIE." #: contrib/localflavor/es/forms.py:70 msgid "Invalid checksum for CIF." -msgstr "" +msgstr "Ungültige Prüfsumme für CIF." #: contrib/localflavor/es/forms.py:142 #, fuzzy -msgid "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX." -msgstr "Bitte eine gültige deutsche Personalausweisnummer im Format XXXXXXXXXXX-XXXXXXX-XXXXXXX-X eingeben." +msgid "" +"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX." +msgstr "" +"Bitte eine gültige Kontonummer im Format XXXX-XXXX-XX-XXXXXXXXXX eingeben." #: contrib/localflavor/es/forms.py:143 msgid "Invalid checksum for bank account number." -msgstr "" +msgstr "Ungültige Prüfsumme für Kontonummer." #: contrib/localflavor/fi/forms.py:28 msgid "Enter a valid Finnish social security number." @@ -2228,35 +2343,39 @@ msgstr "Bitte eine gültige finnische Sozialversicherungsnummer eingeben." #: contrib/localflavor/in_/forms.py:14 #, fuzzy msgid "Enter a zip code in the format XXXXXXX." -msgstr "Bitte eine gültige Postleitzahl im Format XXXXX-XXX eingeben." +msgstr "Bitte eine gültige Postleitzahl im Format XXXXXXX eingeben." #: contrib/localflavor/is_/forms.py:17 #, fuzzy -msgid "Enter a valid Icelandic identification number. The format is XXXXXX-XXXX." -msgstr "Bitte eine gültige Postleitzahl im Format XXXXX-XXX eingeben." +msgid "" +"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX." +msgstr "" +"Bitte eine gültige isländische Identifikationsnummer im Format XXXXXX-XXXX " +"eingeben." #: contrib/localflavor/is_/forms.py:18 msgid "The Icelandic identification number is not valid." -msgstr "" +msgstr "Die isländische Identifikationsnummer ist nicht gültig." #: contrib/localflavor/it/forms.py:14 #, fuzzy msgid "Enter a valid zip code." -msgstr "Bitte ein gültiges Datum eingeben." +msgstr "Bitte eine Postleitzahl eingeben." #: contrib/localflavor/it/forms.py:43 #, fuzzy msgid "Enter a valid Social Security number." -msgstr "Bitte eine gültige finnische Sozialversicherungsnummer eingeben." +msgstr "Bitte eine gültige Sozialversicherungsnummer eingeben." #: contrib/localflavor/it/forms.py:68 #, fuzzy msgid "Enter a valid VAT number." -msgstr "Bitte eine gültige Uhrzeit eingeben." +msgstr "Bitte eine gültige Umsatzsteuernummer eingeben." #: contrib/localflavor/jp/forms.py:17 msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX." -msgstr "Bitte eine gültige Postleitzahl im Format XXXXXXX oder XXX-XXXX eingeben." +msgstr "" +"Bitte eine gültige Postleitzahl im Format XXXXXXX oder XXX-XXXX eingeben." #: contrib/localflavor/jp/jp_prefectures.py:4 msgid "Hokkaido" @@ -2408,7 +2527,7 @@ msgstr "" #: contrib/localflavor/jp/jp_prefectures.py:41 msgid "Ehime" -msgstr "Zeit" +msgstr "" #: contrib/localflavor/jp/jp_prefectures.py:42 msgid "Kochi" @@ -2461,7 +2580,7 @@ msgstr "" #: contrib/localflavor/mx/mx_states.py:15 #, fuzzy msgid "Campeche" -msgstr "Tschechisch" +msgstr "" #: contrib/localflavor/mx/mx_states.py:16 msgid "Chihuahua" @@ -2490,7 +2609,7 @@ msgstr "" #: contrib/localflavor/mx/mx_states.py:22 #, fuzzy msgid "Guerrero" -msgstr "Serverfehler" +msgstr "" #: contrib/localflavor/mx/mx_states.py:23 msgid "Guanajuato" @@ -2543,7 +2662,7 @@ msgstr "" #: contrib/localflavor/mx/mx_states.py:35 #, fuzzy msgid "Sinaloa" -msgstr "Slowakisch" +msgstr "" #: contrib/localflavor/mx/mx_states.py:36 msgid "San Luis Potosí" @@ -2580,22 +2699,22 @@ msgstr "" #: contrib/localflavor/nl/forms.py:21 #, fuzzy msgid "Enter a valid postal code" -msgstr "Bitte einen gültigen Wert eingeben." +msgstr "Bitte eine gültige Postleitzahl eingeben." #: contrib/localflavor/nl/forms.py:52 #, fuzzy msgid "Enter a valid phone number" -msgstr "Bitte eine ganze Zahl eingeben." +msgstr "Bitte eine gültige Telefonnummer eingeben." #: contrib/localflavor/nl/forms.py:78 #, fuzzy msgid "Enter a valid SoFi number" -msgstr "Bitte eine gültige Uhrzeit eingeben." +msgstr "Bitte eine gültige SoFi-Nummer eingeben." #: contrib/localflavor/nl/nl_provinces.py:4 #, fuzzy msgid "Drente" -msgstr "Löschen" +msgstr "" #: contrib/localflavor/nl/nl_provinces.py:5 msgid "Flevoland" @@ -2608,17 +2727,17 @@ msgstr "" #: contrib/localflavor/nl/nl_provinces.py:7 #, fuzzy msgid "Gelderland" -msgstr "Deutsch" +msgstr "" #: contrib/localflavor/nl/nl_provinces.py:8 #, fuzzy msgid "Groningen" -msgstr "neun" +msgstr "" #: contrib/localflavor/nl/nl_provinces.py:9 #, fuzzy msgid "Limburg" -msgstr "Hamburg" +msgstr "" #: contrib/localflavor/nl/nl_provinces.py:10 msgid "Noord-Brabant" @@ -2635,12 +2754,12 @@ msgstr "" #: contrib/localflavor/nl/nl_provinces.py:13 #, fuzzy msgid "Utrecht" -msgstr "Französisch" +msgstr "" #: contrib/localflavor/nl/nl_provinces.py:14 #, fuzzy msgid "Zeeland" -msgstr "Isländisch" +msgstr "" #: contrib/localflavor/nl/nl_provinces.py:15 msgid "Zuid-Holland" @@ -2653,47 +2772,52 @@ msgstr "Bitte eine gültige norwegische Sozialversicherungsnummer eingeben." #: contrib/localflavor/pe/forms.py:24 #, fuzzy msgid "This field requires 8 digits." -msgstr "Dieses Feld ist zwingend erforderlich." +msgstr "Dieses Feld benötigt 8 Zeichen." #: contrib/localflavor/pe/forms.py:52 #, fuzzy msgid "This field requires 11 digits." -msgstr "Dieses Feld ist zwingend erforderlich." +msgstr "Dieses Feld benötigt 11 Zeichen." #: contrib/localflavor/pl/forms.py:39 msgid "National Identification Number consists of 11 digits." -msgstr "" +msgstr "Nationale Identifikationsnummer besteht aus 11 Ziffern." #: contrib/localflavor/pl/forms.py:40 msgid "Wrong checksum for the National Identification Number." -msgstr "" +msgstr "Falsche Prüfsumme für die nationale Identifikationsnummer." #: contrib/localflavor/pl/forms.py:72 #, fuzzy -msgid "Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX." -msgstr "Bitte eine gültige Postleitzahl im Format XXXXXXX oder XXX-XXXX eingeben." +msgid "" +"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX." +msgstr "" +"Bitte eine Steuernummer (NIP) im Format XXX-XXX-XX-XX oder XX-XX-XXX-XXX " +"eingeben." #: contrib/localflavor/pl/forms.py:73 msgid "Wrong checksum for the Tax Number (NIP)." -msgstr "" +msgstr "Falsche Prüfsumme für die Steuernummer (NIP)." #: contrib/localflavor/pl/forms.py:112 msgid "National Business Register Number (REGON) consists of 7 or 9 digits." -msgstr "" +msgstr "Nationale Geschäftsregistrierungsnummer (REGON) besteht aus 7 oder " +"9 Zeichen." #: contrib/localflavor/pl/forms.py:113 msgid "Wrong checksum for the National Business Register Number (REGON)." -msgstr "" +msgstr "Falsche Prüfsumme für die nationale Geschäftsregistrierungsnummer " +"(REGON)." #: contrib/localflavor/pl/forms.py:156 #, fuzzy msgid "Enter a postal code in the format XX-XXX." -msgstr "Bitte eine gültige Postleitzahl im Format XXXXX eingeben." +msgstr "Bitte eine gültige Postleitzahl im Format XX-XXX eingeben." #: contrib/localflavor/pl/pl_voivodeships.py:8 #, fuzzy msgid "Lower Silesia" -msgstr "Niedersachsen" +msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:9 msgid "Kuyavia-Pomerania" @@ -2722,7 +2846,7 @@ msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:15 #, fuzzy msgid "Opole" -msgstr "Optional" +msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:16 msgid "Subcarpatia" @@ -2735,12 +2859,12 @@ msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:18 #, fuzzy msgid "Pomerania" -msgstr "Rumänisch" +msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:19 #, fuzzy msgid "Silesia" -msgstr "Slowenisch" +msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:20 msgid "Swietokrzyskie" @@ -2757,12 +2881,13 @@ msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:23 #, fuzzy msgid "West Pomerania" -msgstr "Mecklenburg-Vorpommern" +msgstr "" #: contrib/localflavor/sk/forms.py:30 #, fuzzy msgid "Enter a postal code in the format XXXXX or XXX XX." -msgstr "Bitte eine gültige Postleitzahl im Format XXXXXXX oder XXX-XXXX eingeben." +msgstr "" +"Bitte eine gültige Postleitzahl im Format XXXXX oder XXX XX eingeben." #: contrib/localflavor/sk/sk_districts.py:8 msgid "Banska Bystrica" @@ -2783,7 +2908,7 @@ msgstr "" #: contrib/localflavor/sk/sk_districts.py:12 #, fuzzy msgid "Brezno" -msgstr "Bremen" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:13 msgid "Bratislava I" @@ -2828,12 +2953,12 @@ msgstr "" #: contrib/localflavor/sk/sk_districts.py:23 #, fuzzy msgid "Galanta" -msgstr "Galicisch" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:24 #, fuzzy msgid "Gelnica" -msgstr "Galicisch" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:25 msgid "Hlohovec" @@ -2854,7 +2979,7 @@ msgstr "" #: contrib/localflavor/sk/sk_districts.py:29 #, fuzzy msgid "Komarno" -msgstr "Koreanisch" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:30 msgid "Kosice I" @@ -2903,12 +3028,12 @@ msgstr "" #: contrib/localflavor/sk/sk_districts.py:41 #, fuzzy msgid "Malacky" -msgstr "Mai" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:42 #, fuzzy msgid "Martin" -msgstr "Lettisch" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:43 msgid "Medzilaborce" @@ -2949,7 +3074,7 @@ msgstr "" #: contrib/localflavor/sk/sk_districts.py:52 #, fuzzy msgid "Piestany" -msgstr "Persisch" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:53 msgid "Poltar" @@ -2994,7 +3119,7 @@ msgstr "" #: contrib/localflavor/sk/sk_districts.py:63 #, fuzzy msgid "Sabinov" -msgstr "Nov" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:64 msgid "Senec" @@ -3003,17 +3128,17 @@ msgstr "" #: contrib/localflavor/sk/sk_districts.py:65 #, fuzzy msgid "Senica" -msgstr "Slowenisch" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:66 #, fuzzy msgid "Skalica" -msgstr "Galicisch" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:67 #, fuzzy msgid "Snina" -msgstr "neun" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:68 msgid "Sobrance" @@ -3038,7 +3163,7 @@ msgstr "" #: contrib/localflavor/sk/sk_districts.py:73 #, fuzzy msgid "Sala" -msgstr "Saarland" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:74 msgid "Topolcany" @@ -3051,7 +3176,7 @@ msgstr "" #: contrib/localflavor/sk/sk_districts.py:76 #, fuzzy msgid "Trencin" -msgstr "Französisch" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:77 msgid "Trnava" @@ -3128,7 +3253,7 @@ msgstr "" #: contrib/localflavor/uk/forms.py:21 #, fuzzy msgid "Enter a valid postcode." -msgstr "Bitte ein gültiges Datum eingeben." +msgstr "Bitte eine gültige Postleitzahl eingeben." #: contrib/localflavor/uk/uk_regions.py:11 msgid "Bedfordshire" @@ -3157,7 +3282,7 @@ msgstr "" #: contrib/localflavor/uk/uk_regions.py:18 #, fuzzy msgid "Devon" -msgstr "sieben" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:19 msgid "Dorset" @@ -3198,7 +3323,7 @@ msgstr "" #: contrib/localflavor/uk/uk_regions.py:28 #, fuzzy msgid "Kent" -msgstr "Koreanisch" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:29 msgid "Lancashire" @@ -3352,7 +3477,7 @@ msgstr "" #: contrib/localflavor/uk/uk_regions.py:75 #, fuzzy msgid "Borders" -msgstr "Reihenfolge:" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:76 msgid "Central Scotland" @@ -3365,12 +3490,12 @@ msgstr "" #: contrib/localflavor/uk/uk_regions.py:78 #, fuzzy msgid "Fife" -msgstr "Filter" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:79 #, fuzzy msgid "Grampian" -msgstr "Deutsch" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:80 msgid "Highland" @@ -3379,7 +3504,7 @@ msgstr "" #: contrib/localflavor/uk/uk_regions.py:81 #, fuzzy msgid "Lothian" -msgstr "Lettisch" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:82 msgid "Orkney Islands" @@ -3404,54 +3529,57 @@ msgstr "" #: contrib/localflavor/uk/uk_regions.py:90 #, fuzzy msgid "England" -msgstr "und" +msgstr "England" #: contrib/localflavor/uk/uk_regions.py:91 msgid "Northern Ireland" -msgstr "" +msgstr "Nordirland" #: contrib/localflavor/uk/uk_regions.py:92 #, fuzzy msgid "Scotland" -msgstr "Saarland" +msgstr "Schottland" #: contrib/localflavor/uk/uk_regions.py:93 #, fuzzy msgid "Wales" -msgstr "Walisisch" +msgstr "Wales" #: contrib/localflavor/us/forms.py:16 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." -msgstr "Bitte eine gültige Postleitzahl im Format XXXXX oder XXXXX-XXXX eingeben." +msgstr "" +"Bitte eine gültige Postleitzahl im Format XXXXX oder XXXXX-XXXX eingeben." #: contrib/localflavor/us/forms.py:54 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." -msgstr "Bitte eine gültige US-amerikanische Sozialversicherungsnummer im Format XXX-XX-XXXX eingeben." +msgstr "" +"Bitte eine gültige US-amerikanische Sozialversicherungsnummer im Format XXX-" +"XX-XXXX eingeben." #: contrib/localflavor/za/forms.py:20 #, fuzzy msgid "Enter a valid South African ID number" -msgstr "Bitte eine gültige norwegische Sozialversicherungsnummer eingeben." +msgstr "Bitte eine gültige südafrikanische Sozialversicherungsnummer eingeben." #: contrib/localflavor/za/forms.py:54 #, fuzzy msgid "Enter a valid South African postal code" -msgstr "Bitte eine gültige vierstellige Postleitzahl eingeben." +msgstr "Bitte eine gültige südafrikanische Postleitzahl eingeben." #: contrib/localflavor/za/za_provinces.py:4 #, fuzzy msgid "Eastern Cape" -msgstr "Benutzername" +msgstr "" #: contrib/localflavor/za/za_provinces.py:5 #, fuzzy msgid "Free State" -msgstr "Bewertungsdatum" +msgstr "" #: contrib/localflavor/za/za_provinces.py:6 #, fuzzy msgid "Gauteng" -msgstr "Aug" +msgstr "" #: contrib/localflavor/za/za_provinces.py:7 msgid "KwaZulu-Natal" @@ -3472,28 +3600,36 @@ msgstr "" #: contrib/localflavor/za/za_provinces.py:11 #, fuzzy msgid "North West" -msgstr "Nordrhein-Westfalen" +msgstr "" #: contrib/localflavor/za/za_provinces.py:12 #, fuzzy msgid "Western Cape" -msgstr "Benutzername" +msgstr "" #: contrib/redirects/models.py:7 msgid "redirect from" msgstr "Umleitung von" #: contrib/redirects/models.py:8 -msgid "This should be an absolute path, excluding the domain name. Example: '/events/search/'." -msgstr "Hier sollte ein absoluter Pfad stehen, ohne den Domainnamen. Beispiel: '/events/search/'." +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Hier sollte ein absoluter Pfad stehen, ohne den Domainnamen. Beispiel: '/" +"events/search/'." #: contrib/redirects/models.py:9 msgid "redirect to" msgstr "Umleitung zu" #: contrib/redirects/models.py:10 -msgid "This can be either an absolute path (as above) or a full URL starting with 'http://'." -msgstr "Hier muss entweder ein absoluter Pfad oder eine komplette URL mit http:// am Anfang stehen." +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Hier muss entweder ein absoluter Pfad oder eine komplette URL mit http:// am " +"Anfang stehen." #: contrib/redirects/models.py:13 msgid "redirect" @@ -3544,12 +3680,18 @@ msgid "This value must contain only letters, numbers and underscores." msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten." #: core/validators.py:76 -msgid "This value must contain only letters, numbers, underscores, dashes or slashes." -msgstr "Dieser Wert darf nur Buchstaben, Ziffern, Unterstriche und Schrägstriche enthalten." +msgid "" +"This value must contain only letters, numbers, underscores, dashes or " +"slashes." +msgstr "" +"Dieser Wert darf nur Buchstaben, Ziffern, Unterstriche und Schrägstriche " +"enthalten." #: core/validators.py:80 msgid "This value must contain only letters, numbers, underscores or hyphens." -msgstr "Dieser Wert darf nur Buchstaben, Ziffern, Unterstriche und Bindestriche enthalten." +msgstr "" +"Dieser Wert darf nur Buchstaben, Ziffern, Unterstriche und Bindestriche " +"enthalten." #: core/validators.py:84 msgid "Uppercase letters are not allowed here." @@ -3583,8 +3725,7 @@ msgstr "Nichtnumerische Zeichen sind hier nicht erlaubt." msgid "This value can't be comprised solely of digits." msgstr "Dieser Wert darf nicht nur aus Ziffern bestehen." -#: core/validators.py:128 -#: newforms/fields.py:151 +#: core/validators.py:128 newforms/fields.py:151 msgid "Enter a whole number." msgstr "Bitte eine ganze Zahl eingeben." @@ -3601,8 +3742,7 @@ msgstr "Das Jahr muss 1900 oder später sein." msgid "Invalid date: %s" msgstr "Ungültiges Datum: %s" -#: core/validators.py:156 -#: db/models/fields/__init__.py:522 +#: core/validators.py:156 db/models/fields/__init__.py:527 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Bitte ein gültiges Datum im Format JJJJ-MM-TT eingeben." @@ -3610,27 +3750,29 @@ msgstr "Bitte ein gültiges Datum im Format JJJJ-MM-TT eingeben." msgid "Enter a valid time in HH:MM format." msgstr "Bitte eine gültige Zeit im Format SS:MM eingeben." -#: core/validators.py:165 -#: db/models/fields/__init__.py:599 +#: core/validators.py:165 db/models/fields/__init__.py:604 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." -msgstr "Bitte eine gültige Datums- und Zeitangabe im Format JJJJ-MM-TT SS:MM eingeben." +msgstr "" +"Bitte eine gültige Datums- und Zeitangabe im Format JJJJ-MM-TT SS:MM " +"eingeben." -#: core/validators.py:170 -#: newforms/fields.py:402 +#: core/validators.py:170 newforms/fields.py:402 msgid "Enter a valid e-mail address." msgstr "Bitte eine gültige E-Mail-Adresse eingeben." -#: core/validators.py:182 -#: core/validators.py:474 -#: newforms/fields.py:432 +#: core/validators.py:182 core/validators.py:474 newforms/fields.py:432 #: oldforms/__init__.py:687 msgid "No file was submitted. Check the encoding type on the form." -msgstr "Es wurde keine Datei übermittelt. Eventuell ist das Formular-Encoding falsch." +msgstr "" +"Es wurde keine Datei übermittelt. Eventuell ist das Formular-Encoding falsch." -#: core/validators.py:193 -#: newforms/fields.py:458 -msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image." -msgstr "Bitte ein Bild hochladen. Die hochgeladene Datei ist kein Bild, oder ist defekt." +#: core/validators.py:193 newforms/fields.py:458 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"Bitte ein Bild hochladen. Die hochgeladene Datei ist kein Bild, oder ist " +"defekt." #: core/validators.py:200 #, python-format @@ -3640,7 +3782,8 @@ msgstr "Die URL %s zeigt nicht auf ein gültiges Bild." #: core/validators.py:204 #, python-format msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." -msgstr "Telefonnummern müssen das Format XXX-XXX-XXXX haben. \"%s\" ist ungültig." +msgstr "" +"Telefonnummern müssen das Format XXX-XXX-XXXX haben. \"%s\" ist ungültig." #: core/validators.py:212 #, python-format @@ -3670,8 +3813,7 @@ msgstr "Ungültiges XML: %s" msgid "Invalid URL: %s" msgstr "Ungültige URL: %s" -#: core/validators.py:259 -#: core/validators.py:261 +#: core/validators.py:259 core/validators.py:261 #, python-format msgid "The URL %s is a broken link." msgstr "Die URL %s funktioniert nicht." @@ -3696,20 +3838,21 @@ msgstr "Dieses Feld muss zum Feld '%s' passen." msgid "Please enter something for at least one field." msgstr "Bitte mindestens eines der Felder ausfüllen." -#: core/validators.py:316 -#: core/validators.py:327 +#: core/validators.py:316 core/validators.py:327 msgid "Please enter both fields or leave them both empty." msgstr "Bitte entweder beide Felder ausfüllen, oder beide leer lassen." #: core/validators.py:335 #, python-format msgid "This field must be given if %(field)s is %(value)s" -msgstr "Dieses Feld muss gefüllt sein, wenn Feld %(field)s den Wert %(value)s hat." +msgstr "" +"Dieses Feld muss gefüllt sein, wenn Feld %(field)s den Wert %(value)s hat." #: core/validators.py:348 #, python-format msgid "This field must be given if %(field)s is not %(value)s" -msgstr "Dieses Feld muss gefüllt sein, wenn Feld %(field)s nicht %(value)s ist." +msgstr "" +"Dieses Feld muss gefüllt sein, wenn Feld %(field)s nicht %(value)s ist." #: core/validators.py:367 msgid "Duplicate values are not allowed." @@ -3742,23 +3885,33 @@ msgstr "Bitte eine gültige Dezimalzahl eingeben." #: core/validators.py:444 #, 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] "Bitte eine gültige Dezimalzahl mit maximal %s Ziffer eingeben." msgstr[1] "Bitte eine gültige Dezimalzahl mit maximal %s Ziffern eingeben." #: core/validators.py:447 #, python-format -msgid "Please enter a valid decimal number with a whole part of at most %s digit." -msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits." -msgstr[0] "Bitte eine gültige Dezimalzahl mit einer Gesamtzahl von maximal %s Ziffer eingeben." -msgstr[1] "Bitte eine gültige Dezimalzahl mit einer Gesamtzahl von maximal %s Ziffern eingeben." +msgid "" +"Please enter a valid decimal number with a whole part of at most %s digit." +msgid_plural "" +"Please enter a valid decimal number with a whole part of at most %s digits." +msgstr[0] "" +"Bitte eine gültige Dezimalzahl mit einer Gesamtzahl von maximal %s Ziffer " +"eingeben." +msgstr[1] "" +"Bitte eine gültige Dezimalzahl mit einer Gesamtzahl von maximal %s Ziffern " +"eingeben." #: core/validators.py:450 #, 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." -msgstr[0] "Bitte eine gültige Dezimalzahl mit maximal %s Dezimalstelle eingeben." -msgstr[1] "Bitte eine gültige Dezimalzahl mit maximal %s Dezimalstellen eingeben." +msgid_plural "" +"Please enter a valid decimal number with at most %s decimal places." +msgstr[0] "" +"Bitte eine gültige Dezimalzahl mit maximal %s Dezimalstelle eingeben." +msgstr[1] "" +"Bitte eine gültige Dezimalzahl mit maximal %s Dezimalstellen eingeben." #: core/validators.py:458 msgid "Please enter a valid floating point number." @@ -3767,12 +3920,15 @@ msgstr "Bitte eine gültige Dezimalzahl eingeben." #: core/validators.py:467 #, python-format msgid "Make sure your uploaded file is at least %s bytes big." -msgstr "Bitte sicherstellen, dass die hochgeladene Datei mindestens %s Bytes groß ist." +msgstr "" +"Bitte sicherstellen, dass die hochgeladene Datei mindestens %s Bytes groß " +"ist." #: core/validators.py:468 #, python-format msgid "Make sure your uploaded file is at most %s bytes big." -msgstr "Bitte sicherstellen, dass die hochgeladene Datei maximal %s Bytes groß ist." +msgstr "" +"Bitte sicherstellen, dass die hochgeladene Datei maximal %s Bytes groß ist." #: core/validators.py:485 msgid "The format for this field is wrong." @@ -3789,79 +3945,103 @@ msgstr "Konnte nichts von %s empfangen." #: core/validators.py:539 #, 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 "Die URL %(url)s lieferte den falschen Content-Type '%(contenttype)s'." #: core/validators.py:572 #, python-format -msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)" -msgstr "Bitte das ungeschlossene %(tag)s Tag in Zeile %(line)s schließen. Die Zeile beginnt mit \"%(start)s\"." +msgid "" +"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " +"\"%(start)s\".)" +msgstr "" +"Bitte das ungeschlossene %(tag)s Tag in Zeile %(line)s schließen. Die Zeile " +"beginnt mit \"%(start)s\"." #: core/validators.py:576 #, python-format -msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)" -msgstr "In Zeile %(line)s ist Text, der nicht in dem Kontext erlaubt ist. Die Zeile beginnt mit \"%(start)s\"." +msgid "" +"Some text starting on line %(line)s is not allowed in that context. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"In Zeile %(line)s ist Text, der nicht in dem Kontext erlaubt ist. Die Zeile " +"beginnt mit \"%(start)s\"." #: core/validators.py:581 #, python-format -msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)" -msgstr "Das Attribute %(attr)s in Zeile %(line)s ist ungültig. Die Zeile beginnt mit \"%(start)s\"." +msgid "" +"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"Das Attribute %(attr)s in Zeile %(line)s ist ungültig. Die Zeile beginnt mit " +"\"%(start)s\"." #: core/validators.py:586 #, python-format -msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)" -msgstr "<%(tag)s> in Zeile %(line)s ist ungültig. Die Zeile beginnt mit \"%(start)s\"." +msgid "" +"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"<%(tag)s> in Zeile %(line)s ist ungültig. Die Zeile beginnt mit \"%(start)s" +"\"." #: core/validators.py:590 #, python-format -msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)" -msgstr "Ein Tag in Zeile %(line)s hat eines oder mehrere Pflichtattribute nicht. Die Zeile beginnt mit \"%(start)s\"." +msgid "" +"A tag on line %(line)s is missing one or more required attributes. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Ein Tag in Zeile %(line)s hat eines oder mehrere Pflichtattribute nicht. Die " +"Zeile beginnt mit \"%(start)s\"." #: core/validators.py:595 #, python-format -msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)" -msgstr "Das Attribut %(attr)s in Zeile %(line)s hat einen ungültigen Wert. Die Zeile beginnt mit \"%(start)s\"." +msgid "" +"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Das Attribut %(attr)s in Zeile %(line)s hat einen ungültigen Wert. Die Zeile " +"beginnt mit \"%(start)s\"." #: db/models/manipulators.py:308 #, python-format msgid "%(object)s with this %(type)s already exists for the given %(field)s." -msgstr "Ein '%(object)s' in dieser '%(type)s' existiert bereits für dieses '%(field)s'." +msgstr "" +"Ein '%(object)s' in dieser '%(type)s' existiert bereits für dieses '%(field)" +"s'." #: db/models/fields/__init__.py:52 #, python-format msgid "%(optname)s with this %(fieldname)s already exists." msgstr "Ein '%(optname)s' mit diesem '%(fieldname)s' existiert bereits." -#: db/models/fields/__init__.py:161 -#: db/models/fields/__init__.py:322 -#: db/models/fields/__init__.py:754 -#: db/models/fields/__init__.py:765 -#: newforms/fields.py:45 -#: oldforms/__init__.py:374 +#: db/models/fields/__init__.py:161 db/models/fields/__init__.py:327 +#: db/models/fields/__init__.py:759 db/models/fields/__init__.py:770 +#: newforms/fields.py:45 oldforms/__init__.py:374 msgid "This field is required." msgstr "Dieses Feld ist zwingend erforderlich." -#: db/models/fields/__init__.py:422 +#: db/models/fields/__init__.py:427 msgid "This value must be an integer." msgstr "Dieser Wert muss eine Ganzzahl sein." -#: db/models/fields/__init__.py:461 +#: db/models/fields/__init__.py:466 msgid "This value must be either True or False." msgstr "Dieser Wert muss wahr oder falsch sein." -#: db/models/fields/__init__.py:485 +#: db/models/fields/__init__.py:490 msgid "This field cannot be null." msgstr "Dieses Feld darf nicht leer sein." -#: db/models/fields/__init__.py:663 +#: db/models/fields/__init__.py:668 msgid "This value must be a decimal number." msgstr "Dieser Wert muss eine Ganzzahl sein." -#: db/models/fields/__init__.py:774 +#: db/models/fields/__init__.py:779 msgid "Enter a valid filename." msgstr "Bitte einen gültigen Dateinamen eingeben." -#: db/models/fields/__init__.py:945 +#: db/models/fields/__init__.py:950 msgid "This value must be either None, True or False." msgstr "Dieser Wert muss None, True oder False sein." @@ -3875,15 +4055,21 @@ msgid "Separate multiple IDs with commas." msgstr "Mehrere IDs können mit Komma getrennt werden." #: db/models/fields/related.py:696 -msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "Um mehr als eine Selektion zu treffen, \"Strg\", oder auf dem Mac \"Command\", beim Klicken gedrückt halten." +msgid "" +"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" +"Um mehr als eine Selektion zu treffen, \"Strg\", oder auf dem Mac \"Command" +"\", beim Klicken gedrückt halten." #: db/models/fields/related.py:743 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." -msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid." -msgstr[0] "Bitte gültige IDs für %(self)s eingeben. Der Wert %(value)r ist ungültig." -msgstr[1] "Bitte gültige IDs für %(self)s eingeben. Die Werte %(value)r sind ungültig." +msgid_plural "" +"Please enter valid %(self)s IDs. The values %(value)r are invalid." +msgstr[0] "" +"Bitte gültige IDs für %(self)s eingeben. Der Wert %(value)r ist ungültig." +msgstr[1] "" +"Bitte gültige IDs für %(self)s eingeben. Die Werte %(value)r sind ungültig." #: newforms/fields.py:46 msgid "Enter a valid value." @@ -3892,29 +4078,28 @@ msgstr "Bitte einen gültigen Wert eingeben." #: newforms/fields.py:123 #, python-format msgid "Ensure this value has at most %(max)d characters (it has %(length)d)." -msgstr "Bitte sicherstellen, dass der Text maximal %(max)d Zeichen hat. (Er hat %(length)d)." +msgstr "" +"Bitte sicherstellen, dass der Text maximal %(max)d Zeichen hat. (Er hat %" +"(length)d)." #: newforms/fields.py:124 #, python-format msgid "Ensure this value has at least %(min)d characters (it has %(length)d)." -msgstr "Bitte sicherstellen, dass der Text wenigstens %(min)d Zeichen hat. (Er hat %(length)d.)" +msgstr "" +"Bitte sicherstellen, dass der Text wenigstens %(min)d Zeichen hat. (Er hat %" +"(length)d.)" -#: newforms/fields.py:152 -#: newforms/fields.py:181 -#: newforms/fields.py:210 +#: newforms/fields.py:152 newforms/fields.py:181 newforms/fields.py:210 #, python-format msgid "Ensure this value is less than or equal to %s." msgstr "Dieser Wert darf maximal %s sein." -#: newforms/fields.py:153 -#: newforms/fields.py:182 -#: newforms/fields.py:211 +#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211 #, python-format msgid "Ensure this value is greater than or equal to %s." msgstr "Dieser Wert muss größer oder gleich %s sein." -#: newforms/fields.py:180 -#: newforms/fields.py:209 +#: newforms/fields.py:180 newforms/fields.py:209 msgid "Enter a number." msgstr "Bitte eine Zahl eingeben." @@ -3933,13 +4118,11 @@ msgstr "Bitte geben Sie nicht mehr als %s Dezimalstellen ein." msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "Bitte geben Sie nicht mehr als %s Ziffern vor dem Komma ein." -#: newforms/fields.py:262 -#: newforms/fields.py:723 +#: newforms/fields.py:262 newforms/fields.py:723 msgid "Enter a valid date." msgstr "Bitte ein gültiges Datum eingeben." -#: newforms/fields.py:295 -#: newforms/fields.py:724 +#: newforms/fields.py:295 newforms/fields.py:724 msgid "Enter a valid time." msgstr "Bitte eine gültige Uhrzeit eingeben." @@ -3951,8 +4134,7 @@ msgstr "Bitte gültiges Datum und Uhrzeit eingeben." msgid "No file was submitted." msgstr "Es wurde keine Datei übertragen." -#: newforms/fields.py:434 -#: oldforms/__init__.py:689 +#: newforms/fields.py:434 oldforms/__init__.py:689 msgid "The submitted file is empty." msgstr "Die ausgewählte Datei ist leer." @@ -3964,19 +4146,17 @@ msgstr "Bitte eine gültige Adresse eingeben." msgid "This URL appears to be a broken link." msgstr "Diese Adresse scheint nicht gültig zu sein." -#: newforms/fields.py:559 -#: newforms/models.py:300 +#: newforms/fields.py:559 newforms/models.py:300 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "Bitte eine gültige Auswahl treffen." #: newforms/fields.py:598 #, python-format msgid "Select a valid choice. %(value)s is not one of the available choices." -msgstr "Bitte eine gültige Auswahl treffen. %(value)s ist keine gültige Auswahl." +msgstr "" +"Bitte eine gültige Auswahl treffen. %(value)s ist keine gültige Auswahl." -#: newforms/fields.py:599 -#: newforms/fields.py:661 -#: newforms/models.py:360 +#: newforms/fields.py:599 newforms/fields.py:661 newforms/models.py:360 msgid "Enter a list of values." msgstr "Eine Liste mit Werten eingeben." @@ -4000,12 +4180,11 @@ msgstr[1] "Bitte sicherstellen, dass der Text weniger als %s Zeichen hat." msgid "Line breaks are not allowed here." msgstr "Zeilenumbrüche sind hier nicht erlaubt." -#: oldforms/__init__.py:512 -#: oldforms/__init__.py:586 -#: oldforms/__init__.py:625 +#: oldforms/__init__.py:512 oldforms/__init__.py:586 oldforms/__init__.py:625 #, python-format msgid "Select a valid choice; '%(data)s' is not in %(choices)s." -msgstr "Bitte eine gültige Auswahl treffen; '%(data)s' ist nicht in %(choices)s." +msgstr "" +"Bitte eine gültige Auswahl treffen; '%(data)s' ist nicht in %(choices)s." #: oldforms/__init__.py:745 msgid "Enter a whole number between -32,768 and 32,767." @@ -4133,28 +4312,23 @@ msgstr "Januar" msgid "February" msgstr "Februar" -#: utils/dates.py:18 -#: utils/dates.py:31 +#: utils/dates.py:18 utils/dates.py:31 msgid "March" msgstr "März" -#: utils/dates.py:18 -#: utils/dates.py:31 +#: utils/dates.py:18 utils/dates.py:31 msgid "April" msgstr "April" -#: utils/dates.py:18 -#: utils/dates.py:31 +#: utils/dates.py:18 utils/dates.py:31 msgid "May" msgstr "Mai" -#: utils/dates.py:18 -#: utils/dates.py:31 +#: utils/dates.py:18 utils/dates.py:31 msgid "June" msgstr "Juni" -#: utils/dates.py:19 -#: utils/dates.py:31 +#: utils/dates.py:19 utils/dates.py:31 msgid "July" msgstr "Juli" @@ -4308,23 +4482,23 @@ msgstr "%(number)d %(type)s" msgid ", %(number)d %(type)s" msgstr ", %(number)d %(type)s" -#: utils/translation/trans_real.py:404 +#: utils/translation/trans_real.py:403 msgid "DATE_FORMAT" msgstr "j. N Y" -#: utils/translation/trans_real.py:405 +#: utils/translation/trans_real.py:404 msgid "DATETIME_FORMAT" msgstr "j. N Y, H:i" -#: utils/translation/trans_real.py:406 +#: utils/translation/trans_real.py:405 msgid "TIME_FORMAT" msgstr "H:i" -#: utils/translation/trans_real.py:422 +#: utils/translation/trans_real.py:421 msgid "YEAR_MONTH_FORMAT" msgstr "F Y" -#: utils/translation/trans_real.py:423 +#: utils/translation/trans_real.py:422 msgid "MONTH_DAY_FORMAT" msgstr "j. F" @@ -4342,10 +4516,3 @@ msgstr "%(verbose_name)s wurde erfolgreich aktualisiert." #, python-format msgid "The %(verbose_name)s was deleted." msgstr "%(verbose_name)s wurde gelöscht" - -#~ msgid "" -#~ "Enter a postcode. A space is required between the two postcode parts." -#~ msgstr "" -#~ "Bitte eine gültige Postleitzahl eingeben. Ein Leerzeichen trennt die zwei " -#~ "Teile." - diff --git a/django/conf/locale/de/LC_MESSAGES/djangojs.mo b/django/conf/locale/de/LC_MESSAGES/djangojs.mo index 896847bb99..55f527318a 100644 Binary files a/django/conf/locale/de/LC_MESSAGES/djangojs.mo and b/django/conf/locale/de/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/de/LC_MESSAGES/djangojs.po b/django/conf/locale/de/LC_MESSAGES/djangojs.po index 936dcb454f..6e0daaca91 100644 --- a/django/conf/locale/de/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/de/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django JavaScript 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: 2005-12-04 13:21+0100\n" diff --git a/django/conf/locale/el/LC_MESSAGES/django.mo b/django/conf/locale/el/LC_MESSAGES/django.mo index cfd591b051..cd6050901c 100644 Binary files a/django/conf/locale/el/LC_MESSAGES/django.mo and b/django/conf/locale/el/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/el/LC_MESSAGES/django.po b/django/conf/locale/el/LC_MESSAGES/django.po index cc14eee072..d9793c843a 100644 --- a/django/conf/locale/el/LC_MESSAGES/django.po +++ b/django/conf/locale/el/LC_MESSAGES/django.po @@ -1,12 +1,10 @@ # translation of django.po to el # Copyright (C) 2006 and beyond # This file is distributed under the same license as the DJANGO package. -# Panos Laganakos , Mar 2006. # -# Dimitris Glezos , 2007. msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-05 01:32+1000\n" "PO-Revision-Date: 2007-09-03 04:19+0100\n" diff --git a/django/conf/locale/el/LC_MESSAGES/djangojs.mo b/django/conf/locale/el/LC_MESSAGES/djangojs.mo index 7d43b315fe..b689bf8fbf 100644 Binary files a/django/conf/locale/el/LC_MESSAGES/djangojs.mo and b/django/conf/locale/el/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/el/LC_MESSAGES/djangojs.po b/django/conf/locale/el/LC_MESSAGES/djangojs.po index 545f9f8601..28c06e3507 100644 --- a/django/conf/locale/el/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/el/LC_MESSAGES/djangojs.po @@ -1,11 +1,10 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) 2006 and beyond. # This file is distributed under the same license as the Django package. -# Orestis Markou , 2006. # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo index 5bb3059a2c..1367370ea2 100644 Binary files a/django/conf/locale/en/LC_MESSAGES/django.mo and b/django/conf/locale/en/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index a2dd52978b..c080c6156b 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-11-29 10:57-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/conf/locale/en/LC_MESSAGES/djangojs.mo b/django/conf/locale/en/LC_MESSAGES/djangojs.mo index 41cc5b54c0..80dd04a10d 100644 Binary files a/django/conf/locale/en/LC_MESSAGES/djangojs.mo and b/django/conf/locale/en/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/en/LC_MESSAGES/djangojs.po b/django/conf/locale/en/LC_MESSAGES/djangojs.po index c90b390589..bf48501746 100644 --- a/django/conf/locale/en/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/en/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-11-29 10:58-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index 728c53a15b..bb4c6ff9c8 100644 Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index 509e01f7c0..04c7c76e3b 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-10-20 14:55+0200\n" "PO-Revision-Date: 2007-10-20 15:38+0100\n" diff --git a/django/conf/locale/es/LC_MESSAGES/djangojs.mo b/django/conf/locale/es/LC_MESSAGES/djangojs.mo index 6d098c5041..fa886fba26 100644 Binary files a/django/conf/locale/es/LC_MESSAGES/djangojs.mo and b/django/conf/locale/es/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/es/LC_MESSAGES/djangojs.po b/django/conf/locale/es/LC_MESSAGES/djangojs.po index d193cf660e..f85ea6dcb6 100644 --- a/django/conf/locale/es/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/es/LC_MESSAGES/djangojs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django JavaScript 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-14 13:47-0500\n" "PO-Revision-Date: 2007-07-14 13:41-0500\n" diff --git a/django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo b/django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo index 32035fae25..b7683ea354 100644 Binary files a/django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo and b/django/conf/locale/es_AR/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po b/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po index 3a671b7439..32a37eb044 100644 --- a/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/es_AR/LC_MESSAGES/djangojs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django Javascript 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-10-06 14:18-0300\n" "PO-Revision-Date: 2007-07-14 14:36-0300\n" diff --git a/django/conf/locale/eu/LC_MESSAGES/django.mo b/django/conf/locale/eu/LC_MESSAGES/django.mo index c001bc8268..c19c32116f 100644 Binary files a/django/conf/locale/eu/LC_MESSAGES/django.mo and b/django/conf/locale/eu/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/eu/LC_MESSAGES/django.po b/django/conf/locale/eu/LC_MESSAGES/django.po index 0cef98a4d9..37a829d1ca 100644 --- a/django/conf/locale/eu/LC_MESSAGES/django.po +++ b/django/conf/locale/eu/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-02-08 19:37+0100\n" "PO-Revision-Date: 2008-02-14 22:12+0100\n" diff --git a/django/conf/locale/eu/LC_MESSAGES/djangojs.mo b/django/conf/locale/eu/LC_MESSAGES/djangojs.mo index b3e94ad711..646aa0f051 100644 Binary files a/django/conf/locale/eu/LC_MESSAGES/djangojs.mo and b/django/conf/locale/eu/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/eu/LC_MESSAGES/djangojs.po b/django/conf/locale/eu/LC_MESSAGES/djangojs.po index dd5a8c02e6..2df6bd2aa7 100644 --- a/django/conf/locale/eu/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/eu/LC_MESSAGES/djangojs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django JavaScript 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-14 13:47-0500\n" "PO-Revision-Date: 2007-07-14 13:41-0500\n" diff --git a/django/conf/locale/fa/LC_MESSAGES/django.mo b/django/conf/locale/fa/LC_MESSAGES/django.mo index f98d997484..ac3c31ef0e 100644 Binary files a/django/conf/locale/fa/LC_MESSAGES/django.mo and b/django/conf/locale/fa/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/fa/LC_MESSAGES/django.po b/django/conf/locale/fa/LC_MESSAGES/django.po index 915d9bea4a..16b0d7c981 100644 --- a/django/conf/locale/fa/LC_MESSAGES/django.po +++ b/django/conf/locale/fa/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-02-01 03:29+0330\n" "PO-Revision-Date: 2008-02-01 05:19+0330\n" diff --git a/django/conf/locale/fa/LC_MESSAGES/djangojs.mo b/django/conf/locale/fa/LC_MESSAGES/djangojs.mo index 8d3f8e505f..f2e89405d7 100644 Binary files a/django/conf/locale/fa/LC_MESSAGES/djangojs.mo and b/django/conf/locale/fa/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/fa/LC_MESSAGES/djangojs.po b/django/conf/locale/fa/LC_MESSAGES/djangojs.po index 255cb71870..56dcedc415 100644 --- a/django/conf/locale/fa/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/fa/LC_MESSAGES/djangojs.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-06-24 22:09+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/conf/locale/fi/LC_MESSAGES/django.mo b/django/conf/locale/fi/LC_MESSAGES/django.mo index 6d4ebd3283..cad3079c7a 100644 Binary files a/django/conf/locale/fi/LC_MESSAGES/django.mo and b/django/conf/locale/fi/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/fi/LC_MESSAGES/django.po b/django/conf/locale/fi/LC_MESSAGES/django.po index d068f2adfe..1ededb8be2 100644 --- a/django/conf/locale/fi/LC_MESSAGES/django.po +++ b/django/conf/locale/fi/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-09-14 23:33+0300\n" "PO-Revision-Date: 2007-09-15 00:34+0300\n" diff --git a/django/conf/locale/fi/LC_MESSAGES/djangojs.mo b/django/conf/locale/fi/LC_MESSAGES/djangojs.mo index 34b397e4ba..07500bbef6 100644 Binary files a/django/conf/locale/fi/LC_MESSAGES/djangojs.mo and b/django/conf/locale/fi/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/fi/LC_MESSAGES/djangojs.po b/django/conf/locale/fi/LC_MESSAGES/djangojs.po index 35aa82e893..b430f3b110 100644 --- a/django/conf/locale/fi/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/fi/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: 2006-08-05 15:27+0300\n" diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo index 55e4e57f5a..efefb0bb6f 100644 Binary files a/django/conf/locale/fr/LC_MESSAGES/django.mo and b/django/conf/locale/fr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po index ba335f5eae..55387f4bd3 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -1,145 +1,18 @@ # 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 , 2005. +# Copyright (C) 2008 THE PACKAGE'S COPYRIGHT HOLDER. # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-07-08 16:03+0200\n" -"PO-Revision-Date: 2006-05-08 15:12+0200\n" +"POT-Creation-Date: 2008-03-16 15:42+0100\n" +"PO-Revision-Date: 2008-03-17 00:00+0100\n" "Last-Translator: Baptiste \n" "Language-Team: français \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: oldforms/__init__.py:369 db/models/fields/__init__.py:125 -#: db/models/fields/__init__.py:282 db/models/fields/__init__.py:679 -#: db/models/fields/__init__.py:690 newforms/models.py:188 -#: newforms/fields.py:87 newforms/fields.py:444 newforms/fields.py:523 -#: newforms/fields.py:534 -msgid "This field is required." -msgstr "Ce champ est obligatoire." - -#: oldforms/__init__.py:404 -#, python-format -msgid "Ensure your text is less than %s character." -msgid_plural "Ensure your text is less than %s characters." -msgstr[0] "Assurez-vous que votre texte fait moins de %s caractère." -msgstr[1] "Assurez-vous que votre texte fait moins de %s caractères." - -#: oldforms/__init__.py:409 -msgid "Line breaks are not allowed here." -msgstr "Les retours à la ligne ne sont pas autorisés ici." - -#: oldforms/__init__.py:507 oldforms/__init__.py:581 oldforms/__init__.py:620 -#, python-format -msgid "Select a valid choice; '%(data)s' is not in %(choices)s." -msgstr "Sélectionnez un choix valide ; '%(data)s' n'est pas dans %(choices)s." - -#: oldforms/__init__.py:587 newforms/widgets.py:181 -#: contrib/admin/filterspecs.py:152 -msgid "Unknown" -msgstr "Inconnu" - -#: oldforms/__init__.py:587 newforms/widgets.py:181 -#: contrib/admin/filterspecs.py:145 -msgid "Yes" -msgstr "Oui" - -#: oldforms/__init__.py:587 newforms/widgets.py:181 -#: contrib/admin/filterspecs.py:145 -msgid "No" -msgstr "Non" - -#: oldforms/__init__.py:682 core/validators.py:178 core/validators.py:456 -msgid "No file was submitted. Check the encoding type on the form." -msgstr "" - -#: oldforms/__init__.py:684 -msgid "The submitted file is empty." -msgstr "Le fichier soumis est vide." - -#: oldforms/__init__.py:740 -msgid "Enter a whole number between -32,768 and 32,767." -msgstr "Entrez un nombre entier entre -32 768 et 32 767." - -#: oldforms/__init__.py:750 -msgid "Enter a positive number." -msgstr "Entrez un nombre entier positif." - -#: oldforms/__init__.py:760 -msgid "Enter a whole number between 0 and 32,767." -msgstr "Entrez un nombre entier entre 0 et 32 767." - -#: db/models/manipulators.py:304 -#, python-format -msgid "%(object)s with this %(type)s already exists for the given %(field)s." -msgstr "" - -#: db/models/manipulators.py:305 -msgid "and" -msgstr "et" - -#: db/models/fields/__init__.py:46 -#, python-format -msgid "%(optname)s with this %(fieldname)s already exists." -msgstr "%(optname)s avec le champ %(fieldname)s existe déjà." - -#: db/models/fields/__init__.py:377 -msgid "This value must be an integer." -msgstr "Cette valeur doit être un entier." - -#: db/models/fields/__init__.py:412 -msgid "This value must be either True or False." -msgstr "Cette valeur doit être soit Vraie soit Fausse." - -#: db/models/fields/__init__.py:433 -msgid "This field cannot be null." -msgstr "Ce champ ne peut pas être vide." - -#: db/models/fields/__init__.py:467 core/validators.py:152 -msgid "Enter a valid date in YYYY-MM-DD format." -msgstr "Entrez une date valide au format AAAA-MM-JJ." - -#: db/models/fields/__init__.py:536 core/validators.py:161 -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." - -#: db/models/fields/__init__.py:596 -msgid "This value must be a decimal number." -msgstr "Cette valeur doit être un nombre décimal." - -#: db/models/fields/__init__.py:699 -msgid "Enter a valid filename." -msgstr "Entrez un nom de fichier valide." - -#: db/models/fields/__init__.py:824 -msgid "This value must be either None, True or False." -msgstr "Cette valeur doit être Nulle, Vraie ou Fausse." - -#: db/models/fields/related.py:55 -#, python-format -msgid "Please enter a valid %s." -msgstr "Entrez un %s valide." - -#: db/models/fields/related.py:623 -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "" -"Maintenez \"Contrôle (ctrl)\", ou \"Commande (touche pomme)\" sur un Mac, " -"pour en sélectionner plusieurs." - -#: db/models/fields/related.py:667 -#, python-format -msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." -msgid_plural "" -"Please enter valid %(self)s IDs. The values %(value)r are invalid." -msgstr[0] "Entrez un ID %(self)s valide. La valeur %(value)r est invalide." -msgstr[1] "" -"Entrez des ID %(self)s valides. Les valeurs %(value)r sont invalides." +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit" #: conf/global_settings.py:39 msgid "Arabic" @@ -190,985 +63,146 @@ msgid "Argentinean Spanish" msgstr "Espagnol Argentin" #: conf/global_settings.py:51 +msgid "Basque" +msgstr "Basque" + +#: conf/global_settings.py:52 msgid "Persian" msgstr "Perse" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Finnish" msgstr "Finlandais" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "French" msgstr "Français" -#: conf/global_settings.py:54 +#: conf/global_settings.py:55 +msgid "Irish" +msgstr "Irlandais" + +#: conf/global_settings.py:56 msgid "Galician" msgstr "Galicien" -#: conf/global_settings.py:55 +#: conf/global_settings.py:57 msgid "Hungarian" msgstr "Hongrois" -#: conf/global_settings.py:56 +#: conf/global_settings.py:58 msgid "Hebrew" msgstr "Hébreu" -#: conf/global_settings.py:57 +#: conf/global_settings.py:59 +msgid "Croatian" +msgstr "Croate" + +#: conf/global_settings.py:60 msgid "Icelandic" msgstr "Islandais" -#: conf/global_settings.py:58 +#: conf/global_settings.py:61 msgid "Italian" msgstr "Italien" -#: conf/global_settings.py:59 +#: conf/global_settings.py:62 msgid "Japanese" msgstr "Japonais" -#: conf/global_settings.py:60 +#: conf/global_settings.py:63 +msgid "Georgian" +msgstr "Géorgien" + +#: conf/global_settings.py:64 msgid "Korean" msgstr "Coréen" -#: conf/global_settings.py:61 +#: conf/global_settings.py:65 +msgid "Khmer" +msgstr "Khmer" + +#: conf/global_settings.py:66 msgid "Kannada" msgstr "Kannada" -#: conf/global_settings.py:62 +#: conf/global_settings.py:67 msgid "Latvian" msgstr "Letton" -#: conf/global_settings.py:63 +#: conf/global_settings.py:68 msgid "Macedonian" msgstr "Macédonien" -#: conf/global_settings.py:64 +#: conf/global_settings.py:69 msgid "Dutch" msgstr "Hollandais" -#: conf/global_settings.py:65 +#: conf/global_settings.py:70 msgid "Norwegian" msgstr "Norvégien" -#: conf/global_settings.py:66 +#: conf/global_settings.py:71 msgid "Polish" msgstr "Polonais" -#: conf/global_settings.py:67 +#: conf/global_settings.py:72 msgid "Portugese" msgstr "Portugais" -#: conf/global_settings.py:68 +#: conf/global_settings.py:73 msgid "Brazilian" msgstr "Brésilien" -#: conf/global_settings.py:69 +#: conf/global_settings.py:74 msgid "Romanian" msgstr "Roumain" -#: conf/global_settings.py:70 +#: conf/global_settings.py:75 msgid "Russian" msgstr "Russe" -#: conf/global_settings.py:71 +#: conf/global_settings.py:76 msgid "Slovak" msgstr "Slovaque" -#: conf/global_settings.py:72 +#: conf/global_settings.py:77 msgid "Slovenian" msgstr "Slovaque" -#: conf/global_settings.py:73 +#: conf/global_settings.py:78 msgid "Serbian" msgstr "Serbe" -#: conf/global_settings.py:74 +#: conf/global_settings.py:79 msgid "Swedish" msgstr "Suédois" -#: conf/global_settings.py:75 +#: conf/global_settings.py:80 msgid "Tamil" msgstr "Tamoul" -#: conf/global_settings.py:76 +#: conf/global_settings.py:81 msgid "Telugu" msgstr "Télougou" -#: conf/global_settings.py:77 +#: conf/global_settings.py:82 msgid "Turkish" msgstr "Turc" -#: conf/global_settings.py:78 +#: conf/global_settings.py:83 msgid "Ukrainian" msgstr "Ukrainien" -#: conf/global_settings.py:79 +#: conf/global_settings.py:84 msgid "Simplified Chinese" msgstr "Chinois simplifié" -#: conf/global_settings.py:80 +#: conf/global_settings.py:85 msgid "Traditional Chinese" msgstr "Chinois traditionnel" -#: core/validators.py:68 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Ce champ ne doit contenir que des lettres, des nombres et des" -"tirets bas _." - -#: core/validators.py:72 -msgid "" -"This value must contain only letters, numbers, underscores, dashes or " -"slashes." -msgstr "" -"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _," -"des traits d'union, et des '/'." - -#: core/validators.py:76 -msgid "This value must contain only letters, numbers, underscores or hyphens." -msgstr "" -"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _" -"et des traits d'union." - -#: core/validators.py:80 -msgid "Uppercase letters are not allowed here." -msgstr "Les lettres majuscules ne sont pas autorisées ici." - -#: core/validators.py:84 -msgid "Lowercase letters are not allowed here." -msgstr "Les lettres minuscules ne sont pas autorisées ici." - -#: core/validators.py:91 -msgid "Enter only digits separated by commas." -msgstr "Saisissez uniquement des chiffres séparés par des virgules." - -#: core/validators.py:103 -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:107 -msgid "Please enter a valid IP address." -msgstr "Entrez une adresse IP valide." - -#: core/validators.py:111 -msgid "Empty values are not allowed here." -msgstr "Vous ne pouvez pas laisser ce champ vide." - -#: core/validators.py:115 -msgid "Non-numeric characters aren't allowed here." -msgstr "Les caractères non numériques ne sont pas autorisés ici." - -#: core/validators.py:119 -msgid "This value can't be comprised solely of digits." -msgstr "Cette valeur ne peut pas être composé uniquement de chiffres." - -#: core/validators.py:124 newforms/fields.py:135 -msgid "Enter a whole number." -msgstr "Entrez un nombre entier." - -#: core/validators.py:128 -msgid "Only alphabetical characters are allowed here." -msgstr "Seules les lettres de l'alphabet sont autorisées ici." - -#: core/validators.py:143 -msgid "Year must be 1900 or later." -msgstr "L'année doit être supérieure à 1900." - -#: core/validators.py:147 -#, python-format -msgid "Invalid date: %s" -msgstr "Date invalide : %s" - -#: core/validators.py:157 -msgid "Enter a valid time in HH:MM format." -msgstr "Entrez une heure valide au format HH:MM." - -#: core/validators.py:166 newforms/fields.py:339 -msgid "Enter a valid e-mail address." -msgstr "Entrez une adresse de courriel valide." - -#: core/validators.py:182 -msgid "" -"Upload a valid image. The file you uploaded was either not an image or a " -"corrupted image." -msgstr "" -"Envoyez une image valide. Le fichier que vous avez transferé n'est pas une " -"image ou bien est corrompu." - -#: core/validators.py:189 -#, 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:193 -#, 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 XXX-XXX-XXXX. \"%s\" est " -"incorrect." - -#: core/validators.py:201 -#, 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:205 -msgid "A valid URL is required." -msgstr "Une URL valide est requise." - -#: core/validators.py:219 -#, python-format -msgid "" -"Valid HTML is required. Specific errors are:\n" -"%s" -msgstr "" -"Du HTML valide est requis. Les erreurs sont les suivantes :\n" -"%s" - -#: core/validators.py:226 -#, python-format -msgid "Badly formed XML: %s" -msgstr "XML mal formé : %s" - -#: core/validators.py:243 -#, python-format -msgid "Invalid URL: %s" -msgstr "URL invalide : %s" - -#: core/validators.py:248 core/validators.py:250 -#, python-format -msgid "The URL %s is a broken link." -msgstr "L'URL %s est un lien cassé." - -#: core/validators.py:256 -msgid "Enter a valid U.S. state abbreviation." -msgstr "Entrez une abréviation d'État Américain valide." - -#: core/validators.py:270 -#, 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:277 -#, python-format -msgid "This field must match the '%s' field." -msgstr "Ce champ doit correspondre au champ '%s'." - -#: core/validators.py:296 -msgid "Please enter something for at least one field." -msgstr "Veuillez saisir quelque chose dans au moins un des champs." - -#: core/validators.py:305 core/validators.py:316 -msgid "Please enter both fields or leave them both empty." -msgstr "Veuillez renseigner les deux champs ou les laisser tous les deux vides." - -#: core/validators.py:324 -#, 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:337 -#, 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:356 -msgid "Duplicate values are not allowed." -msgstr "Les valeurs identiques ne sont pas autorisées." - -#: core/validators.py:371 -#, python-format -msgid "This value must be between %(lower)s and %(upper)s." -msgstr "Cette valeur doit être comprise entre %(lower)s et %(upper)s." - -#: core/validators.py:373 -#, python-format -msgid "This value must be at least %s." -msgstr "Cette valeur doit être au moins %s." - -#: core/validators.py:375 -#, python-format -msgid "This value must be no more than %s." -msgstr "Cette valeur ne doit pas dépasser %s." - -#: core/validators.py:411 -#, python-format -msgid "This value must be a power of %s." -msgstr "Cette valeur doit être une puissance de %s." - -#: core/validators.py:420 -msgid "Please enter a valid decimal number." -msgstr "Veuillez saisir un nombre décimal valide." - -#: core/validators.py:426 -#, 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." -msgstr[0] "" -"Veuillez saisir un nombre décimal valide avec au plus %s chiffre." -msgstr[1] "" -"Veuillez saisir un nombre décimal valide avec au plus %s chiffres." - -#: core/validators.py:429 -#, python-format -msgid "" -"Please enter a valid decimal number with a whole part of at most %s digit." -msgid_plural "" -"Please enter a valid decimal number with a whole part of at most %s digits." -msgstr[0] "Veuillez saisir un nombre décimal valide avec une partie entière de %s chiffre au plus." -msgstr[1] "Veuillez saisir un nombre décimal valide avec une partie entière de %s chiffres au plus." - -#: core/validators.py:432 -#, 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." -msgstr[0] "Veuillez saisir un nombre décimal valide avec au plus %s décimale." -msgstr[1] "Veuillez saisir un nombre décimal valide avec au plus %s décimales." - -#: core/validators.py:440 -msgid "Please enter a valid floating point number." -msgstr "Veuillez entrer un nombre à virgule flottante valide." - -#: core/validators.py:449 -#, 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 %s octets." - -#: core/validators.py:450 -#, 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 %s octets." - -#: core/validators.py:467 -msgid "The format for this field is wrong." -msgstr "Le format de ce champ est mauvais." - -#: core/validators.py:482 -msgid "This field is invalid." -msgstr "Ce champ est invalide." - -#: core/validators.py:518 -#, python-format -msgid "Could not retrieve anything from %s." -msgstr "Impossible de récupérer quoi que ce soit depuis %s." - -#: core/validators.py:521 -#, python-format -msgid "" -"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." -msgstr "" -"L'entête Content-Type '%(contenttype)s', renvoyée par l'url %(url)s n'est " -"pas valide." - -#: core/validators.py:554 -#, python-format -msgid "" -"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " -"\"%(start)s\".)" -msgstr "" -"Veuillez fermer le tag %(tag)s à la ligne %(line)s. (Ligne débutant par " -"\"%(start)s\".)" - -#: core/validators.py:558 -#, python-format -msgid "" -"Some text starting on line %(line)s is not allowed in that context. (Line " -"starts with \"%(start)s\".)" -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:563 -#, python-format -msgid "" -"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" -"(start)s\".)" -msgstr "" -"\"%(attr)s\" ligne %(line)s n'est pas un attribut valide. (Ligne débutant " -"par \"%(start)s\".)" - -#: core/validators.py:568 -#, python-format -msgid "" -"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" -"(start)s\".)" -msgstr "" -"\"<%(tag)s>\" ligne %(line)s n'est pas un tag valide. (Ligne débutant par \"%" -"(start)s\".)" - -#: core/validators.py:572 -#, python-format -msgid "" -"A tag on line %(line)s is missing one or more required attributes. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"Un tag, ou un ou plusieurs attributs, de la ligne %(line)s est manquant. " -"(Ligne débutant par \"%(start)s\".)" - -#: core/validators.py:577 -#, python-format -msgid "" -"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"La valeur de l'attribut \"%(attr)s\" de la ligne %(line)s n'est pas valide. " -"(Ligne débutant par \"%(start)s\".)" - -#: views/generic/create_update.py:43 -#, python-format -msgid "The %(verbose_name)s was created successfully." -msgstr "L'objet %(verbose_name)s a été créé avec succès." - -#: views/generic/create_update.py:117 -#, python-format -msgid "The %(verbose_name)s was updated successfully." -msgstr "L'objet %(verbose_name)s a été mis à jour avec succès." - -#: views/generic/create_update.py:184 -#, python-format -msgid "The %(verbose_name)s was deleted." -msgstr "L'objet %(verbose_name)s a été supprimé." - -#: newforms/models.py:175 newforms/fields.py:432 -msgid "Select a valid choice. That choice is not one of the available choices." -msgstr "" -"Sélectionnez un choix valide. Ce choix ne fait pas partie de ceux " -"disponibles." - -#: newforms/models.py:192 newforms/fields.py:448 newforms/fields.py:527 -msgid "Enter a list of values." -msgstr "Entrez une liste de valeurs." - -#: newforms/models.py:198 newforms/fields.py:457 -#, 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." - -#: newforms/fields.py:110 newforms/fields.py:324 -#, python-format -msgid "Ensure this value has at most %d characters." -msgstr "Assurez-vous que cette valeur fait moins de %d caractères." - -#: newforms/fields.py:112 newforms/fields.py:326 -#, python-format -msgid "Ensure this value has at least %d characters." -msgstr "Assurez-vous que cette valeur fait plus de %d caractères." - -#: newforms/fields.py:137 newforms/fields.py:160 newforms/fields.py:192 -#, python-format -msgid "Ensure this value is less than or equal to %s." -msgstr "Assurez-vous que cette valeur soit inférieure ou égale à %s." - -#: newforms/fields.py:139 newforms/fields.py:162 newforms/fields.py:194 -#, python-format -msgid "Ensure this value is greater than or equal to %s." -msgstr "Assurez-vous que cette valeur soit supérieure ou égale à %s." - -#: newforms/fields.py:158 newforms/fields.py:186 -msgid "Enter a number." -msgstr "Entrez un nombre." - -#: newforms/fields.py:196 -#, python-format -msgid "Ensure that there are no more than %s digits in total." -msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres au total." - -#: newforms/fields.py:198 -#, python-format -msgid "Ensure that there are no more than %s decimal places." -msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres après la virgule." - -#: newforms/fields.py:200 -#, python-format -msgid "Ensure that there are no more than %s digits before the decimal point." -msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres avant la virgule." - -#: newforms/fields.py:233 newforms/fields.py:567 -msgid "Enter a valid date." -msgstr "Entrez une date valide." - -#: newforms/fields.py:260 newforms/fields.py:569 -msgid "Enter a valid time." -msgstr "Entrez une heure valide." - -#: newforms/fields.py:296 -msgid "Enter a valid date/time." -msgstr "Entrez une date et une heure valides." - -#: newforms/fields.py:310 -msgid "Enter a valid value." -msgstr "Entrez une valeur valide." - -#: newforms/fields.py:357 newforms/fields.py:379 -msgid "Enter a valid URL." -msgstr "Entrez une URL valide." - -#: newforms/fields.py:381 -msgid "This URL appears to be a broken link." -msgstr "Cette URL semble être cassée." - -#: contrib/humanize/templatetags/humanize.py:17 -msgid "th" -msgstr "e" - -#: contrib/humanize/templatetags/humanize.py:17 -msgid "st" -msgstr "er" - -#: contrib/humanize/templatetags/humanize.py:17 -msgid "nd" -msgstr "d" - -#: contrib/humanize/templatetags/humanize.py:17 -msgid "rd" -msgstr "e" - -#: contrib/humanize/templatetags/humanize.py:47 -#, python-format -msgid "%(value).1f million" -msgid_plural "%(value).1f million" -msgstr[0] "%(value).1f million" -msgstr[1] "%(value).1f millions" - -#: contrib/humanize/templatetags/humanize.py:50 -#, python-format -msgid "%(value).1f billion" -msgid_plural "%(value).1f billion" -msgstr[0] "%(value).1f milliard" -msgstr[1] "%(value).1f milliards" - -#: contrib/humanize/templatetags/humanize.py:53 -#, python-format -msgid "%(value).1f trillion" -msgid_plural "%(value).1f trillion" -msgstr[0] "%(value).1f billion" -msgstr[1] "%(value).1f billions" - -#: contrib/humanize/templatetags/humanize.py:68 -msgid "one" -msgstr "un" - -#: contrib/humanize/templatetags/humanize.py:68 -msgid "two" -msgstr "deux" - -#: contrib/humanize/templatetags/humanize.py:68 -msgid "three" -msgstr "trois" - -#: contrib/humanize/templatetags/humanize.py:68 -msgid "four" -msgstr "quatre" - -#: contrib/humanize/templatetags/humanize.py:68 -msgid "five" -msgstr "cinq" - -#: contrib/humanize/templatetags/humanize.py:68 -msgid "six" -msgstr "six" - -#: contrib/humanize/templatetags/humanize.py:68 -msgid "seven" -msgstr "sept" - -#: contrib/humanize/templatetags/humanize.py:68 -msgid "eight" -msgstr "huit" - -#: contrib/humanize/templatetags/humanize.py:68 -msgid "nine" -msgstr "neuf" - -#: contrib/redirects/models.py:7 -msgid "redirect from" -msgstr "redirigé depuis" - -#: contrib/redirects/models.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: '/evenements/" -"rechercher/'." - -#: contrib/redirects/models.py:9 -msgid "redirect to" -msgstr "redirigé vers" - -#: contrib/redirects/models.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.py:13 -msgid "redirect" -msgstr "redirige" - -#: contrib/redirects/models.py:14 -msgid "redirects" -msgstr "redirige" - -#: contrib/comments/models.py:67 contrib/comments/models.py:156 -msgid "object ID" -msgstr "ID de l'objet" - -#: contrib/comments/models.py:68 -msgid "headline" -msgstr "titre" - -#: contrib/comments/models.py:69 contrib/comments/models.py:91 -#: contrib/comments/models.py:157 -msgid "comment" -msgstr "commentaire" - -#: contrib/comments/models.py:70 -msgid "rating #1" -msgstr "vote n°1" - -#: contrib/comments/models.py:71 -msgid "rating #2" -msgstr "vote n°2" - -#: contrib/comments/models.py:72 -msgid "rating #3" -msgstr "vote n°3" - -#: contrib/comments/models.py:73 -msgid "rating #4" -msgstr "vote n°4" - -#: contrib/comments/models.py:74 -msgid "rating #5" -msgstr "vote n°5" - -#: contrib/comments/models.py:75 -msgid "rating #6" -msgstr "vote n°6" - -#: contrib/comments/models.py:76 -msgid "rating #7" -msgstr "vote n°7" - -#: contrib/comments/models.py:77 -msgid "rating #8" -msgstr "vote n°8" - -#: contrib/comments/models.py:82 -msgid "is valid rating" -msgstr "est un vote valide" - -#: contrib/comments/models.py:83 contrib/comments/models.py:159 -msgid "date/time submitted" -msgstr "date et heure soumises" - -#: contrib/comments/models.py:84 contrib/comments/models.py:160 -msgid "is public" -msgstr "est public" - -#: contrib/comments/models.py:85 contrib/admindocs/views.py:305 -msgid "IP address" -msgstr "adresse IP" - -#: contrib/comments/models.py:86 -msgid "is removed" -msgstr "est supprimé" - -#: contrib/comments/models.py:86 -msgid "" -"Check this box if the comment is inappropriate. A \"This comment has been " -"removed\" message will be displayed instead." -msgstr "" -"Cochez cette case si le commentaire est inadéquat. Un message type \"Ce " -"commentaire a été supprimé\" sera affiché en lieu et place de celui-ci." - -#: contrib/comments/models.py:92 -msgid "comments" -msgstr "commentaires" - -#: contrib/comments/models.py:121 contrib/comments/models.py:188 -msgid "Content object" -msgstr "Type de contenu" - -#: contrib/comments/models.py:149 -#, python-format -msgid "" -"Posted by %(user)s at %(date)s\n" -"\n" -"%(comment)s\n" -"\n" -"http://%(domain)s%(url)s" -msgstr "" -"Posté par %(user)s à %(date)s\n" -"\n" -"%(comment)s\n" -"\n" -"http://%(domain)s%(url)s" - -#: contrib/comments/models.py:158 -msgid "person's name" -msgstr "nom de la personne" - -#: contrib/comments/models.py:161 -msgid "ip address" -msgstr "adresse IP" - -#: contrib/comments/models.py:163 -msgid "approved by staff" -msgstr "approuvé par l'équipe" - -#: contrib/comments/models.py:167 -msgid "free comment" -msgstr "commentaire libre" - -#: contrib/comments/models.py:168 -msgid "free comments" -msgstr "commentaires libres" - -#: contrib/comments/models.py:214 -msgid "score" -msgstr "evaluation" - -#: contrib/comments/models.py:215 -msgid "score date" -msgstr "date d'évaluation" - -#: contrib/comments/models.py:219 -msgid "karma score" -msgstr "point de Karma" - -#: contrib/comments/models.py:220 -msgid "karma scores" -msgstr "points de Karma" - -#: contrib/comments/models.py:224 -#, python-format -msgid "%(score)d rating by %(user)s" -msgstr "%(score)d évalué par %(user)s" - -#: contrib/comments/models.py:240 -#, python-format -msgid "" -"This comment was flagged by %(user)s:\n" -"\n" -"%(text)s" -msgstr "" -"Ce commentaire a été marqué par %(user)s:\n" -"\n" -"%(text)s" - -#: contrib/comments/models.py:247 -msgid "flag date" -msgstr "date d'indicateur" - -#: contrib/comments/models.py:251 -msgid "user flag" -msgstr "indicateur utilisateur" - -#: contrib/comments/models.py:252 -msgid "user flags" -msgstr "indicateurs utilisateur" - -#: contrib/comments/models.py:256 -#, python-format -msgid "Flag by %r" -msgstr "Indicateur par %r" - -#: contrib/comments/models.py:261 -msgid "deletion date" -msgstr "date de suppression" - -#: contrib/comments/models.py:264 -msgid "moderator deletion" -msgstr "suppression de modérateur" - -#: contrib/comments/models.py:265 -msgid "moderator deletions" -msgstr "suppressions de modérateur" - -#: contrib/comments/models.py:269 -#, python-format -msgid "Moderator deletion by %r" -msgstr "Suppression de modérateur par %r" - -#: contrib/comments/views/karma.py:20 -msgid "Anonymous users cannot vote" -msgstr "Les utilisateurs anonymes ne peuvent pas voter" - -#: contrib/comments/views/karma.py:24 -msgid "Invalid comment ID" -msgstr "Identifiant de commentaire invalide" - -#: contrib/comments/views/karma.py:26 -msgid "No voting for yourself" -msgstr "Impossible de voter pour soi-même" - -#: contrib/comments/views/comments.py:28 -msgid "" -"This rating is required because you've entered at least one other rating." -msgstr "" -"Ce vote est nécessaire car vous avez saisi au moins un autre vote." - -#: contrib/comments/views/comments.py:112 -#, python-format -msgid "" -"This comment was posted by a user who has posted fewer than %(count)s " -"comment:\n" -"\n" -"%(text)s" -msgid_plural "" -"This comment was posted by a user who has posted fewer than %(count)s " -"comments:\n" -"\n" -"%(text)s" -msgstr[0] "" -"Ce commentaire a été posté par un utilisateur qui a posté moins de %(count)s " -"commentaire :\n" -"\n" -"%(text)s" -msgstr[1] "" -"Ce commentaire a été posté par un utilisateur qui a posté moins de %(count)s " -"commentaires :\n" -"\n" -"%(text)s" - -#: contrib/comments/views/comments.py:117 -#, python-format -msgid "" -"This comment was posted by a sketchy user:\n" -"\n" -"%(text)s" -msgstr "" -"Ce commentaire a été posté par un utilisateur imprécis :\n" -"\n" -"%(text)s" - -#: contrib/comments/views/comments.py:189 -#: contrib/comments/views/comments.py:281 -msgid "Only POSTs are allowed" -msgstr "Seuls les POSTs sont autorisés" - -#: contrib/comments/views/comments.py:193 -#: contrib/comments/views/comments.py:285 -msgid "One or more of the required fields wasn't submitted" -msgstr "Un ou plusieurs champs requis n'ont pas été remplis" - -#: contrib/comments/views/comments.py:197 -#: contrib/comments/views/comments.py:287 -msgid "Somebody tampered with the comment form (security violation)" -msgstr "" -"Quelqu'un a trafiqué le formulaire de commentaire (violation des règles de " -"sécurité)" - -#: contrib/comments/views/comments.py:207 -#: contrib/comments/views/comments.py:293 -msgid "" -"The comment form had an invalid 'target' parameter -- the object ID was " -"invalid" -msgstr "" -"Ce formulaire de commentaire avait un paramètre cible invalide; l'identifiant de " -"l'objet était invalide" - -#: contrib/comments/views/comments.py:258 -#: contrib/comments/views/comments.py:322 -msgid "The comment form didn't provide either 'preview' or 'post'" -msgstr "" -"Le formulaire de commentaire ne proposait ni la prévisualisation " -"ni l'envoi" - -#: contrib/comments/templates/comments/freeform.html:4 -msgid "Your name:" -msgstr "Votre nom :" - -#: contrib/comments/templates/comments/freeform.html:5 -#: contrib/comments/templates/comments/form.html:28 -msgid "Comment:" -msgstr "Commentaire :" - -#: contrib/comments/templates/comments/freeform.html:10 -#: contrib/comments/templates/comments/form.html:35 -msgid "Preview comment" -msgstr "Prévisualisation du commentaire" - -#: contrib/comments/templates/comments/form.html:6 -#: contrib/comments/templates/comments/form.html:8 -#: contrib/admin/templates/admin/login.html:19 -msgid "Username:" -msgstr "Nom d'utilisateur" - -#: contrib/comments/templates/comments/form.html:6 -#: contrib/admin/templates/admin/object_history.html:4 -#: contrib/admin/templates/admin/change_list.html:8 -#: contrib/admin/templates/admin/change_form.html:16 -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/delete_confirmation.html:4 -#: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Log out" -msgstr "Déconnexion" - -#: contrib/comments/templates/comments/form.html:8 -#: contrib/admin/templates/admin/login.html:22 -msgid "Password:" -msgstr "Mot de passe" - -#: contrib/comments/templates/comments/form.html:8 -msgid "Forgotten your password?" -msgstr "Mot de passe oublié ?" - -#: contrib/comments/templates/comments/form.html:12 -msgid "Ratings" -msgstr "Votes" - -#: contrib/comments/templates/comments/form.html:12 -#: contrib/comments/templates/comments/form.html:23 -msgid "Required" -msgstr "Requis" - -#: contrib/comments/templates/comments/form.html:12 -#: contrib/comments/templates/comments/form.html:23 -msgid "Optional" -msgstr "Optionel" - -#: contrib/comments/templates/comments/form.html:23 -msgid "Post a photo" -msgstr "Poster une photo" - -#: contrib/sites/models.py:10 -msgid "domain name" -msgstr "nom de domaine" - -#: contrib/sites/models.py:11 -msgid "display name" -msgstr "nom à afficher" - -#: contrib/sites/models.py:16 -msgid "site" -msgstr "site" - -#: contrib/sites/models.py:17 -msgid "sites" -msgstr "sites" - -#: contrib/admin/filterspecs.py:42 +#: contrib/admin/filterspecs.py:44 #, python-format msgid "" "

    By %s:

    \n" @@ -1177,312 +211,100 @@ msgstr "" "

    Par %s :

    \n" "
      \n" -#: contrib/admin/filterspecs.py:72 contrib/admin/filterspecs.py:90 -#: contrib/admin/filterspecs.py:145 contrib/admin/filterspecs.py:171 +#: contrib/admin/filterspecs.py:74 contrib/admin/filterspecs.py:92 +#: contrib/admin/filterspecs.py:147 contrib/admin/filterspecs.py:173 msgid "All" msgstr "Tout" -#: contrib/admin/filterspecs.py:111 +#: contrib/admin/filterspecs.py:113 msgid "Any date" msgstr "Toutes les dates" -#: contrib/admin/filterspecs.py:112 +#: contrib/admin/filterspecs.py:114 msgid "Today" msgstr "Aujourd'hui" -#: contrib/admin/filterspecs.py:115 +#: contrib/admin/filterspecs.py:117 msgid "Past 7 days" msgstr "Les 7 derniers jours" -#: contrib/admin/filterspecs.py:117 +#: contrib/admin/filterspecs.py:119 msgid "This month" msgstr "Ce mois-ci" -#: contrib/admin/filterspecs.py:119 +#: contrib/admin/filterspecs.py:121 msgid "This year" msgstr "Cette année" -#: contrib/admin/options.py:323 contrib/admin/views/auth.py:20 -#, 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/filterspecs.py:147 newforms/widgets.py:231 +#: oldforms/__init__.py:592 +msgid "Yes" +msgstr "Oui" -#: contrib/admin/options.py:327 contrib/admin/options.py:385 -#: contrib/admin/views/auth.py:25 -msgid "You may edit it again below." -msgstr "Vous pouvez continuez de l'éditez ci-dessous." +#: contrib/admin/filterspecs.py:147 newforms/widgets.py:231 +#: oldforms/__init__.py:592 +msgid "No" +msgstr "Non" -#: contrib/admin/options.py:337 contrib/admin/options.py:394 -#, python-format -msgid "You may add another %s below." -msgstr "Vous pouvez ajouter un autre %s ci-dessous." +#: contrib/admin/filterspecs.py:154 newforms/widgets.py:231 +#: oldforms/__init__.py:592 +msgid "Unknown" +msgstr "Inconnu" -#: contrib/admin/options.py:380 -msgid "No fields changed." -msgstr "Aucun champ modifié." - -#: contrib/admin/options.py:383 -#, 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:391 -#, 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:437 -#, python-format -msgid "Add %s" -msgstr "Ajouter %s" - -#: contrib/admin/options.py:504 -#, python-format -msgid "Change %s" -msgstr "Changement %s" - -#: contrib/admin/options.py:531 -msgid "Database error" -msgstr "Erreur de base de données" - -#: contrib/admin/options.py:576 -#, 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:579 -msgid "Are you sure?" -msgstr "Êtes-vous sûr ?" - -#: contrib/admin/options.py:601 -#, python-format -msgid "Change history: %s" -msgstr "Historique des changements : %s" - -#: contrib/admin/models.py:17 +#: contrib/admin/models.py:18 msgid "action time" msgstr "heure de l'action" -#: contrib/admin/models.py:20 +#: contrib/admin/models.py:21 msgid "object id" msgstr "id de l'objet" -#: contrib/admin/models.py:21 +#: contrib/admin/models.py:22 msgid "object repr" msgstr "représentation de l'objet" -#: contrib/admin/models.py:22 +#: contrib/admin/models.py:23 msgid "action flag" msgstr "indicateur de l'action" -#: contrib/admin/models.py:23 +#: contrib/admin/models.py:24 msgid "change message" msgstr "message de modification" -#: contrib/admin/models.py:26 +#: contrib/admin/models.py:27 msgid "log entry" msgstr "entrée d'historique" -#: contrib/admin/models.py:27 +#: contrib/admin/models.py:28 msgid "log entries" msgstr "entrées d'historique" -#: contrib/admin/widgets.py:44 -msgid "Date:" -msgstr "Date :" +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Cette page n'a pas été trouvée" -#: contrib/admin/widgets.py:44 -msgid "Time:" -msgstr "Heure :" +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Nous sommes désolés, mais la page demandée est introuvable." -#: 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 "" -"Veuillez saisir 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 "" -"Veuillez vous reconnecter, car votre session a expiré. Ne vous " -"inquiétez pas, votre soumission a été enregistrée." - -#: 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. Veuillez" -"les activer, recharger cette page, puis rééssayer." - -#: 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:276 contrib/admin/views/main.py:143 -msgid "Site administration" -msgstr "Gestion du site" - -#: contrib/admin/templatetags/admin_list.py:252 -msgid "All dates" -msgstr "Toutes les dates" - -#: contrib/admin/views/auth.py:31 -msgid "Add user" -msgstr "Ajouter l'utilisateur" - -#: contrib/admin/views/auth.py:56 -msgid "Password changed successfully." -msgstr "Mot de passe modifié avec succés" - -#: contrib/admin/views/auth.py:63 -#, python-format -msgid "Change password: %s" -msgstr "Modifier le mot de passe : %s" - -#: contrib/admin/views/main.py:222 -#, python-format -msgid "One or more %(fieldname)s in %(name)s: %(obj)s" -msgstr "Un ou plusieurs %(fieldname)s dans %(name)s : %(obj)s" - -#: contrib/admin/views/main.py:227 -#, python-format -msgid "One or more %(fieldname)s in %(name)s:" -msgstr "Un ou plusieurs %(fieldname)s dans %(name)s :" - -#: contrib/admin/views/main.py:269 -#, python-format -msgid "Select %s" -msgstr "Sélectionnez %s" - -#: contrib/admin/views/main.py:269 -#, python-format -msgid "Select %s to change" -msgstr "Sélectionnez %s pour changer" - -#: contrib/admin/templates/widget/file.html:2 -msgid "Currently:" -msgstr "Actuellement :" - -#: contrib/admin/templates/widget/file.html:3 -msgid "Change:" -msgstr "Modification :" - -#: contrib/admin/templates/admin/object_history.html:4 -#: contrib/admin/templates/admin/change_list.html:8 -#: contrib/admin/templates/admin/change_form.html:16 -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/delete_confirmation.html:4 -#: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Documentation" -msgstr "Documentation" - -#: contrib/admin/templates/admin/object_history.html:4 -#: contrib/admin/templates/admin/change_list.html:8 -#: contrib/admin/templates/admin/change_form.html:16 -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/delete_confirmation.html:4 -#: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/admin/auth/user/change_password.html:15 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/model_index.html:5 -msgid "Change password" -msgstr "Modifier votre mot de passe" - -#: contrib/admin/templates/admin/object_history.html:7 -#: contrib/admin/templates/admin/change_list.html:10 #: contrib/admin/templates/admin/500.html:4 +#: contrib/admin/templates/admin/base.html:37 +#: contrib/admin/templates/admin/change_form.html:12 +#: contrib/admin/templates/admin/change_list.html:5 +#: contrib/admin/templates/admin/delete_confirmation.html:5 #: contrib/admin/templates/admin/invalid_setup.html:4 -#: contrib/admin/templates/admin/change_form.html:20 -#: contrib/admin/templates/admin/base.html:30 -#: contrib/admin/templates/admin/delete_confirmation.html:8 -#: contrib/admin/templates/admin/auth/user/change_password.html:12 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 -#: contrib/admin/templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/object_history.html:4 +#: contrib/admin/templates/admin/auth/user/change_password.html:11 #: contrib/admin/templates/admin_doc/bookmarklets.html:3 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 msgid "Home" msgstr "Accueil" -#: contrib/admin/templates/admin/object_history.html:7 -#: contrib/admin/templates/admin/change_form.html:29 -msgid "History" -msgstr "Historique" - -#: contrib/admin/templates/admin/object_history.html:18 -msgid "Date/time" -msgstr "Date/Heure" - -#: contrib/admin/templates/admin/object_history.html:19 -msgid "User" -msgstr "Utilisateur" - -#: contrib/admin/templates/admin/object_history.html:20 -msgid "Action" -msgstr "Action" - -#: contrib/admin/templates/admin/object_history.html:26 -msgid "DATE_WITH_TIME_FULL" -msgstr "j. N Y, H:i" - -#: contrib/admin/templates/admin/object_history.html:34 -msgid "" -"This object doesn't have a change history. It probably wasn't added via this " -"admin site." -msgstr "" -"Cet objet n'a pas d'historique de modification. Il n'a probablement pas été " -"ajouté au moyen de ce site d'administration." - -#: contrib/admin/templates/admin/change_list.html:18 -#, python-format -msgid "Add %(name)s" -msgstr "Ajouter %(name)s" - -#: contrib/admin/templates/admin/change_list.html:28 -msgid "Filter" -msgstr "Filtre" - -#: contrib/admin/templates/admin/filter.html:2 -#, python-format -msgid " By %(filter_title)s " -msgstr " Par %(filter_title)s " - #: contrib/admin/templates/admin/500.html:4 msgid "Server error" msgstr "Erreur du serveur" @@ -1501,37 +323,28 @@ msgid "" "mail and should be fixed shortly. Thanks for your patience." msgstr "" "Une erreur est survenue. Elle a été transmise par courriel aux " -"administrateurs du site et sera corrigée dans les meilleurs délais. Merci " -"de votre patience." +"administrateurs du site et sera corrigée dans les meilleurs délais. Merci de " +"votre patience." -#: contrib/admin/templates/admin/invalid_setup.html:7 -msgid "" -"Something's wrong with your database installation. Make sure the appropriate " -"database tables have been created, and make sure the database is readable by " -"the appropriate user." -msgstr "" -"Quelque chose ne va pas avec votre base de données. Vérifiez que les bonnes " -"tables ont été créées, et que la base est lisible par le bon utilisateur." +#: contrib/admin/templates/admin/base.html:26 +msgid "Welcome," +msgstr "Bienvenue," -#: contrib/admin/templates/admin/search_form.html:8 -msgid "Go" -msgstr "Envoyer" +#: contrib/admin/templates/admin/base.html:28 +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Documentation" +msgstr "Documentation" -#: contrib/admin/templates/admin/search_form.html:10 -#, python-format -msgid "1 result" -msgid_plural "%(counter)s results" -msgstr[0] "1 résultat" -msgstr[1] "%(counter)s résultats" +#: contrib/admin/templates/admin/base.html:29 +#: contrib/admin/templates/admin/auth/user/change_password.html:14 +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Change password" +msgstr "Modifier votre mot de passe" -#: contrib/admin/templates/admin/search_form.html:10 -#, python-format -msgid "%(full_result_count)s total" -msgstr "%(full_result_count)s résultats" - -#: contrib/admin/templates/admin/pagination.html:10 -msgid "Show all" -msgstr "Tout montrer" +#: contrib/admin/templates/admin/base.html:30 +#: contrib/comments/templates/comments/form.html:6 +msgid "Log out" +msgstr "Déconnexion" #: contrib/admin/templates/admin/base_site.html:4 msgid "Django site admin" @@ -1541,71 +354,44 @@ msgstr "Site d'administration de Django" msgid "Django administration" msgstr "Administration de Django" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 -msgid "Page not found" -msgstr "Cette page n'a pas été trouvée" - -#: contrib/admin/templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "Nous sommes désolés, mais la page demandée est introuvable." - -#: contrib/admin/templates/admin/index.html:18 -#, python-format -msgid "Models available in the %(name)s application." -msgstr "Modèles disponibles dans l'application %(name)s." - -#: contrib/admin/templates/admin/index.html:19 -#, python-format -msgid "%(name)s" -msgstr "%(name)s" - -#: contrib/admin/templates/admin/index.html:29 -#: contrib/admin/templates/admin/change_form.html:22 +#: contrib/admin/templates/admin/change_form.html:14 +#: contrib/admin/templates/admin/index.html:28 msgid "Add" msgstr "Ajouter" -#: contrib/admin/templates/admin/index.html:35 -msgid "Change" -msgstr "Modifier" +#: contrib/admin/templates/admin/change_form.html:20 +#: contrib/admin/templates/admin/object_history.html:4 +msgid "History" +msgstr "Historique" -#: contrib/admin/templates/admin/index.html:45 -msgid "You don't have permission to edit anything." -msgstr "Vous n'avez pas la permission d'éditer quoi que ce soit." - -#: contrib/admin/templates/admin/index.html:53 -msgid "Recent Actions" -msgstr "Actions récentes" - -#: contrib/admin/templates/admin/index.html:54 -msgid "My Actions" -msgstr "Mes actions" - -#: contrib/admin/templates/admin/index.html:58 -msgid "None available" -msgstr "Aucun(e) disponible" - -#: contrib/admin/templates/admin/change_form.html:30 +#: contrib/admin/templates/admin/change_form.html:21 msgid "View on site" msgstr "Voir sur le site" -#: contrib/admin/templates/admin/change_form.html:40 -#: contrib/admin/templates/admin/auth/user/change_password.html:24 +#: contrib/admin/templates/admin/change_form.html:31 +#: contrib/admin/templates/admin/auth/user/change_password.html:23 msgid "Please correct the error below." -msgid_plural "Please correct the errors below." -msgstr[0] "Veuillez corriger l'erreur ci-dessous." -msgstr[1] "Veuillez corriger les erreurs ci-dessous." +msgstr "Veuillez corriger l'erreur ci-dessous." -#: contrib/admin/templates/admin/base.html:25 -msgid "Welcome," -msgstr "Bienvenue," +#: contrib/admin/templates/admin/change_form.html:49 +msgid "Ordering" +msgstr "Tri" -#: contrib/admin/templates/admin/delete_confirmation.html:11 +#: contrib/admin/templates/admin/change_form.html:52 +msgid "Order:" +msgstr "Ordre :" + +#: contrib/admin/templates/admin/change_list.html:11 +#, python-format +msgid "Add %(name)s" +msgstr "Ajouter %(name)s" + +#: contrib/admin/templates/admin/delete_confirmation.html:8 #: contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Supprimer" -#: contrib/admin/templates/admin/delete_confirmation.html:17 +#: contrib/admin/templates/admin/delete_confirmation.html:13 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -1616,7 +402,7 @@ msgstr "" "suppression des objets qui lui sont liés mais votre compte ne possède pas la " "permission de supprimer les types d'objets suivants :" -#: contrib/admin/templates/admin/delete_confirmation.html:24 +#: contrib/admin/templates/admin/delete_confirmation.html:20 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -1626,10 +412,116 @@ msgstr "" "(escaped_object)s\" ? Les éléments suivant sont liés à celui-ci et seront " "aussi supprimés :" -#: contrib/admin/templates/admin/delete_confirmation.html:29 +#: contrib/admin/templates/admin/delete_confirmation.html:25 msgid "Yes, I'm sure" msgstr "Oui, j'en suis certain" +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(filter_title)s " +msgstr " Par %(filter_title)s " + +#: contrib/admin/templates/admin/filters.html:4 +msgid "Filter" +msgstr "Filtre" + +#: contrib/admin/templates/admin/index.html:17 +#, python-format +msgid "Models available in the %(name)s application." +msgstr "Modèles disponibles dans l'application %(name)s." + +#: contrib/admin/templates/admin/index.html:18 +#, python-format +msgid "%(name)s" +msgstr "%(name)s" + +#: contrib/admin/templates/admin/index.html:34 +msgid "Change" +msgstr "Modifier" + +#: contrib/admin/templates/admin/index.html:44 +msgid "You don't have permission to edit anything." +msgstr "Vous n'avez pas la permission d'éditer quoi que ce soit." + +#: contrib/admin/templates/admin/index.html:52 +msgid "Recent Actions" +msgstr "Actions récentes" + +#: contrib/admin/templates/admin/index.html:53 +msgid "My Actions" +msgstr "Mes actions" + +#: contrib/admin/templates/admin/index.html:57 +msgid "None available" +msgstr "Aucun(e) disponible" + +#: contrib/admin/templates/admin/invalid_setup.html:8 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" +"Quelque chose ne va pas avec votre base de données. Vérifiez que les bonnes " +"tables ont été créées, et que la base est lisible par le bon utilisateur." + +#: contrib/admin/templates/admin/login.html:17 +#: contrib/comments/templates/comments/form.html:6 +#: contrib/comments/templates/comments/form.html:8 +msgid "Username:" +msgstr "Nom d'utilisateur" + +#: contrib/admin/templates/admin/login.html:20 +#: contrib/comments/templates/comments/form.html:8 +msgid "Password:" +msgstr "Mot de passe" + +#: contrib/admin/templates/admin/login.html:25 +#: contrib/admin/views/decorators.py:31 +msgid "Log in" +msgstr "Connectez-vous" + +#: contrib/admin/templates/admin/object_history.html:17 +msgid "Date/time" +msgstr "Date/Heure" + +#: contrib/admin/templates/admin/object_history.html:18 +msgid "User" +msgstr "Utilisateur" + +#: contrib/admin/templates/admin/object_history.html:19 +msgid "Action" +msgstr "Action" + +#: contrib/admin/templates/admin/object_history.html:25 +msgid "DATE_WITH_TIME_FULL" +msgstr "j. N Y, H:i" + +#: contrib/admin/templates/admin/object_history.html:35 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" +"Cet objet n'a pas d'historique de modification. Il n'a probablement pas été " +"ajouté au moyen de ce site d'administration." + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "Tout montrer" + +#: contrib/admin/templates/admin/search_form.html:8 +msgid "Go" +msgstr "Envoyer" + +#: contrib/admin/templates/admin/search_form.html:10 +#, python-format +msgid "1 result" +msgstr "1 résultat" + +#: contrib/admin/templates/admin/search_form.html:10 +#, python-format +msgid "%(full_result_count)s total" +msgstr "%(full_result_count)s résultats" + #: contrib/admin/templates/admin/submit_line.html:4 msgid "Save as new" msgstr "Sauver en tant que nouveau" @@ -1646,28 +538,6 @@ msgstr "Sauver et continuer les modifications" msgid "Save" msgstr "Sauver" -#: contrib/admin/templates/admin/auth/user/change_password.html:28 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Entrez un nouveau mot de passe pour l'utilisateur %(username)s." - -#: contrib/admin/templates/admin/auth/user/change_password.html:34 -#: contrib/admin/templates/admin/auth/user/add_form.html:18 -msgid "Password" -msgstr "Mot de passe" - -#: contrib/admin/templates/admin/auth/user/change_password.html:39 -#: contrib/admin/templates/admin/auth/user/add_form.html:23 -msgid "Password (again)" -msgstr "Mot de passe (à nouveau)" - -#: contrib/admin/templates/admin/auth/user/change_password.html:40 -#: contrib/admin/templates/admin/auth/user/add_form.html:24 -msgid "Enter the same password as above, for verification." -msgstr "Entrez le même mot de passe que précedemment, par sécurité." - #: contrib/admin/templates/admin/auth/user/add_form.html:6 msgid "" "First, enter a username and password. Then, you'll be able to edit more user " @@ -1680,45 +550,96 @@ msgstr "" msgid "Username" msgstr "Nom d'utilisateur" -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_change_form.html:4 -#: contrib/admin/templates/registration/password_change_form.html:6 -#: contrib/admin/templates/registration/password_change_form.html:10 -msgid "Password change" -msgstr "Modification de votre mot de passe" +#: contrib/admin/templates/admin/auth/user/add_form.html:18 +#: contrib/admin/templates/admin/auth/user/change_password.html:33 +msgid "Password" +msgstr "Mot de passe" -#: contrib/admin/templates/registration/password_change_done.html:6 -#: contrib/admin/templates/registration/password_change_done.html:10 -msgid "Password change successful" -msgstr "Mot de passe modifié avec succés" +#: contrib/admin/templates/admin/auth/user/add_form.html:23 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password (again)" +msgstr "Mot de passe (à nouveau)" -#: contrib/admin/templates/registration/password_change_done.html:12 -msgid "Your password was changed." -msgstr "Votre mot de passe a été modifié." +#: contrib/admin/templates/admin/auth/user/add_form.html:24 +#: contrib/admin/templates/admin/auth/user/change_password.html:39 +msgid "Enter the same password as above, for verification." +msgstr "Entrez le même mot de passe que précedemment, par sécurité." -#: contrib/admin/templates/registration/password_reset_form.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:6 -#: contrib/admin/templates/registration/password_reset_form.html:10 -#: contrib/admin/templates/registration/password_reset_done.html:4 -msgid "Password reset" -msgstr "Réinitialisation de votre mot de passe" - -#: 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." +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#, python-format +msgid "Enter a new password for the user %(username)s." msgstr "" -"Mot de passe perdu ? Saisissez votre adresse de courriel ci-dessous et nous " -"annulerons votre mot de passe actuel avant de vous en faire parvenir un " -"nouveau par courriel." +"Entrez un nouveau mot de passe pour l'utilisateur %(username)s." -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "E-mail address:" -msgstr "Courriel :" +#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +msgid "Bookmarklets" +msgstr "Signets" -#: contrib/admin/templates/registration/password_reset_form.html:16 -msgid "Reset my password" -msgstr "Réinitialiser mon mot de passe" +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +msgid "Documentation bookmarklets" +msgstr "Documentation des signets" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:8 +msgid "" +"\n" +"

      To install bookmarklets, drag the link to your bookmarks\n" +"toolbar, or right-click the link and add it to your bookmarks. Now you can\n" +"select the bookmarklet from any page in the site. Note that some of these\n" +"bookmarklets require you to be viewing the site from a computer designated\n" +"as \"internal\" (talk to your system administrator if you aren't sure if\n" +"your computer is \"internal\").

      \n" +msgstr "" +"\n" +"

      Pour installer des signets, faîtes glisser le lien vers\n" +"votre barre de marques-pages, ou cliquez droit dessus et ajoutez-y le.\n" +"Maintenant, vous pouvez le sélectionner depuis n'importe quelle page\n" +"du site. Notez que certains d'entre eux nécessitent que vous visionniez\n" +"le site depuis un ordinateur dit \"interne\" (veuillez contacter votre\n" +"administrateur système si vous n'êtes pas sûr que votre ordinateur le soit)." +"

      \n" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:18 +msgid "Documentation for this page" +msgstr "Documentation pour cette page" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:19 +msgid "" +"Jumps you from any page to the documentation for the view that generates " +"that page." +msgstr "" +"Vous envoie de n'importe quelle page vers la documentation de la vue qui a " +"généré cette page." + +#: contrib/admin/templates/admin_doc/bookmarklets.html:21 +msgid "Show object ID" +msgstr "Afficher l'identifiant de l'objet" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:22 +msgid "" +"Shows the content-type and unique ID for pages that represent a single " +"object." +msgstr "" +"Montre le content-type et l'identifiant unique pour les pages qui " +"représentent un objet unique." + +#: contrib/admin/templates/admin_doc/bookmarklets.html:24 +msgid "Edit this object (current window)" +msgstr "Editer cet objet (fenêtre courante)" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:25 +msgid "Jumps to the admin page for pages that represent a single object." +msgstr "Renvoie à la page d'administration qui représente un objet seul." + +#: contrib/admin/templates/admin_doc/bookmarklets.html:27 +msgid "Edit this object (new window)" +msgstr "Editer cet objet (nouvelle fenêtre)" + +#: contrib/admin/templates/admin_doc/bookmarklets.html:28 +msgid "As above, but opens the admin page in a new window." +msgstr "" +"Comme ci-dessus, mais ouvre la page d'administration dans une nouvelle " +"fenêtre." #: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." @@ -1728,6 +649,54 @@ msgstr "Merci pour le temps que vous avez accordé à ce site aujourd'hui." msgid "Log in again" msgstr "Connectez vous à nouveau" +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +#: contrib/admin/templates/registration/password_change_form.html:5 +#: contrib/admin/templates/registration/password_change_form.html:9 +msgid "Password change" +msgstr "Modification de votre mot de passe" + +#: contrib/admin/templates/registration/password_change_done.html:5 +#: contrib/admin/templates/registration/password_change_done.html:9 +msgid "Password change successful" +msgstr "Mot de passe modifié avec succés" + +#: contrib/admin/templates/registration/password_change_done.html:11 +msgid "Your password was changed." +msgstr "Votre mot de passe a été modifié." + +#: contrib/admin/templates/registration/password_change_form.html:11 +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 "" +"Pour des raisons de sécurité, veuillez entrer votre ancien mot de passe puis " +"saisissez deux fois votre nouveau mot de passe afin que nous puissions " +"vérifier que vous l'avez tapé correctement." + +#: contrib/admin/templates/registration/password_change_form.html:16 +msgid "Old password:" +msgstr "Ancien mot de passe :" + +#: contrib/admin/templates/registration/password_change_form.html:18 +msgid "New password:" +msgstr "Nouveau mot de passe :" + +#: contrib/admin/templates/registration/password_change_form.html:20 +msgid "Confirm password:" +msgstr "Confirmation du mot de passe" + +#: contrib/admin/templates/registration/password_change_form.html:22 +msgid "Change my password" +msgstr "Modifier mon mot de passe" + +#: contrib/admin/templates/registration/password_reset_done.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:4 +#: contrib/admin/templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:10 +msgid "Password reset" +msgstr "Réinitialisation de votre mot de passe" + #: contrib/admin/templates/registration/password_reset_done.html:6 #: contrib/admin/templates/registration/password_reset_done.html:10 msgid "Password reset successful" @@ -1741,31 +710,6 @@ msgstr "" "Nous vous avons envoyé par courriel un nouveau mot de passe. Vous devriez le " "recevoir rapidement." -#: 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 "" -"Pour des raisons de sécurité, veuillez entrer votre ancien mot de passe puis " -"saisissez deux fois votre nouveau mot de passe afin que nous puissions " -"vérifier que vous l'avez tapé correctement." - -#: contrib/admin/templates/registration/password_change_form.html:17 -msgid "Old password:" -msgstr "Ancien mot de passe :" - -#: contrib/admin/templates/registration/password_change_form.html:19 -msgid "New password:" -msgstr "Nouveau mot de passe :" - -#: contrib/admin/templates/registration/password_change_form.html:21 -msgid "Confirm password:" -msgstr "Confirmation du mot de passe" - -#: contrib/admin/templates/registration/password_change_form.html:23 -msgid "Change my password" -msgstr "Modifier mon mot de passe" - #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "" @@ -1798,231 +742,335 @@ msgstr "Merci d'utiliser notre site !" msgid "The %(site_name)s team" msgstr "L'équipe %(site_name)s" -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -msgid "Bookmarklets" -msgstr "Signets" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:5 -msgid "Documentation bookmarklets" -msgstr "Documentation des signets" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:9 +#: contrib/admin/templates/registration/password_reset_form.html:12 msgid "" -"\n" -"

      To install bookmarklets, drag the link to your bookmarks\n" -"toolbar, or right-click the link and add it to your bookmarks. Now you can\n" -"select the bookmarklet from any page in the site. Note that some of these\n" -"bookmarklets require you to be viewing the site from a computer designated\n" -"as \"internal\" (talk to your system administrator if you aren't sure if\n" -"your computer is \"internal\").

      \n" +"Forgotten your password? Enter your e-mail address below, and we'll reset " +"your password and e-mail the new one to you." msgstr "" -"\n" -"

      Pour installer des signets, faîtes glisser le lien vers\n" -"votre barre de marques-pages, ou cliquez droit dessus et ajoutez-y le.\n" -"Maintenant, vous pouvez le sélectionner depuis n'importe quelle page\n" -"du site. Notez que certains d'entre eux nécessitent que vous visionniez\n" -"le site depuis un ordinateur dit \"interne\" (veuillez contacter votre\n" -"administrateur système si vous n'êtes pas sûr que votre ordinateur le soit)." -"

      \n" +"Mot de passe perdu ? Saisissez votre adresse de courriel ci-dessous et nous " +"annulerons votre mot de passe actuel avant de vous en faire parvenir un " +"nouveau par courriel." -#: contrib/admin/templates/admin_doc/bookmarklets.html:19 -msgid "Documentation for this page" -msgstr "Documentation pour cette page" +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "E-mail address:" +msgstr "Courriel :" -#: contrib/admin/templates/admin_doc/bookmarklets.html:20 +#: contrib/admin/templates/registration/password_reset_form.html:16 +msgid "Reset my password" +msgstr "Réinitialiser mon mot de passe" + +#: contrib/admin/templates/widget/date_time.html:3 +msgid "Date:" +msgstr "Date :" + +#: contrib/admin/templates/widget/date_time.html:4 +msgid "Time:" +msgstr "Heure :" + +#: contrib/admin/templates/widget/file.html:2 +msgid "Currently:" +msgstr "Actuellement :" + +#: contrib/admin/templates/widget/file.html:3 +msgid "Change:" +msgstr "Modification :" + +#: contrib/admin/templatetags/admin_list.py:257 +msgid "All dates" +msgstr "Toutes les dates" + +#: contrib/admin/views/auth.py:20 contrib/admin/views/main.py:267 +#, 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:25 contrib/admin/views/main.py:271 +#: contrib/admin/views/main.py:356 +msgid "You may edit it again below." +msgstr "Vous pouvez continuez de l'éditez ci-dessous." + +#: contrib/admin/views/auth.py:31 +msgid "Add user" +msgstr "Ajouter l'utilisateur" + +#: contrib/admin/views/auth.py:58 +msgid "Password changed successfully." +msgstr "Mot de passe modifié avec succés" + +#: contrib/admin/views/auth.py:65 +#, python-format +msgid "Change password: %s" +msgstr "Modifier le mot de passe : %s" + +#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60 msgid "" -"Jumps you from any page to the documentation for the view that generates " -"that page." +"Please enter a correct username and password. Note that both fields are case-" +"sensitive." msgstr "" -"Vous envoie de n'importe quelle page vers la documentation de la vue qui a " -"généré cette page." +"Veuillez saisir 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/templates/admin_doc/bookmarklets.html:22 -msgid "Show object ID" -msgstr "Afficher l'identifiant de l'objet" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:23 +#: contrib/admin/views/decorators.py:69 msgid "" -"Shows the content-type and unique ID for pages that represent a single " -"object." +"Please log in again, because your session has expired. Don't worry: Your " +"submission has been saved." msgstr "" -"Montre le content-type et l'identifiant unique pour les pages qui représentent un objet " -"unique." +"Veuillez vous reconnecter, car votre session a expiré. Ne vous inquiétez " +"pas, votre soumission a été enregistrée." -#: contrib/admin/templates/admin_doc/bookmarklets.html:25 -msgid "Edit this object (current window)" -msgstr "Editer cet objet (fenêtre courante)" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:26 -msgid "Jumps to the admin page for pages that represent a single object." -msgstr "Renvoie à la page d'administration qui représente un objet seul." - -#: contrib/admin/templates/admin_doc/bookmarklets.html:28 -msgid "Edit this object (new window)" -msgstr "Editer cet objet (nouvelle fenêtre)" - -#: contrib/admin/templates/admin_doc/bookmarklets.html:29 -msgid "As above, but opens the admin page in a new window." -msgstr "" -"Comme ci-dessus, mais ouvre la page d'administration dans une nouvelle " -"fenêtre." - -#: contrib/contenttypes/models.py:37 -msgid "python model class name" -msgstr "nom du module python" - -#: contrib/contenttypes/models.py:40 -msgid "content type" -msgstr "type de contenu" - -#: contrib/contenttypes/models.py:41 -msgid "content types" -msgstr "types de contenu" - -#: contrib/auth/views.py:41 -msgid "Logged out" -msgstr "Déconnecté" - -#: contrib/auth/models.py:51 contrib/auth/models.py:71 -msgid "name" -msgstr "nom" - -#: contrib/auth/models.py:53 -msgid "codename" -msgstr "nom de code" - -#: contrib/auth/models.py:56 -msgid "permission" -msgstr "permission" - -#: contrib/auth/models.py:57 contrib/auth/models.py:72 -msgid "permissions" -msgstr "permissions" - -#: contrib/auth/models.py:75 -msgid "group" -msgstr "groupe" - -#: contrib/auth/models.py:76 contrib/auth/models.py:113 -msgid "groups" -msgstr "groupes" - -#: contrib/auth/models.py:103 -msgid "username" -msgstr "nom d'utilisateur" - -#: contrib/auth/models.py:103 +#: contrib/admin/views/decorators.py:76 msgid "" -"Required. 30 characters or fewer. Alphanumeric characters only (letters, " -"digits and underscores)." +"Looks like your browser isn't configured to accept cookies. Please enable " +"cookies, reload this page, and try again." msgstr "" -"Requis. 30 caractères maximum, alphanumériques uniquement (lettres, " -"chiffres, et tirets bas _)." +"Il semblerait que votre navigateur n'accepte pas les cookies. Veuillezles " +"activer, recharger cette page, puis rééssayer." -#: contrib/auth/models.py:104 -msgid "first name" -msgstr "prénom" +#: contrib/admin/views/decorators.py:90 +msgid "Usernames cannot contain the '@' character." +msgstr "Les noms d'utilisateur ne peuvent contenir le caractère '@'" -#: contrib/auth/models.py:105 -msgid "last name" -msgstr "nom" +#: contrib/admin/views/decorators.py:92 +#, 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/auth/models.py:106 -msgid "e-mail address" -msgstr "courriel" +#: contrib/admin/views/doc.py:48 contrib/admin/views/doc.py:50 +#: contrib/admin/views/doc.py:52 +msgid "tag:" +msgstr "mot-clé :" -#: contrib/auth/models.py:107 -msgid "password" -msgstr "mot de passe" +#: contrib/admin/views/doc.py:79 contrib/admin/views/doc.py:81 +#: contrib/admin/views/doc.py:83 +msgid "filter:" +msgstr "filtre :" -#: contrib/auth/models.py:107 +#: contrib/admin/views/doc.py:137 contrib/admin/views/doc.py:139 +#: contrib/admin/views/doc.py:141 +msgid "view:" +msgstr "vue :" + +#: contrib/admin/views/doc.py:166 +#, python-format +msgid "App %r not found" +msgstr "L'application %r n'a pas été trouvée." + +#: contrib/admin/views/doc.py:173 +#, python-format +msgid "Model %(name)r not found in app %(label)r" +msgstr "Le modèle %(name)r n'a pas été trouvé dans l'application %(label)r" + +#: contrib/admin/views/doc.py:185 +#, python-format +msgid "the related `%(label)s.%(type)s` object" +msgstr "l'objet `%(label)s.%(type)s` en relation " + +#: contrib/admin/views/doc.py:185 contrib/admin/views/doc.py:207 +#: contrib/admin/views/doc.py:221 contrib/admin/views/doc.py:226 +msgid "model:" +msgstr "modèle :" + +#: contrib/admin/views/doc.py:216 +#, python-format +msgid "related `%(label)s.%(name)s` objects" +msgstr "les objets `%(label)s.%(name)s` en relation" + +#: contrib/admin/views/doc.py:221 +#, python-format +msgid "all %s" +msgstr "tous les %s" + +#: contrib/admin/views/doc.py:226 +#, python-format +msgid "number of %s" +msgstr "nombre de %s" + +#: contrib/admin/views/doc.py:231 +#, python-format +msgid "Fields on %s objects" +msgstr "Champs sur les objets %s" + +#: contrib/admin/views/doc.py:293 contrib/admin/views/doc.py:304 +#: contrib/admin/views/doc.py:306 contrib/admin/views/doc.py:312 +#: contrib/admin/views/doc.py:313 contrib/admin/views/doc.py:315 +msgid "Integer" +msgstr "Entier" + +#: contrib/admin/views/doc.py:294 +msgid "Boolean (Either True or False)" +msgstr "Booléen (Vrai ou Faux)" + +#: contrib/admin/views/doc.py:295 contrib/admin/views/doc.py:314 +#, python-format +msgid "String (up to %(max_length)s)" +msgstr "Chaîne de caractère (jusqu'à %(max_length)s)" + +#: contrib/admin/views/doc.py:296 +msgid "Comma-separated integers" +msgstr "Des entiers séparés par une virgule" + +#: contrib/admin/views/doc.py:297 +msgid "Date (without time)" +msgstr "Date (sans l'heure)" + +#: contrib/admin/views/doc.py:298 +msgid "Date (with time)" +msgstr "Date (avec l'heure)" + +#: contrib/admin/views/doc.py:299 +msgid "Decimal number" +msgstr "Nombre décimal" + +#: contrib/admin/views/doc.py:300 +msgid "E-mail address" +msgstr "Courriel" + +#: contrib/admin/views/doc.py:301 contrib/admin/views/doc.py:302 +#: contrib/admin/views/doc.py:305 +msgid "File path" +msgstr "Chemin vers le fichier" + +#: contrib/admin/views/doc.py:303 +msgid "Floating point number" +msgstr "Nombre à virgule flottante" + +#: contrib/admin/views/doc.py:307 contrib/comments/models.py:89 +msgid "IP address" +msgstr "adresse IP" + +#: contrib/admin/views/doc.py:309 +msgid "Boolean (Either True, False or None)" +msgstr "Booléen (Vrai, Faux ou None)" + +#: contrib/admin/views/doc.py:310 +msgid "Relation to parent model" +msgstr "Relation au modèle parent" + +#: contrib/admin/views/doc.py:311 +msgid "Phone number" +msgstr "Numéro de téléphone" + +#: contrib/admin/views/doc.py:316 +msgid "Text" +msgstr "Texte" + +#: contrib/admin/views/doc.py:317 +msgid "Time" +msgstr "Heure" + +#: contrib/admin/views/doc.py:318 contrib/flatpages/models.py:7 +msgid "URL" +msgstr "URL" + +#: contrib/admin/views/doc.py:319 +msgid "U.S. state (two uppercase letters)" +msgstr "État Américain (deux lettres majuscules)" + +#: contrib/admin/views/doc.py:320 +msgid "XML text" +msgstr "Texte XML" + +#: contrib/admin/views/doc.py:346 +#, python-format +msgid "%s does not appear to be a urlpattern object" +msgstr "%s ne semble pas être un objet urlpattern" + +#: contrib/admin/views/main.py:233 +msgid "Site administration" +msgstr "Gestion du site" + +#: contrib/admin/views/main.py:280 contrib/admin/views/main.py:365 +#, python-format +msgid "You may add another %s below." +msgstr "Vous pouvez ajouter un autre %s ci-dessous." + +#: contrib/admin/views/main.py:298 +#, python-format +msgid "Add %s" +msgstr "Ajouter %s" + +#: contrib/admin/views/main.py:344 +#, python-format +msgid "Added %s." +msgstr "Ajouté %s." + +#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346 +#: contrib/admin/views/main.py:348 core/validators.py:283 +#: db/models/manipulators.py:309 +msgid "and" +msgstr "et" + +#: contrib/admin/views/main.py:346 +#, python-format +msgid "Changed %s." +msgstr "Modifié %s." + +#: contrib/admin/views/main.py:348 +#, python-format +msgid "Deleted %s." +msgstr "Supprimé %s." + +#: contrib/admin/views/main.py:351 +msgid "No fields changed." +msgstr "Aucun champ modifié." + +#: contrib/admin/views/main.py:354 +#, 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/views/main.py:362 +#, python-format msgid "" -"Use '[algo]$[salt]$[hexdigest]' or use the change " -"password form." +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -"Utilisez [algo]$[salt]$[hexdigest]' ou le formulaire " -"de changement de mot de passe." +"L'objet %(name)s \"%(obj)s\" a été ajouté avec succès.Vous pouvez continuez " +"de l'éditez ci-dessous." -#: contrib/auth/models.py:108 -msgid "staff status" -msgstr "statut équipe" +#: contrib/admin/views/main.py:400 +#, python-format +msgid "Change %s" +msgstr "Changement %s" -#: contrib/auth/models.py:108 -msgid "Designates whether the user can log into this admin site." -msgstr "Précise si l'utilisateur peut se connecter à ce site d'administration." +#: contrib/admin/views/main.py:487 +#, python-format +msgid "One or more %(fieldname)s in %(name)s: %(obj)s" +msgstr "Un ou plusieurs %(fieldname)s dans %(name)s : %(obj)s" -#: contrib/auth/models.py:109 -msgid "active" -msgstr "actif" +#: contrib/admin/views/main.py:492 +#, python-format +msgid "One or more %(fieldname)s in %(name)s:" +msgstr "Un ou plusieurs %(fieldname)s dans %(name)s :" -#: contrib/auth/models.py:109 -msgid "" -"Designates whether this user can log into the Django admin. Unselect this " -"instead of deleting accounts." -msgstr "" -"Précise si l'utilisateur peut se connecter à l'administration. " -"Déselectionnez ceci plutôt que supprimer le compte." +#: contrib/admin/views/main.py:524 +#, 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/auth/models.py:110 -msgid "superuser status" -msgstr "statut super-utilisateur" +#: contrib/admin/views/main.py:527 +msgid "Are you sure?" +msgstr "Êtes-vous sûr ?" -#: contrib/auth/models.py:110 -msgid "" -"Designates that this user has all permissions without explicitly assigning " -"them." -msgstr "" -"Précise que l'utilisateur possède toutes les permissions sans les assigner " -"explicitement." +#: contrib/admin/views/main.py:549 +#, python-format +msgid "Change history: %s" +msgstr "Historique des changements : %s" -#: contrib/auth/models.py:111 -msgid "last login" -msgstr "dernière connexion" +#: contrib/admin/views/main.py:583 +#, python-format +msgid "Select %s" +msgstr "Sélectionnez %s" -#: contrib/auth/models.py:112 -msgid "date joined" -msgstr "date d'inscription" +#: contrib/admin/views/main.py:583 +#, python-format +msgid "Select %s to change" +msgstr "Sélectionnez %s pour changer" -#: contrib/auth/models.py:114 -msgid "" -"In addition to the permissions manually assigned, this user will also get " -"all permissions granted to each group he/she is in." -msgstr "" -"En plus des permissions qui lui sont manuellement assignées, cet utilisateur " -"recevra aussi toutes les permissions de tous les groupes auquels il " -"appartient. " - -#: contrib/auth/models.py:115 -msgid "user permissions" -msgstr "permissions de l'utilisateur" - -#: contrib/auth/models.py:119 -msgid "user" -msgstr "utilisateur" - -#: contrib/auth/models.py:120 -msgid "users" -msgstr "utilisateurs" - -#: contrib/auth/models.py:259 -msgid "message" -msgstr "message" - -#: contrib/auth/models.py:334 -msgid "Personal info" -msgstr "Information personnelle" - -#: contrib/auth/models.py:335 -msgid "Permissions" -msgstr "Permissions" - -#: contrib/auth/models.py:336 -msgid "Important dates" -msgstr "Dates importantes" - -#: contrib/auth/models.py:337 -msgid "Groups" -msgstr "Groupes" +#: contrib/admin/views/main.py:784 +msgid "Database error" +msgstr "Erreur de base de données" #: contrib/auth/forms.py:17 contrib/auth/forms.py:138 msgid "The two password fields didn't match." @@ -2052,6 +1100,11 @@ msgstr "" "Cette adresse e-mail ne correspond à aucun compte utilisateur. Êtes-vous sûr " "de vous être enregistré ?" +#: contrib/auth/forms.py:107 +#, python-format +msgid "Password reset on %s" +msgstr "Mot de passe réinitialisé le %s" + #: contrib/auth/forms.py:117 msgid "The two 'new password' fields didn't match." msgstr "Les deux champs \"nouveau mot de passe\" ne correspondent pas." @@ -2060,153 +1113,1195 @@ msgstr "Les deux champs \"nouveau mot de passe\" ne correspondent pas." msgid "Your old password was entered incorrectly. Please enter it again." msgstr "Votre ancien mot de passe est incorrect. Veuillez le rectifier." -#: contrib/admindocs/views.py:47 contrib/admindocs/views.py:49 -#: contrib/admindocs/views.py:51 -msgid "tag:" -msgstr "mot-clé :" +#: contrib/auth/models.py:73 contrib/auth/models.py:93 +msgid "name" +msgstr "nom" -#: contrib/admindocs/views.py:78 contrib/admindocs/views.py:80 -#: contrib/admindocs/views.py:82 -msgid "filter:" -msgstr "filtre :" +#: contrib/auth/models.py:75 +msgid "codename" +msgstr "nom de code" -#: contrib/admindocs/views.py:136 contrib/admindocs/views.py:138 -#: contrib/admindocs/views.py:140 -msgid "view:" -msgstr "vue :" +#: contrib/auth/models.py:78 +msgid "permission" +msgstr "permission" -#: contrib/admindocs/views.py:165 -#, python-format -msgid "App %r not found" -msgstr "L'application %r n'a pas été trouvée." +#: contrib/auth/models.py:79 contrib/auth/models.py:94 +msgid "permissions" +msgstr "permissions" -#: contrib/admindocs/views.py:172 -#, python-format -msgid "Model %(name)r not found in app %(app)r" -msgstr "Le modèle %(name)r n'a pas été trouvé dans l'application %(app)r" +#: contrib/auth/models.py:97 +msgid "group" +msgstr "groupe" -#: contrib/admindocs/views.py:184 -#, python-format -msgid "the related `%(app)s.%(type)s` object" -msgstr "l'objet `%(app)s.%(type)s` en relation " +#: contrib/auth/models.py:98 contrib/auth/models.py:141 +msgid "groups" +msgstr "groupes" -#: contrib/admindocs/views.py:184 contrib/admindocs/views.py:206 -#: contrib/admindocs/views.py:220 contrib/admindocs/views.py:225 -msgid "model:" -msgstr "modèle :" +#: contrib/auth/models.py:131 +msgid "username" +msgstr "nom d'utilisateur" -#: contrib/admindocs/views.py:215 -#, python-format -msgid "related `%(app)s.%(name)s` objects" -msgstr "les objets `%(app)s.%(name)s` en relation" - -#: contrib/admindocs/views.py:220 -#, python-format -msgid "all %s" -msgstr "tous les %s" - -#: contrib/admindocs/views.py:225 -#, python-format -msgid "number of %s" -msgstr "nombre de %s" - -#: contrib/admindocs/views.py:230 -#, python-format -msgid "Fields on %s objects" -msgstr "Champs sur les objets %s" - -#: contrib/admindocs/views.py:292 contrib/admindocs/views.py:302 -#: contrib/admindocs/views.py:304 contrib/admindocs/views.py:310 -#: contrib/admindocs/views.py:311 contrib/admindocs/views.py:313 -msgid "Integer" -msgstr "Entier" - -#: contrib/admindocs/views.py:293 -msgid "Boolean (Either True or False)" -msgstr "Booléen (Vrai ou Faux)" - -#: contrib/admindocs/views.py:294 contrib/admindocs/views.py:312 -#, python-format -msgid "String (up to %(maxlength)s)" -msgstr "Chaîne de caractère (jusqu'à %(maxlength)s)" - -#: contrib/admindocs/views.py:295 -msgid "Comma-separated integers" -msgstr "Des entiers séparés par une virgule" - -#: contrib/admindocs/views.py:296 -msgid "Date (without time)" -msgstr "Date (sans l'heure)" - -#: contrib/admindocs/views.py:297 -msgid "Date (with time)" -msgstr "Date (avec l'heure)" - -#: contrib/admindocs/views.py:298 -msgid "E-mail address" -msgstr "Courriel" - -#: contrib/admindocs/views.py:299 contrib/admindocs/views.py:300 -#: contrib/admindocs/views.py:303 -msgid "File path" -msgstr "Chemin vers le fichier" - -#: contrib/admindocs/views.py:301 -msgid "Decimal number" -msgstr "Nombre décimal" - -#: contrib/admindocs/views.py:307 -msgid "Boolean (Either True, False or None)" -msgstr "Booléen (Vrai, Faux ou None)" - -#: contrib/admindocs/views.py:308 -msgid "Relation to parent model" -msgstr "Relation au modèle parent" - -#: contrib/admindocs/views.py:309 -msgid "Phone number" -msgstr "Numéro de téléphone" - -#: contrib/admindocs/views.py:314 -msgid "Text" -msgstr "Texte" - -#: contrib/admindocs/views.py:315 -msgid "Time" -msgstr "Heure" - -#: contrib/admindocs/views.py:316 contrib/flatpages/models.py:7 -msgid "URL" -msgstr "URL" - -#: contrib/admindocs/views.py:317 -msgid "U.S. state (two uppercase letters)" -msgstr "État Américain (deux lettres majuscules)" - -#: contrib/admindocs/views.py:318 -msgid "XML text" -msgstr "Texte XML" - -#: contrib/admindocs/views.py:344 -#, python-format -msgid "%s does not appear to be a urlpattern object" -msgstr "%s ne semble pas être un objet urlpattern" - -#: contrib/localflavor/uk/forms.py:18 -msgid "Enter a postcode. A space is required between the two postcode parts." +#: contrib/auth/models.py:131 +msgid "" +"Required. 30 characters or fewer. Alphanumeric characters only (letters, " +"digits and underscores)." msgstr "" -"Entrez un code postal Anglais. Un espace est requis entre les deux parties." +"Requis. 30 caractères maximum, alphanumériques uniquement (lettres, " +"chiffres, et tirets bas _)." -#: contrib/localflavor/au/forms.py:18 +#: contrib/auth/models.py:132 +msgid "first name" +msgstr "prénom" + +#: contrib/auth/models.py:133 +msgid "last name" +msgstr "nom" + +#: contrib/auth/models.py:134 +msgid "e-mail address" +msgstr "courriel" + +#: contrib/auth/models.py:135 +msgid "password" +msgstr "mot de passe" + +#: contrib/auth/models.py:135 +msgid "" +"Use '[algo]$[salt]$[hexdigest]' or use the change " +"password form." +msgstr "" +"Utilisez [algo]$[salt]$[hexdigest]' ou le formulaire " +"de changement de mot de passe." + +#: contrib/auth/models.py:136 +msgid "staff status" +msgstr "statut équipe" + +#: contrib/auth/models.py:136 +msgid "Designates whether the user can log into this admin site." +msgstr "Précise si l'utilisateur peut se connecter à ce site d'administration." + +#: contrib/auth/models.py:137 +msgid "active" +msgstr "actif" + +#: contrib/auth/models.py:137 +msgid "" +"Designates whether this user can log into the Django admin. Unselect this " +"instead of deleting accounts." +msgstr "" +"Précise si l'utilisateur peut se connecter à l'administration. " +"Déselectionnez ceci plutôt que supprimer le compte." + +#: contrib/auth/models.py:138 +msgid "superuser status" +msgstr "statut super-utilisateur" + +#: contrib/auth/models.py:138 +msgid "" +"Designates that this user has all permissions without explicitly assigning " +"them." +msgstr "" +"Précise que l'utilisateur possède toutes les permissions sans les assigner " +"explicitement." + +#: contrib/auth/models.py:139 +msgid "last login" +msgstr "dernière connexion" + +#: contrib/auth/models.py:140 +msgid "date joined" +msgstr "date d'inscription" + +#: contrib/auth/models.py:142 +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "" +"En plus des permissions qui lui sont manuellement assignées, cet utilisateur " +"recevra aussi toutes les permissions de tous les groupes auquels il " +"appartient. " + +#: contrib/auth/models.py:143 +msgid "user permissions" +msgstr "permissions de l'utilisateur" + +#: contrib/auth/models.py:147 +msgid "user" +msgstr "utilisateur" + +#: contrib/auth/models.py:148 +msgid "users" +msgstr "utilisateurs" + +#: contrib/auth/models.py:154 +msgid "Personal info" +msgstr "Information personnelle" + +#: contrib/auth/models.py:155 +msgid "Permissions" +msgstr "Permissions" + +#: contrib/auth/models.py:156 +msgid "Important dates" +msgstr "Dates importantes" + +#: contrib/auth/models.py:157 +msgid "Groups" +msgstr "Groupes" + +#: contrib/auth/models.py:316 +msgid "message" +msgstr "message" + +#: contrib/auth/views.py:47 +msgid "Logged out" +msgstr "Déconnecté" + +#: contrib/comments/models.py:71 contrib/comments/models.py:176 +msgid "object ID" +msgstr "ID de l'objet" + +#: contrib/comments/models.py:72 +msgid "headline" +msgstr "titre" + +#: contrib/comments/models.py:73 contrib/comments/models.py:95 +#: contrib/comments/models.py:177 +msgid "comment" +msgstr "commentaire" + +#: contrib/comments/models.py:74 +msgid "rating #1" +msgstr "vote n°1" + +#: contrib/comments/models.py:75 +msgid "rating #2" +msgstr "vote n°2" + +#: contrib/comments/models.py:76 +msgid "rating #3" +msgstr "vote n°3" + +#: contrib/comments/models.py:77 +msgid "rating #4" +msgstr "vote n°4" + +#: contrib/comments/models.py:78 +msgid "rating #5" +msgstr "vote n°5" + +#: contrib/comments/models.py:79 +msgid "rating #6" +msgstr "vote n°6" + +#: contrib/comments/models.py:80 +msgid "rating #7" +msgstr "vote n°7" + +#: contrib/comments/models.py:81 +msgid "rating #8" +msgstr "vote n°8" + +#: contrib/comments/models.py:86 +msgid "is valid rating" +msgstr "est un vote valide" + +#: contrib/comments/models.py:87 contrib/comments/models.py:179 +msgid "date/time submitted" +msgstr "date et heure soumises" + +#: contrib/comments/models.py:88 contrib/comments/models.py:180 +msgid "is public" +msgstr "est public" + +#: contrib/comments/models.py:90 +msgid "is removed" +msgstr "est supprimé" + +#: contrib/comments/models.py:90 +msgid "" +"Check this box if the comment is inappropriate. A \"This comment has been " +"removed\" message will be displayed instead." +msgstr "" +"Cochez cette case si le commentaire est inadéquat. Un message type \"Ce " +"commentaire a été supprimé\" sera affiché en lieu et place de celui-ci." + +#: contrib/comments/models.py:96 +msgid "comments" +msgstr "commentaires" + +#: contrib/comments/models.py:140 contrib/comments/models.py:222 +msgid "Content object" +msgstr "Type de contenu" + +#: contrib/comments/models.py:168 +#, python-format +msgid "" +"Posted by %(user)s at %(date)s\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" +msgstr "" +"Posté par %(user)s à %(date)s\n" +"\n" +"%(comment)s\n" +"\n" +"http://%(domain)s%(url)s" + +#: contrib/comments/models.py:178 +msgid "person's name" +msgstr "nom de la personne" + +#: contrib/comments/models.py:181 +msgid "ip address" +msgstr "adresse IP" + +#: contrib/comments/models.py:183 +msgid "approved by staff" +msgstr "approuvé par l'équipe" + +#: contrib/comments/models.py:187 +msgid "free comment" +msgstr "commentaire libre" + +#: contrib/comments/models.py:188 +msgid "free comments" +msgstr "commentaires libres" + +#: contrib/comments/models.py:250 +msgid "score" +msgstr "evaluation" + +#: contrib/comments/models.py:251 +msgid "score date" +msgstr "date d'évaluation" + +#: contrib/comments/models.py:255 +msgid "karma score" +msgstr "point de Karma" + +#: contrib/comments/models.py:256 +msgid "karma scores" +msgstr "points de Karma" + +#: contrib/comments/models.py:260 +#, python-format +msgid "%(score)d rating by %(user)s" +msgstr "%(score)d évalué par %(user)s" + +#: contrib/comments/models.py:277 +#, python-format +msgid "" +"This comment was flagged by %(user)s:\n" +"\n" +"%(text)s" +msgstr "" +"Ce commentaire a été marqué par %(user)s:\n" +"\n" +"%(text)s" + +#: contrib/comments/models.py:285 +msgid "flag date" +msgstr "date d'indicateur" + +#: contrib/comments/models.py:289 +msgid "user flag" +msgstr "indicateur utilisateur" + +#: contrib/comments/models.py:290 +msgid "user flags" +msgstr "indicateurs utilisateur" + +#: contrib/comments/models.py:294 +#, python-format +msgid "Flag by %r" +msgstr "Indicateur par %r" + +#: contrib/comments/models.py:300 +msgid "deletion date" +msgstr "date de suppression" + +#: contrib/comments/models.py:303 +msgid "moderator deletion" +msgstr "suppression de modérateur" + +#: contrib/comments/models.py:304 +msgid "moderator deletions" +msgstr "suppressions de modérateur" + +#: contrib/comments/models.py:308 +#, python-format +msgid "Moderator deletion by %r" +msgstr "Suppression de modérateur par %r" + +#: contrib/comments/templates/comments/form.html:8 +msgid "Forgotten your password?" +msgstr "Mot de passe oublié ?" + +#: contrib/comments/templates/comments/form.html:12 +msgid "Ratings" +msgstr "Votes" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Required" +msgstr "Requis" + +#: contrib/comments/templates/comments/form.html:12 +#: contrib/comments/templates/comments/form.html:23 +msgid "Optional" +msgstr "Optionel" + +#: contrib/comments/templates/comments/form.html:23 +msgid "Post a photo" +msgstr "Poster une photo" + +#: contrib/comments/templates/comments/form.html:28 +#: contrib/comments/templates/comments/freeform.html:5 +msgid "Comment:" +msgstr "Commentaire :" + +#: contrib/comments/templates/comments/form.html:35 +#: contrib/comments/templates/comments/freeform.html:10 +msgid "Preview comment" +msgstr "Prévisualisation du commentaire" + +#: contrib/comments/templates/comments/freeform.html:4 +msgid "Your name:" +msgstr "Votre nom :" + +#: contrib/comments/views/comments.py:28 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "Ce vote est nécessaire car vous avez saisi au moins un autre vote." + +#: contrib/comments/views/comments.py:112 +#, python-format +msgid "" +"This comment was posted by a user who has posted fewer than %(count)s " +"comment:\n" +"\n" +"%(text)s" +"This comment was posted by a user who has posted fewer than %(count)s " +"comments:\n" +"\n" +"%(text)s" +msgstr "" +"Ce commentaire a été posté par un utilisateur qui a posté moins de %(count)s " +"commentaire :\n" +"\n" +"%(text)s" +"Ce commentaire a été posté par un utilisateur qui a posté moins de %(count)s " +"commentaires :\n" +"\n" +"%(text)s" + +#: contrib/comments/views/comments.py:117 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" +"Ce commentaire a été posté par un utilisateur imprécis :\n" +"\n" +"%(text)s" + +#: contrib/comments/views/comments.py:190 +#: contrib/comments/views/comments.py:283 +msgid "Only POSTs are allowed" +msgstr "Seuls les POSTs sont autorisés" + +#: contrib/comments/views/comments.py:194 +#: contrib/comments/views/comments.py:287 +msgid "One or more of the required fields wasn't submitted" +msgstr "Un ou plusieurs champs requis n'ont pas été remplis" + +#: contrib/comments/views/comments.py:198 +#: contrib/comments/views/comments.py:289 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" +"Quelqu'un a trafiqué le formulaire de commentaire (violation des règles de " +"sécurité)" + +#: contrib/comments/views/comments.py:208 +#: contrib/comments/views/comments.py:295 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" +"Ce formulaire de commentaire avait un paramètre cible invalide; " +"l'identifiant de l'objet était invalide" + +#: contrib/comments/views/comments.py:259 +#: contrib/comments/views/comments.py:324 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "" +"Le formulaire de commentaire ne proposait ni la prévisualisation ni l'envoi" + +#: contrib/comments/views/karma.py:21 +msgid "Anonymous users cannot vote" +msgstr "Les utilisateurs anonymes ne peuvent pas voter" + +#: contrib/comments/views/karma.py:25 +msgid "Invalid comment ID" +msgstr "Identifiant de commentaire invalide" + +#: contrib/comments/views/karma.py:27 +msgid "No voting for yourself" +msgstr "Impossible de voter pour soi-même" + +#: contrib/contenttypes/models.py:67 +msgid "python model class name" +msgstr "nom du module python" + +#: contrib/contenttypes/models.py:71 +msgid "content type" +msgstr "type de contenu" + +#: contrib/contenttypes/models.py:72 +msgid "content types" +msgstr "types de contenu" + +#: contrib/flatpages/models.py:8 +msgid "" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Par exemple : '/a_propos/contact/'. Vérifiez la présence du caractère '/' en " +"début et en fin de chaine." + +#: contrib/flatpages/models.py:9 +msgid "title" +msgstr "titre" + +#: contrib/flatpages/models.py:10 +msgid "content" +msgstr "contenu" + +#: contrib/flatpages/models.py:11 +msgid "enable comments" +msgstr "autoriser les commentaires" + +#: contrib/flatpages/models.py:12 +msgid "template name" +msgstr "nom du template" + +#: contrib/flatpages/models.py:13 +msgid "" +"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " +"will use 'flatpages/default.html'." +msgstr "" +"Par exemple: 'flatfiles/contact_page'. Sans définition, le système utilisera " +"'flatfiles/default'." + +#: contrib/flatpages/models.py:14 +msgid "registration required" +msgstr "enregistrement requis" + +#: contrib/flatpages/models.py:14 +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.py:18 +msgid "flat page" +msgstr "page statique" + +#: contrib/flatpages/models.py:19 +msgid "flat pages" +msgstr "pages statiques" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "th" +msgstr "e" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "st" +msgstr "er" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "nd" +msgstr "d" + +#: contrib/humanize/templatetags/humanize.py:19 +msgid "rd" +msgstr "e" + +#: contrib/humanize/templatetags/humanize.py:51 +#, python-format +msgid "%(value).1f million" +msgstr "%(value).1f million" + +#: contrib/humanize/templatetags/humanize.py:54 +#, python-format +msgid "%(value).1f billion" +msgstr "%(value).1f milliard" + +#: contrib/humanize/templatetags/humanize.py:57 +#, python-format +msgid "%(value).1f trillion" +msgstr "%(value).1f billion" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "one" +msgstr "un" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "two" +msgstr "deux" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "three" +msgstr "trois" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "four" +msgstr "quatre" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "five" +msgstr "cinq" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "six" +msgstr "six" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "seven" +msgstr "sept" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "eight" +msgstr "huit" + +#: contrib/humanize/templatetags/humanize.py:73 +msgid "nine" +msgstr "neuf" + +#: contrib/humanize/templatetags/humanize.py:93 +msgid "today" +msgstr "aujourd'hui" + +#: contrib/humanize/templatetags/humanize.py:95 +msgid "tomorrow" +msgstr "demain" + +#: contrib/humanize/templatetags/humanize.py:97 +msgid "yesterday" +msgstr "hier" + +#: contrib/localflavor/ar/forms.py:27 +msgid "Enter a postal code in the format NNNN or ANNNNAAA." +msgstr "Entrez un code postal au format NNNN ou ANNNNAAA." + +#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96 +#: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23 +#: contrib/localflavor/pe/forms.py:51 +msgid "This field requires only numbers." +msgstr "Ce champ ne doit contenir que des nombres." + +#: contrib/localflavor/ar/forms.py:50 +msgid "This field requires 7 or 8 digits." +msgstr "Ce champ requiert au 7 ou 8 chiffres." + +#: contrib/localflavor/ar/forms.py:79 +msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format." +msgstr "" +"Entrez un numéro CUIT (format XX-XXXXXXXX-X ou XXXXXXXXXXXX)." + +#: contrib/localflavor/ar/forms.py:80 +msgid "Invalid CUIT." +msgstr "CUIT invalide." + +#: contrib/localflavor/au/forms.py:16 msgid "Enter a 4 digit post code." msgstr "Entrez un code postal Australien (4 chiffres)." -#: contrib/localflavor/fr/forms.py:17 contrib/localflavor/de/forms.py:16 -#: contrib/localflavor/fi/forms.py:14 +#: contrib/localflavor/br/forms.py:21 +msgid "Enter a zip code in the format XXXXX-XXX." +msgstr "Entrez un code postal Brésilien (format XXXXX-XXX)." + +#: contrib/localflavor/br/forms.py:30 +msgid "Phone numbers must be in XX-XXXX-XXXX format." +msgstr "Les numéros de téléphone doivent être au format XX-XXXX-XXXX." + +#: contrib/localflavor/br/forms.py:58 +msgid "" +"Select a valid brazilian state. That state is not one of the available " +"states." +msgstr "" +"Sélectionnez un etat·brésilien valide. Cet etat ne fait pas partie de ceux " +"disponibles." + +#: contrib/localflavor/br/forms.py:94 +msgid "Invalid CPF number." +msgstr "Numéro CPF invalide." + +#: contrib/localflavor/br/forms.py:95 +msgid "This field requires at most 11 digits or 14 characters." +msgstr "Ce champ requiert au plus 11 chiffres ou 14 caractères." + +#: contrib/localflavor/br/forms.py:134 +msgid "Invalid CNPJ number." +msgstr "Numéro CNPJ invalide." + +#: contrib/localflavor/br/forms.py:136 +msgid "This field requires at least 14 digits" +msgstr "Ce champ requiert au minimum 14 chiffres." + +#: contrib/localflavor/ca/forms.py:17 +msgid "Enter a postal code in the format XXX XXX." +msgstr "Entrez un code postal au format XXX XXX." + +#: contrib/localflavor/ca/forms.py:88 +msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format." +msgstr "Entrez un numéro de sécurité sociale Canadien (format XXX-XXX-XXX)." + +#: contrib/localflavor/ch/ch_states.py:5 +msgid "Aargau" +msgstr "Argovie" + +#: contrib/localflavor/ch/ch_states.py:6 +msgid "Appenzell Innerrhoden" +msgstr "Appenzell Rhodes-Intérieures" + +#: contrib/localflavor/ch/ch_states.py:7 +msgid "Appenzell Ausserrhoden" +msgstr "Appenzell Rhodes-Extérieures" + +#: contrib/localflavor/ch/ch_states.py:8 +msgid "Basel-Stadt" +msgstr "Bâle-Ville" + +#: contrib/localflavor/ch/ch_states.py:9 +msgid "Basel-Land" +msgstr "Bâle-Campagne" + +#: contrib/localflavor/ch/ch_states.py:10 +msgid "Berne" +msgstr "Berne" + +#: contrib/localflavor/ch/ch_states.py:11 +msgid "Fribourg" +msgstr "Fribourg" + +#: contrib/localflavor/ch/ch_states.py:12 +msgid "Geneva" +msgstr "Genève" + +#: contrib/localflavor/ch/ch_states.py:13 +msgid "Glarus" +msgstr "Glaris" + +#: contrib/localflavor/ch/ch_states.py:14 +msgid "Graubuenden" +msgstr "Grisons" + +#: contrib/localflavor/ch/ch_states.py:15 +msgid "Jura" +msgstr "Jura" + +#: contrib/localflavor/ch/ch_states.py:16 +msgid "Lucerne" +msgstr "Lucerne" + +#: contrib/localflavor/ch/ch_states.py:17 +msgid "Neuchatel" +msgstr "Neuchâtel" + +#: contrib/localflavor/ch/ch_states.py:18 +msgid "Nidwalden" +msgstr "Nidwald" + +#: contrib/localflavor/ch/ch_states.py:19 +msgid "Obwalden" +msgstr "Obwald" + +#: contrib/localflavor/ch/ch_states.py:20 +msgid "Schaffhausen" +msgstr "Schaffhouse" + +#: contrib/localflavor/ch/ch_states.py:21 +msgid "Schwyz" +msgstr "Suisse" + +#: contrib/localflavor/ch/ch_states.py:22 +msgid "Solothurn" +msgstr "Soleure" + +#: contrib/localflavor/ch/ch_states.py:23 +msgid "St. Gallen" +msgstr "Saint Gall" + +#: contrib/localflavor/ch/ch_states.py:24 +msgid "Thurgau" +msgstr "Thuringe" + +#: contrib/localflavor/ch/ch_states.py:25 +msgid "Ticino" +msgstr "Tessin" + +#: contrib/localflavor/ch/ch_states.py:26 +msgid "Uri" +msgstr "Uri" + +#: contrib/localflavor/ch/ch_states.py:27 +msgid "Valais" +msgstr "Valais" + +#: contrib/localflavor/ch/ch_states.py:28 +msgid "Vaud" +msgstr "Vaud" + +#: contrib/localflavor/ch/ch_states.py:29 +msgid "Zug" +msgstr "Zoug" + +#: contrib/localflavor/ch/ch_states.py:30 +msgid "Zurich" +msgstr "Zurich" + +#: contrib/localflavor/ch/forms.py:16 contrib/localflavor/no/forms.py:12 +msgid "Enter a zip code in the format XXXX." +msgstr "Entrez un code postal Norvégien (format XXXX)." + +#: contrib/localflavor/ch/forms.py:64 +msgid "" +"Enter a valid Swiss identity or passport card number in X1234567<0 or " +"1234567890 format." +msgstr "" +"Entrez un numéro de passeport ou de carte d'identité valide au format " +"X1234567<0 ou 1234567890." + +#: contrib/localflavor/cl/forms.py:29 +msgid "Enter a valid Chilean RUT." +msgstr "Entrez un RUT Chilien valide." + +#: contrib/localflavor/cl/forms.py:30 +msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X." +msgstr "Entrez un RUT Chilien valide (format XX.XXX.XXX-X)." + +#: contrib/localflavor/cl/forms.py:31 +msgid "The Chilean RUT is not valid." +msgstr "Ce RUT chilien est invalide." + +#: contrib/localflavor/de/de_states.py:5 +msgid "Baden-Wuerttemberg" +msgstr "Bade-Wurtemberg" + +#: contrib/localflavor/de/de_states.py:6 +msgid "Bavaria" +msgstr "Bavière" + +#: contrib/localflavor/de/de_states.py:7 +msgid "Berlin" +msgstr "Berlin" + +#: contrib/localflavor/de/de_states.py:8 +msgid "Brandenburg" +msgstr "Brandebourg" + +#: contrib/localflavor/de/de_states.py:9 +msgid "Bremen" +msgstr "Brême" + +#: contrib/localflavor/de/de_states.py:10 +msgid "Hamburg" +msgstr "Hambourg" + +#: contrib/localflavor/de/de_states.py:11 +msgid "Hessen" +msgstr "Hess" + +#: contrib/localflavor/de/de_states.py:12 +msgid "Mecklenburg-Western Pomerania" +msgstr "Mecklembourg-Poméranie occidentale" + +#: contrib/localflavor/de/de_states.py:13 +msgid "Lower Saxony" +msgstr "Basse Saxe" + +#: contrib/localflavor/de/de_states.py:14 +msgid "North Rhine-Westphalia" +msgstr "Rhénanie-du-Nord-Westphalie" + +#: contrib/localflavor/de/de_states.py:15 +msgid "Rhineland-Palatinate" +msgstr "Rhénanie-Palatinat" + +#: contrib/localflavor/de/de_states.py:16 +msgid "Saarland" +msgstr "Sarre" + +#: contrib/localflavor/de/de_states.py:17 +msgid "Saxony" +msgstr "Saxe" + +#: contrib/localflavor/de/de_states.py:18 +msgid "Saxony-Anhalt" +msgstr "Saxe-Anhalt" + +#: contrib/localflavor/de/de_states.py:19 +msgid "Schleswig-Holstein" +msgstr "Schleswig-Holstein" + +#: contrib/localflavor/de/de_states.py:20 +msgid "Thuringia" +msgstr "Thuringe" + +#: contrib/localflavor/de/forms.py:14 contrib/localflavor/fi/forms.py:12 +#: contrib/localflavor/fr/forms.py:15 msgid "Enter a zip code in the format XXXXX." msgstr "Entrez un code postal (format XXXXX)." -#: contrib/localflavor/jp/forms.py:21 +#: contrib/localflavor/de/forms.py:41 +msgid "" +"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X " +"format." +msgstr "" +"Entrez un numéro de carte d'identité Allemand (format XXXXXXXXXXX-XXXXXXX-" +"XXXXXXX-X)." + +#: contrib/localflavor/es/es_provinces.py:5 +msgid "Arava" +msgstr "Álava" + +#: contrib/localflavor/es/es_provinces.py:6 +msgid "Albacete" +msgstr "Albacete" + +#: contrib/localflavor/es/es_provinces.py:7 +msgid "Alacant" +msgstr "Alicante" + +#: contrib/localflavor/es/es_provinces.py:8 +msgid "Almeria" +msgstr "Almería" + +#: contrib/localflavor/es/es_provinces.py:9 +msgid "Avila" +msgstr "Ávila" + +#: contrib/localflavor/es/es_provinces.py:10 +msgid "Badajoz" +msgstr "Badajoz" + +#: contrib/localflavor/es/es_provinces.py:11 +msgid "Illes Balears" +msgstr "Îles Baléares" + +#: contrib/localflavor/es/es_provinces.py:12 +msgid "Barcelona" +msgstr "Barcelone" + +#: contrib/localflavor/es/es_provinces.py:13 +msgid "Burgos" +msgstr "Burgos" + +#: contrib/localflavor/es/es_provinces.py:14 +msgid "Caceres" +msgstr "Cáceres" + +#: contrib/localflavor/es/es_provinces.py:15 +msgid "Cadiz" +msgstr "Cadix" + +#: contrib/localflavor/es/es_provinces.py:16 +msgid "Castello" +msgstr "Castellón" + +#: contrib/localflavor/es/es_provinces.py:17 +msgid "Ciudad Real" +msgstr "Ciudad Real" + +#: contrib/localflavor/es/es_provinces.py:18 +msgid "Cordoba" +msgstr "Córdoba" + +#: contrib/localflavor/es/es_provinces.py:19 +msgid "A Coruna" +msgstr "La Corogne" + +#: contrib/localflavor/es/es_provinces.py:20 +msgid "Cuenca" +msgstr "Cuenca" + +#: contrib/localflavor/es/es_provinces.py:21 +msgid "Girona" +msgstr "Gérone" + +#: contrib/localflavor/es/es_provinces.py:22 +msgid "Granada" +msgstr "Grenade" + +#: contrib/localflavor/es/es_provinces.py:23 +msgid "Guadalajara" +msgstr "Guadalajara" + +#: contrib/localflavor/es/es_provinces.py:24 +msgid "Guipuzkoa" +msgstr "Guipúzcoa" + +#: contrib/localflavor/es/es_provinces.py:25 +msgid "Huelva" +msgstr "Huelva" + +#: contrib/localflavor/es/es_provinces.py:26 +msgid "Huesca" +msgstr "Huesca" + +#: contrib/localflavor/es/es_provinces.py:27 +msgid "Jaen" +msgstr "Jaén" + +#: contrib/localflavor/es/es_provinces.py:28 +msgid "Leon" +msgstr "León" + +#: contrib/localflavor/es/es_provinces.py:29 +msgid "Lleida" +msgstr "Lérida" + +#: contrib/localflavor/es/es_provinces.py:30 +#: contrib/localflavor/es/es_regions.py:17 +msgid "La Rioja" +msgstr "La Rioja" + +#: contrib/localflavor/es/es_provinces.py:31 +msgid "Lugo" +msgstr "Lugo" + +#: contrib/localflavor/es/es_provinces.py:32 +#: contrib/localflavor/es/es_regions.py:18 +msgid "Madrid" +msgstr "Madrid" + +#: contrib/localflavor/es/es_provinces.py:33 +msgid "Malaga" +msgstr "Málaga" + +#: contrib/localflavor/es/es_provinces.py:34 +msgid "Murcia" +msgstr "Murcie" + +#: contrib/localflavor/es/es_provinces.py:35 +msgid "Navarre" +msgstr "Navarre" + +#: contrib/localflavor/es/es_provinces.py:36 +msgid "Ourense" +msgstr "Orense" + +#: contrib/localflavor/es/es_provinces.py:37 +msgid "Asturias" +msgstr "Asturias" + +#: contrib/localflavor/es/es_provinces.py:38 +msgid "Palencia" +msgstr "Palencia" + +#: contrib/localflavor/es/es_provinces.py:39 +msgid "Las Palmas" +msgstr "Las Palmas" + +#: contrib/localflavor/es/es_provinces.py:40 +msgid "Pontevedra" +msgstr "Pontevedra" + +#: contrib/localflavor/es/es_provinces.py:41 +msgid "Salamanca" +msgstr "Salamanca" + +#: contrib/localflavor/es/es_provinces.py:42 +msgid "Santa Cruz de Tenerife" +msgstr "Santa Cruz de Ténérife" + +#: contrib/localflavor/es/es_provinces.py:43 +#: contrib/localflavor/es/es_regions.py:11 +msgid "Cantabria" +msgstr "Cantabrie" + +#: contrib/localflavor/es/es_provinces.py:44 +msgid "Segovia" +msgstr "Ségovie" + +#: contrib/localflavor/es/es_provinces.py:45 +msgid "Seville" +msgstr "Séville" + +#: contrib/localflavor/es/es_provinces.py:46 +msgid "Soria" +msgstr "Soria" + +#: contrib/localflavor/es/es_provinces.py:47 +msgid "Tarragona" +msgstr "Tarragone" + +#: contrib/localflavor/es/es_provinces.py:48 +msgid "Teruel" +msgstr "Teruel" + +#: contrib/localflavor/es/es_provinces.py:49 +msgid "Toledo" +msgstr "Toledo" + +#: contrib/localflavor/es/es_provinces.py:50 +msgid "Valencia" +msgstr "Valence" + +#: contrib/localflavor/es/es_provinces.py:51 +msgid "Valladolid" +msgstr "Valladolid" + +#: contrib/localflavor/es/es_provinces.py:52 +msgid "Bizkaia" +msgstr "Biscaye" + +#: contrib/localflavor/es/es_provinces.py:53 +msgid "Zamora" +msgstr "Zamora" + +#: contrib/localflavor/es/es_provinces.py:54 +msgid "Zaragoza" +msgstr "Saragosse" + +#: contrib/localflavor/es/es_provinces.py:55 +msgid "Ceuta" +msgstr "Ceuta" + +#: contrib/localflavor/es/es_provinces.py:56 +msgid "Melilla" +msgstr "Melilla" + +#: contrib/localflavor/es/es_regions.py:5 +msgid "Andalusia" +msgstr "Andalousie" + +#: contrib/localflavor/es/es_regions.py:6 +msgid "Aragon" +msgstr "Aragon" + +#: contrib/localflavor/es/es_regions.py:7 +msgid "Principality of Asturias" +msgstr "Principauté des Asturies" + +#: contrib/localflavor/es/es_regions.py:8 +msgid "Balearic Islands" +msgstr "Îles Baléares" + +#: contrib/localflavor/es/es_regions.py:9 +msgid "Basque Country" +msgstr "Pays basque" + +#: contrib/localflavor/es/es_regions.py:10 +msgid "Canary Islands" +msgstr "Îles Canaries" + +#: contrib/localflavor/es/es_regions.py:12 +msgid "Castile-La Mancha" +msgstr "Castille-La Manche" + +#: contrib/localflavor/es/es_regions.py:13 +msgid "Castile and Leon" +msgstr "Castille-et-León" + +#: contrib/localflavor/es/es_regions.py:14 +msgid "Catalonia" +msgstr "Catalogne" + +#: contrib/localflavor/es/es_regions.py:15 +msgid "Extremadura" +msgstr "Estrémadure" + +#: contrib/localflavor/es/es_regions.py:16 +msgid "Galicia" +msgstr "Galice" + +#: contrib/localflavor/es/es_regions.py:19 +msgid "Region of Murcia" +msgstr "Murcie" + +#: contrib/localflavor/es/es_regions.py:20 +msgid "Foral Community of Navarre" +msgstr "Navarre" + +#: contrib/localflavor/es/es_regions.py:21 +msgid "Valencian Community" +msgstr "Communauté valencienne" + +#: contrib/localflavor/es/forms.py:19 +msgid "Enter a valid postal code in the range and format 01XXX - 52XXX." +msgstr "Entrez un code postal dans la plage et au format 01XXX - 52XXX." + +#: contrib/localflavor/es/forms.py:39 +msgid "" +"Enter a valid phone number in one of the formats 6XXXXXXXX, 8XXXXXXXX or " +"9XXXXXXXX." +msgstr "Entrez un numero de téléphone au format 6XXXXXXXX, 8XXXXXXXX ou " +"9XXXXXXXX." + +#: contrib/localflavor/es/forms.py:66 +msgid "Please enter a valid NIF, NIE, or CIF." +msgstr "Veuillez entrer une adresse NIF, NIE ou CIF valide." + +#: contrib/localflavor/es/forms.py:67 +msgid "Please enter a valid NIF or NIE." +msgstr "Entrez un NIF ou NIE valide." + +#: contrib/localflavor/es/forms.py:68 +msgid "Invalid checksum for NIF." +msgstr "Mauvais checksum pour NIF." + +#: contrib/localflavor/es/forms.py:69 +msgid "Invalid checksum for NIE." +msgstr "Mauvais checksum pour NIE." + +#: contrib/localflavor/es/forms.py:70 +msgid "Invalid checksum for CIF." +msgstr "Mauvais checksum pour CIF." + +#: contrib/localflavor/es/forms.py:142 +msgid "" +"Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX." +msgstr "Veuillez entrer un numéro de compte bancaire valide au format XXXXX-XXXX-XX-XXXXXXXXXX." + +#: contrib/localflavor/es/forms.py:143 +msgid "Invalid checksum for bank account number." +msgstr "Mauvais checksum pour le numero de compte bancaire." + +#: contrib/localflavor/fi/forms.py:28 +msgid "Enter a valid Finnish social security number." +msgstr "Entrez un numéro de sécurité sociale Finlandais." + +#: contrib/localflavor/in_/forms.py:14 +msgid "Enter a zip code in the format XXXXXXX." +msgstr "Entrez un code postal au format XXXXXXX." + +#: contrib/localflavor/is_/forms.py:17 +msgid "" +"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX." +msgstr "Entrez un code postal islandais valide (format XXXXXX-XXXX)." + +#: contrib/localflavor/is_/forms.py:18 +msgid "The Icelandic identification number is not valid." +msgstr "Le numéro d'identification Islandais est invalide." + +#: contrib/localflavor/it/forms.py:14 +msgid "Enter a valid zip code." +msgstr "Entrez un code postal valide." + +#: contrib/localflavor/it/forms.py:43 +msgid "Enter a valid Social Security number." +msgstr "Entrez un numéro valide de Sécurité Sociale." + +#: contrib/localflavor/it/forms.py:68 +msgid "Enter a valid VAT number." +msgstr "Entrez une TVA valide." + +#: contrib/localflavor/jp/forms.py:17 msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX." msgstr "Entrez un code postal Japonais (format XXXXXXX ou XXX-XXXX)." @@ -2398,335 +2493,1603 @@ msgstr "Kagoshima" msgid "Okinawa" msgstr "Okinawa" -#: contrib/localflavor/br/forms.py:18 -msgid "Enter a zip code in the format XXXXX-XXX." -msgstr "Entrez un code postal Brésilien (format XXXXX-XXX)." +#: contrib/localflavor/mx/mx_states.py:12 +msgid "Aguascalientes" +msgstr "Aguascalientes" -#: contrib/localflavor/br/forms.py:30 -msgid "Phone numbers must be in XX-XXXX-XXXX format." -msgstr "Les numéros de téléphone doivent être au format XX-XXXX-XXXX." +#: contrib/localflavor/mx/mx_states.py:13 +msgid "Baja California" +msgstr "Baja California" -#: contrib/localflavor/br/forms.py:72 -msgid "This field requires only numbers." -msgstr "Ce champ ne doit contenir que des nombres." +#: contrib/localflavor/mx/mx_states.py:14 +msgid "Baja California Sur" +msgstr "Baja California Sur" -#: contrib/localflavor/br/forms.py:74 -msgid "This field requires at most 11 digits or 14 characters." -msgstr "Ce champ requiert au plus 11 chiffres ou 14 caractères." +#: contrib/localflavor/mx/mx_states.py:15 +msgid "Campeche" +msgstr "Campeche" -#: contrib/localflavor/br/forms.py:84 -msgid "Invalid CPF number." -msgstr "Numéro CPF invalide." +#: contrib/localflavor/mx/mx_states.py:16 +msgid "Chihuahua" +msgstr "Chihuahua" -#: contrib/localflavor/br/forms.py:106 -msgid "This field requires at least 14 digits" -msgstr "Ce champ requiert au minimum 14 chiffres." +#: contrib/localflavor/mx/mx_states.py:17 +msgid "Chiapas" +msgstr "Chiapas" -#: contrib/localflavor/br/forms.py:116 -msgid "Invalid CNPJ number." -msgstr "Numéro CNPJ invalide." +#: contrib/localflavor/mx/mx_states.py:18 +msgid "Coahuila" +msgstr "Coahuila" -#: contrib/localflavor/de/de_states.py:5 -msgid "Baden-Wuerttemberg" -msgstr "Bade-Wurtemberg" +#: contrib/localflavor/mx/mx_states.py:19 +msgid "Colima" +msgstr "Colima" -#: contrib/localflavor/de/de_states.py:6 -msgid "Bavaria" -msgstr "Bavière" +#: contrib/localflavor/mx/mx_states.py:20 +msgid "Distrito Federal" +msgstr "District fédéral" -#: contrib/localflavor/de/de_states.py:7 -msgid "Berlin" -msgstr "Berlin" +#: contrib/localflavor/mx/mx_states.py:21 +msgid "Durango" +msgstr "Durango" -#: contrib/localflavor/de/de_states.py:8 -msgid "Brandenburg" -msgstr "Brandebourg" +#: contrib/localflavor/mx/mx_states.py:22 +msgid "Guerrero" +msgstr "Guerrero" -#: contrib/localflavor/de/de_states.py:9 -msgid "Bremen" -msgstr "Brême" +#: contrib/localflavor/mx/mx_states.py:23 +msgid "Guanajuato" +msgstr "Guanajuato" -#: contrib/localflavor/de/de_states.py:10 -msgid "Hamburg" -msgstr "Hambourg" +#: contrib/localflavor/mx/mx_states.py:24 +msgid "Hidalgo" +msgstr "Hidalgo" -#: contrib/localflavor/de/de_states.py:11 -msgid "Hessen" -msgstr "Hess" +#: contrib/localflavor/mx/mx_states.py:25 +msgid "Jalisco" +msgstr "Jalisco" -#: contrib/localflavor/de/de_states.py:12 -msgid "Mecklenburg-Western Pomerania" -msgstr "Mecklembourg-Poméranie occidentale" +#: contrib/localflavor/mx/mx_states.py:26 +msgid "Estado de México" +msgstr "État de Mexico" -#: contrib/localflavor/de/de_states.py:13 -msgid "Lower Saxony" -msgstr "Basse Saxe" +#: contrib/localflavor/mx/mx_states.py:27 +msgid "Michoacán" +msgstr "Michoacán" -#: contrib/localflavor/de/de_states.py:14 -msgid "North Rhine-Westphalia" -msgstr "Rhénanie-du-Nord-Westphalie" +#: contrib/localflavor/mx/mx_states.py:28 +msgid "Morelos" +msgstr "Morelos" -#: contrib/localflavor/de/de_states.py:15 -msgid "Rhineland-Palatinate" -msgstr "Rhénanie-Palatinat" +#: contrib/localflavor/mx/mx_states.py:29 +msgid "Nayarit" +msgstr "Nayarit" -#: contrib/localflavor/de/de_states.py:16 -msgid "Saarland" -msgstr "Sarre" +#: contrib/localflavor/mx/mx_states.py:30 +msgid "Nuevo León" +msgstr "Nuevo León" -#: contrib/localflavor/de/de_states.py:17 -msgid "Saxony" -msgstr "Saxe" +#: contrib/localflavor/mx/mx_states.py:31 +msgid "Oaxaca" +msgstr "Oaxaca" -#: contrib/localflavor/de/de_states.py:18 -msgid "Saxony-Anhalt" -msgstr "Saxe-Anhalt" +#: contrib/localflavor/mx/mx_states.py:32 +msgid "Puebla" +msgstr "Puebla" -#: contrib/localflavor/de/de_states.py:19 -msgid "Schleswig-Holstein" -msgstr "Schleswig-Holstein" +#: contrib/localflavor/mx/mx_states.py:33 +msgid "Querétaro" +msgstr "Querétaro" -#: contrib/localflavor/de/de_states.py:20 -msgid "Thuringia" -msgstr "Thuringe" +#: contrib/localflavor/mx/mx_states.py:34 +msgid "Quintana Roo" +msgstr "Quintana Roo" -#: contrib/localflavor/de/forms.py:60 -msgid "" -"Enter a valid German identity card number in XXXXXXXXXXX-XXXXXXX-XXXXXXX-X " -"format." -msgstr "" -"Entrez un numéro de carte d'identité Allemand (format XXXXXXXXXXX-XXXXXXX-" -"XXXXXXX-X)." +#: contrib/localflavor/mx/mx_states.py:35 +msgid "Sinaloa" +msgstr "Sinaloa" -#: contrib/localflavor/it/forms.py:16 -msgid "Enter a valid zip code." +#: contrib/localflavor/mx/mx_states.py:36 +msgid "San Luis Potosí" +msgstr "San Luis Potosí" + +#: contrib/localflavor/mx/mx_states.py:37 +msgid "Sonora" +msgstr "Sonora" + +#: contrib/localflavor/mx/mx_states.py:38 +msgid "Tabasco" +msgstr "Tabasco" + +#: contrib/localflavor/mx/mx_states.py:39 +msgid "Tamaulipas" +msgstr "Tamaulipas" + +#: contrib/localflavor/mx/mx_states.py:40 +msgid "Tlaxcala" +msgstr "Tlaxcala" + +#: contrib/localflavor/mx/mx_states.py:41 +msgid "Veracruz" +msgstr "Veracruz" + +#: contrib/localflavor/mx/mx_states.py:42 +msgid "Yucatán" +msgstr "Yucatán" + +#: contrib/localflavor/mx/mx_states.py:43 +msgid "Zacatecas" +msgstr "Zacatecas" + +#: contrib/localflavor/nl/forms.py:21 +msgid "Enter a valid postal code" msgstr "Entrez un code postal valide." -#: contrib/localflavor/it/forms.py:41 -msgid "Enter a valid Social Security number." -msgstr "Entrez un numéro valide de Sécurité Sociale." +#: contrib/localflavor/nl/forms.py:52 +msgid "Enter a valid phone number" +msgstr "Entrez un numero de telephone valide." -#: contrib/localflavor/it/forms.py:68 -msgid "Enter a valid VAT number." -msgstr "Entrez une TVA valide." +#: contrib/localflavor/nl/forms.py:78 +msgid "Enter a valid SoFi number" +msgstr "Entrez un numero SoFi valide." -#: contrib/localflavor/no/forms.py:15 contrib/localflavor/ch/forms.py:18 -msgid "Enter a zip code in the format XXXX." -msgstr "Entrez un code postal Norvégien (format XXXX)." +#: contrib/localflavor/nl/nl_provinces.py:4 +msgid "Drente" +msgstr "Drenthe" -#: contrib/localflavor/no/forms.py:36 +#: contrib/localflavor/nl/nl_provinces.py:5 +msgid "Flevoland" +msgstr "Flevoland" + +#: contrib/localflavor/nl/nl_provinces.py:6 +msgid "Friesland" +msgstr "Frise" + +#: contrib/localflavor/nl/nl_provinces.py:7 +msgid "Gelderland" +msgstr "Gueldre" + +#: contrib/localflavor/nl/nl_provinces.py:8 +msgid "Groningen" +msgstr "Groningue" + +#: contrib/localflavor/nl/nl_provinces.py:9 +msgid "Limburg" +msgstr "Limbourg" + +#: contrib/localflavor/nl/nl_provinces.py:10 +msgid "Noord-Brabant" +msgstr "Brabant-du-Nord" + +#: contrib/localflavor/nl/nl_provinces.py:11 +msgid "Noord-Holland" +msgstr "Hollande-du-Nord" + +#: contrib/localflavor/nl/nl_provinces.py:12 +msgid "Overijssel" +msgstr "Overijssel" + +#: contrib/localflavor/nl/nl_provinces.py:13 +msgid "Utrecht" +msgstr "Utrecht" + +#: contrib/localflavor/nl/nl_provinces.py:14 +msgid "Zeeland" +msgstr "Zeeland" + +#: contrib/localflavor/nl/nl_provinces.py:15 +msgid "Zuid-Holland" +msgstr "Hollande-Méridionale" + +#: contrib/localflavor/no/forms.py:33 msgid "Enter a valid Norwegian social security number." msgstr "Entrez un numéro de sécurité sociale Norvégien." -#: contrib/localflavor/fi/forms.py:40 contrib/localflavor/fi/forms.py:45 -msgid "Enter a valid Finnish social security number." -msgstr "Entrez un numéro de sécurité sociale Finlandais." +#: contrib/localflavor/pe/forms.py:24 +msgid "This field requires 8 digits." +msgstr "Ce champ requiert 8 chiffres." -#: contrib/localflavor/us/forms.py:18 +#: contrib/localflavor/pe/forms.py:52 +msgid "This field requires 11 digits." +msgstr "Ce champ requiert 11 chiffres." + +#: contrib/localflavor/pl/forms.py:39 +msgid "National Identification Number consists of 11 digits." +msgstr "Le numéro national d'identification (NIN) comporte 11 chiffres." + +#: contrib/localflavor/pl/forms.py:40 +msgid "Wrong checksum for the National Identification Number." +msgstr "Mavais checksum pour le·\"National·Identification·Number\"." + +#: contrib/localflavor/pl/forms.py:72 +msgid "" +"Enter a tax number field (NIP) in the format XXX-XXX-XX-XX or XX-XX-XXX-XXX." +msgstr "Entrez un code NIP (impots) au format XXX-XXX-XX-XX ou XX-XX-XXX-XXX." + +#: contrib/localflavor/pl/forms.py:73 +msgid "Wrong checksum for the Tax Number (NIP)." +msgstr "Mavais checksum pour le \"Tax·Number\"·(NIP)." + +#: contrib/localflavor/pl/forms.py:112 +msgid "National Business Register Number (REGON) consists of 7 or 9 digits." +msgstr "Le \"National·Business·Register·Number\"·(REGON) comporte 7 ou 9 chiffres." + +#: contrib/localflavor/pl/forms.py:113 +msgid "Wrong checksum for the National Business Register Number (REGON)." +msgstr "Mavais checksum pour le \"National·Business·Register·Number\"·(REGON)." + +#: contrib/localflavor/pl/forms.py:156 +msgid "Enter a postal code in the format XX-XXX." +msgstr "Entrez un code postal au format XX-XXX." + +#: contrib/localflavor/pl/pl_voivodeships.py:8 +msgid "Lower Silesia" +msgstr "Basse-Silésie" + +#: contrib/localflavor/pl/pl_voivodeships.py:9 +msgid "Kuyavia-Pomerania" +msgstr "Cujavie-Poméranie" + +#: contrib/localflavor/pl/pl_voivodeships.py:10 +msgid "Lublin" +msgstr "Lublin" + +#: contrib/localflavor/pl/pl_voivodeships.py:11 +msgid "Lubusz" +msgstr "Lubusz" + +#: contrib/localflavor/pl/pl_voivodeships.py:12 +msgid "Lodz" +msgstr "Łódź" + +#: contrib/localflavor/pl/pl_voivodeships.py:13 +msgid "Lesser Poland" +msgstr "Petite-Pologne" + +#: contrib/localflavor/pl/pl_voivodeships.py:14 +msgid "Masovia" +msgstr "Mazovie " + +#: contrib/localflavor/pl/pl_voivodeships.py:15 +msgid "Opole" +msgstr "Opole" + +#: contrib/localflavor/pl/pl_voivodeships.py:16 +msgid "Subcarpatia" +msgstr "Basses-Carpates" + +#: contrib/localflavor/pl/pl_voivodeships.py:17 +msgid "Podlasie" +msgstr "Podlachie" + +#: contrib/localflavor/pl/pl_voivodeships.py:18 +msgid "Pomerania" +msgstr "Poméranie" + +#: contrib/localflavor/pl/pl_voivodeships.py:19 +msgid "Silesia" +msgstr "Silésie" + +#: contrib/localflavor/pl/pl_voivodeships.py:20 +msgid "Swietokrzyskie" +msgstr "Swietokrzyskie" + +#: contrib/localflavor/pl/pl_voivodeships.py:21 +msgid "Warmia-Masuria" +msgstr "Varmie-Mazurie" + +#: contrib/localflavor/pl/pl_voivodeships.py:22 +msgid "Greater Poland" +msgstr "Grande-Pologne" + +#: contrib/localflavor/pl/pl_voivodeships.py:23 +msgid "West Pomerania" +msgstr "Poméranie Occidentale" + +#: contrib/localflavor/sk/forms.py:30 +msgid "Enter a postal code in the format XXXXX or XXX XX." +msgstr "Entrez un code postal au format XXXXX ou XXX XX." + +#: contrib/localflavor/sk/sk_districts.py:8 +msgid "Banska Bystrica" +msgstr "Banská Bystrica" + +#: contrib/localflavor/sk/sk_districts.py:9 +msgid "Banska Stiavnica" +msgstr "Banská Štiavnica" + +#: contrib/localflavor/sk/sk_districts.py:10 +msgid "Bardejov" +msgstr "Bardejov" + +#: contrib/localflavor/sk/sk_districts.py:11 +msgid "Banovce nad Bebravou" +msgstr "Bánovce nad Bebravou" + +#: contrib/localflavor/sk/sk_districts.py:12 +msgid "Brezno" +msgstr "Brezno" + +#: contrib/localflavor/sk/sk_districts.py:13 +msgid "Bratislava I" +msgstr "Bratislava·I" + +#: contrib/localflavor/sk/sk_districts.py:14 +msgid "Bratislava II" +msgstr "Bratislava·II" + +#: contrib/localflavor/sk/sk_districts.py:15 +msgid "Bratislava III" +msgstr "Bratislava·III" + +#: contrib/localflavor/sk/sk_districts.py:16 +msgid "Bratislava IV" +msgstr "Bratislava·IV" + +#: contrib/localflavor/sk/sk_districts.py:17 +msgid "Bratislava V" +msgstr "Bratislava·V" + +#: contrib/localflavor/sk/sk_districts.py:18 +msgid "Bytca" +msgstr "Bytča" + +#: contrib/localflavor/sk/sk_districts.py:19 +msgid "Cadca" +msgstr "Čadca" + +#: contrib/localflavor/sk/sk_districts.py:20 +msgid "Detva" +msgstr "Detva" + +#: contrib/localflavor/sk/sk_districts.py:21 +msgid "Dolny Kubin" +msgstr "Dolný Kubín" + +#: contrib/localflavor/sk/sk_districts.py:22 +msgid "Dunajska Streda" +msgstr "Dunajská Streda" + +#: contrib/localflavor/sk/sk_districts.py:23 +msgid "Galanta" +msgstr "Galanta" + +#: contrib/localflavor/sk/sk_districts.py:24 +msgid "Gelnica" +msgstr "Gelnica" + +#: contrib/localflavor/sk/sk_districts.py:25 +msgid "Hlohovec" +msgstr "Hlohovec" + +#: contrib/localflavor/sk/sk_districts.py:26 +msgid "Humenne" +msgstr "Humenné" + +#: contrib/localflavor/sk/sk_districts.py:27 +msgid "Ilava" +msgstr "Ilava" + +#: contrib/localflavor/sk/sk_districts.py:28 +msgid "Kezmarok" +msgstr "Kežmarok" + +#: contrib/localflavor/sk/sk_districts.py:29 +msgid "Komarno" +msgstr "Komárno" + +#: contrib/localflavor/sk/sk_districts.py:30 +msgid "Kosice I" +msgstr "Košice I" + +#: contrib/localflavor/sk/sk_districts.py:31 +msgid "Kosice II" +msgstr "Košice·II" + +#: contrib/localflavor/sk/sk_districts.py:32 +msgid "Kosice III" +msgstr "Košice III" + +#: contrib/localflavor/sk/sk_districts.py:33 +msgid "Kosice IV" +msgstr "Košice·IV" + +#: contrib/localflavor/sk/sk_districts.py:34 +msgid "Kosice - okolie" +msgstr "Košice–okolie" + +#: contrib/localflavor/sk/sk_districts.py:35 +msgid "Krupina" +msgstr "Krupina" + +#: contrib/localflavor/sk/sk_districts.py:36 +msgid "Kysucke Nove Mesto" +msgstr "Kysucké Nové Mesto" + +#: contrib/localflavor/sk/sk_districts.py:37 +msgid "Levice" +msgstr "Levice" + +#: contrib/localflavor/sk/sk_districts.py:38 +msgid "Levoca" +msgstr "Levoča" + +#: contrib/localflavor/sk/sk_districts.py:39 +msgid "Liptovsky Mikulas" +msgstr "Liptovský Mikuláš" + +#: contrib/localflavor/sk/sk_districts.py:40 +msgid "Lucenec" +msgstr "Lučenec" + +#: contrib/localflavor/sk/sk_districts.py:41 +msgid "Malacky" +msgstr "Malacky" + +#: contrib/localflavor/sk/sk_districts.py:42 +msgid "Martin" +msgstr "Martin" + +#: contrib/localflavor/sk/sk_districts.py:43 +msgid "Medzilaborce" +msgstr "Medzilaborce" + +#: contrib/localflavor/sk/sk_districts.py:44 +msgid "Michalovce" +msgstr "Michalovce" + +#: contrib/localflavor/sk/sk_districts.py:45 +msgid "Myjava" +msgstr "Myjava" + +#: contrib/localflavor/sk/sk_districts.py:46 +msgid "Namestovo" +msgstr "Námestovo" + +#: contrib/localflavor/sk/sk_districts.py:47 +msgid "Nitra" +msgstr "Nitra" + +#: contrib/localflavor/sk/sk_districts.py:48 +msgid "Nove Mesto nad Vahom" +msgstr "Nové Mesto nad Váhom" + +#: contrib/localflavor/sk/sk_districts.py:49 +msgid "Nove Zamky" +msgstr "Nové Zámky" + +#: contrib/localflavor/sk/sk_districts.py:50 +msgid "Partizanske" +msgstr "Partizánske" + +#: contrib/localflavor/sk/sk_districts.py:51 +msgid "Pezinok" +msgstr "Pezinok" + +#: contrib/localflavor/sk/sk_districts.py:52 +msgid "Piestany" +msgstr "Piešťany" + +#: contrib/localflavor/sk/sk_districts.py:53 +msgid "Poltar" +msgstr "Poltár" + +#: contrib/localflavor/sk/sk_districts.py:54 +msgid "Poprad" +msgstr "Poprad" + +#: contrib/localflavor/sk/sk_districts.py:55 +msgid "Povazska Bystrica" +msgstr "Považská Bystrica" + +#: contrib/localflavor/sk/sk_districts.py:56 +msgid "Presov" +msgstr "Prešov" + +#: contrib/localflavor/sk/sk_districts.py:57 +msgid "Prievidza" +msgstr "Prievidza" + +#: contrib/localflavor/sk/sk_districts.py:58 +msgid "Puchov" +msgstr "Púchov" + +#: contrib/localflavor/sk/sk_districts.py:59 +msgid "Revuca" +msgstr "Revúca" + +#: contrib/localflavor/sk/sk_districts.py:60 +msgid "Rimavska Sobota" +msgstr "Rimavská Sobota" + +#: contrib/localflavor/sk/sk_districts.py:61 +msgid "Roznava" +msgstr "Rožňava" + +#: contrib/localflavor/sk/sk_districts.py:62 +msgid "Ruzomberok" +msgstr "Ružomberok" + +#: contrib/localflavor/sk/sk_districts.py:63 +msgid "Sabinov" +msgstr "Sabinov" + +#: contrib/localflavor/sk/sk_districts.py:64 +msgid "Senec" +msgstr "Senec" + +#: contrib/localflavor/sk/sk_districts.py:65 +msgid "Senica" +msgstr "Senica" + +#: contrib/localflavor/sk/sk_districts.py:66 +msgid "Skalica" +msgstr "Skalica" + +#: contrib/localflavor/sk/sk_districts.py:67 +msgid "Snina" +msgstr "Snina" + +#: contrib/localflavor/sk/sk_districts.py:68 +msgid "Sobrance" +msgstr "Sobrance" + +#: contrib/localflavor/sk/sk_districts.py:69 +msgid "Spisska Nova Ves" +msgstr "Spišská Nová Ves" + +#: contrib/localflavor/sk/sk_districts.py:70 +msgid "Stara Lubovna" +msgstr "Stará Ľubovňa" + +#: contrib/localflavor/sk/sk_districts.py:71 +msgid "Stropkov" +msgstr "Stropkov" + +#: contrib/localflavor/sk/sk_districts.py:72 +msgid "Svidnik" +msgstr "Svidník" + +#: contrib/localflavor/sk/sk_districts.py:73 +msgid "Sala" +msgstr "Šaľa" + +#: contrib/localflavor/sk/sk_districts.py:74 +msgid "Topolcany" +msgstr "Topoľčany" + +#: contrib/localflavor/sk/sk_districts.py:75 +msgid "Trebisov" +msgstr "Trebišov" + +#: contrib/localflavor/sk/sk_districts.py:76 +msgid "Trencin" +msgstr "Trenčín" + +#: contrib/localflavor/sk/sk_districts.py:77 +msgid "Trnava" +msgstr "Trnava" + +#: contrib/localflavor/sk/sk_districts.py:78 +msgid "Turcianske Teplice" +msgstr "Turčianske Teplice" + +#: contrib/localflavor/sk/sk_districts.py:79 +msgid "Tvrdosin" +msgstr "Tvrdošín" + +#: contrib/localflavor/sk/sk_districts.py:80 +msgid "Velky Krtis" +msgstr "Veľký Krtíš" + +#: contrib/localflavor/sk/sk_districts.py:81 +msgid "Vranov nad Toplou" +msgstr "Vranov nad Topľou" + +#: contrib/localflavor/sk/sk_districts.py:82 +msgid "Zlate Moravce" +msgstr "Zlaté Moravce" + +#: contrib/localflavor/sk/sk_districts.py:83 +msgid "Zvolen" +msgstr "Zvolen" + +#: contrib/localflavor/sk/sk_districts.py:84 +msgid "Zarnovica" +msgstr "Žarnovica" + +#: contrib/localflavor/sk/sk_districts.py:85 +msgid "Ziar nad Hronom" +msgstr "Žiar nad Hronom" + +#: contrib/localflavor/sk/sk_districts.py:86 +msgid "Zilina" +msgstr "Žilina" + +#: contrib/localflavor/sk/sk_regions.py:8 +msgid "Banska Bystrica region" +msgstr "Région de Banská Bystrica" + +#: contrib/localflavor/sk/sk_regions.py:9 +msgid "Bratislava region" +msgstr "Région de Bratislava" + +#: contrib/localflavor/sk/sk_regions.py:10 +msgid "Kosice region" +msgstr "Région de Košice" + +#: contrib/localflavor/sk/sk_regions.py:11 +msgid "Nitra region" +msgstr "Nitra" + +#: contrib/localflavor/sk/sk_regions.py:12 +msgid "Presov region" +msgstr "Prešov" + +#: contrib/localflavor/sk/sk_regions.py:13 +msgid "Trencin region" +msgstr "Trenčín" + +#: contrib/localflavor/sk/sk_regions.py:14 +msgid "Trnava region" +msgstr "Trnava" + +#: contrib/localflavor/sk/sk_regions.py:15 +msgid "Zilina region" +msgstr "Žilina" + +#: contrib/localflavor/uk/forms.py:21 +msgid "Enter a valid postcode." +msgstr "Entrez un code postal valide." + +#: contrib/localflavor/uk/uk_regions.py:11 +msgid "Bedfordshire" +msgstr "Bedfordshire" + +#: contrib/localflavor/uk/uk_regions.py:12 +msgid "Buckinghamshire" +msgstr "Buckinghamshire" + +#: contrib/localflavor/uk/uk_regions.py:14 +msgid "Cheshire" +msgstr "Cheshire" + +#: contrib/localflavor/uk/uk_regions.py:15 +msgid "Cornwall and Isles of Scilly" +msgstr "Cornouailles et les îles Scilly" + +#: contrib/localflavor/uk/uk_regions.py:16 +msgid "Cumbria" +msgstr "Cumbrie" + +#: contrib/localflavor/uk/uk_regions.py:17 +msgid "Derbyshire" +msgstr "Derbyshire" + +#: contrib/localflavor/uk/uk_regions.py:18 +msgid "Devon" +msgstr "Devon" + +#: contrib/localflavor/uk/uk_regions.py:19 +msgid "Dorset" +msgstr "Dorset" + +#: contrib/localflavor/uk/uk_regions.py:20 +msgid "Durham" +msgstr "Durham" + +#: contrib/localflavor/uk/uk_regions.py:21 +msgid "East Sussex" +msgstr "Sussex de l'Est" + +#: contrib/localflavor/uk/uk_regions.py:22 +msgid "Essex" +msgstr "Essex" + +#: contrib/localflavor/uk/uk_regions.py:23 +msgid "Gloucestershire" +msgstr "Gloucestershire" + +#: contrib/localflavor/uk/uk_regions.py:24 +msgid "Greater London" +msgstr "Grand Londres" + +#: contrib/localflavor/uk/uk_regions.py:25 +msgid "Greater Manchester" +msgstr "Grand Manchester" + +#: contrib/localflavor/uk/uk_regions.py:26 +msgid "Hampshire" +msgstr "Hampshire" + +#: contrib/localflavor/uk/uk_regions.py:27 +msgid "Hertfordshire" +msgstr "Hertfordshire" + +#: contrib/localflavor/uk/uk_regions.py:28 +msgid "Kent" +msgstr "Kent" + +#: contrib/localflavor/uk/uk_regions.py:29 +msgid "Lancashire" +msgstr "Lancastre" + +#: contrib/localflavor/uk/uk_regions.py:30 +msgid "Leicestershire" +msgstr "Leicestershire" + +#: contrib/localflavor/uk/uk_regions.py:31 +msgid "Lincolnshire" +msgstr "Lincolnshire" + +#: contrib/localflavor/uk/uk_regions.py:32 +msgid "Merseyside" +msgstr "Merseyside" + +#: contrib/localflavor/uk/uk_regions.py:33 +msgid "Norfolk" +msgstr "Norfolk" + +#: contrib/localflavor/uk/uk_regions.py:34 +msgid "North Yorkshire" +msgstr "Yorkshire du Nord" + +#: contrib/localflavor/uk/uk_regions.py:35 +msgid "Northamptonshire" +msgstr "Northamptonshire" + +#: contrib/localflavor/uk/uk_regions.py:36 +msgid "Northumberland" +msgstr "Northumberland" + +#: contrib/localflavor/uk/uk_regions.py:37 +msgid "Nottinghamshire" +msgstr "Nottinghamshire" + +#: contrib/localflavor/uk/uk_regions.py:38 +msgid "Oxfordshire" +msgstr "Oxfordshire" + +#: contrib/localflavor/uk/uk_regions.py:39 +msgid "Shropshire" +msgstr "Shropshire" + +#: contrib/localflavor/uk/uk_regions.py:40 +msgid "Somerset" +msgstr "Somerset" + +#: contrib/localflavor/uk/uk_regions.py:41 +msgid "South Yorkshire" +msgstr "Yorkshire du Su" + +#: contrib/localflavor/uk/uk_regions.py:42 +msgid "Staffordshire" +msgstr "Staffordshire" + +#: contrib/localflavor/uk/uk_regions.py:43 +msgid "Suffolk" +msgstr "Suffolk" + +#: contrib/localflavor/uk/uk_regions.py:44 +msgid "Surrey" +msgstr "Surrey" + +#: contrib/localflavor/uk/uk_regions.py:45 +msgid "Tyne and Wear" +msgstr "Tyne et Wear" + +#: contrib/localflavor/uk/uk_regions.py:46 +msgid "Warwickshire" +msgstr "Warwickshire" + +#: contrib/localflavor/uk/uk_regions.py:47 +msgid "West Midlands" +msgstr "Midlands de l'Ouest" + +#: contrib/localflavor/uk/uk_regions.py:48 +msgid "West Sussex" +msgstr "Sussex de l'Ouest" + +#: contrib/localflavor/uk/uk_regions.py:49 +msgid "West Yorkshire" +msgstr "Yorkshire de l'Ouest" + +#: contrib/localflavor/uk/uk_regions.py:50 +msgid "Wiltshire" +msgstr "Wiltshire" + +#: contrib/localflavor/uk/uk_regions.py:51 +msgid "Worcestershire" +msgstr "Worcestershire" + +#: contrib/localflavor/uk/uk_regions.py:55 +msgid "County Antrim" +msgstr "Comté d'Antrim" + +#: contrib/localflavor/uk/uk_regions.py:56 +msgid "County Armagh" +msgstr "Comté d'Armagh" + +#: contrib/localflavor/uk/uk_regions.py:57 +msgid "County Down" +msgstr "Comté de Down" + +#: contrib/localflavor/uk/uk_regions.py:58 +msgid "County Fermanagh" +msgstr "Comté de Fermanagh" + +#: contrib/localflavor/uk/uk_regions.py:59 +msgid "County Londonderry" +msgstr "Comté de Londonderry" + +#: contrib/localflavor/uk/uk_regions.py:60 +msgid "County Tyrone" +msgstr "Comté de Tyrone" + +#: contrib/localflavor/uk/uk_regions.py:64 +msgid "Clwyd" +msgstr "Clwyd" + +#: contrib/localflavor/uk/uk_regions.py:65 +msgid "Dyfed" +msgstr "Dyfed" + +#: contrib/localflavor/uk/uk_regions.py:66 +msgid "Gwent" +msgstr "Gwent" + +#: contrib/localflavor/uk/uk_regions.py:67 +msgid "Gwynedd" +msgstr "Gwynedd" + +#: contrib/localflavor/uk/uk_regions.py:68 +msgid "Mid Glamorgan" +msgstr "Mid·Glamorgan" + +#: contrib/localflavor/uk/uk_regions.py:69 +msgid "Powys" +msgstr "Powys" + +#: contrib/localflavor/uk/uk_regions.py:70 +msgid "South Glamorgan" +msgstr "South Glamorgan" + +#: contrib/localflavor/uk/uk_regions.py:71 +msgid "West Glamorgan" +msgstr "West Glamorgan" + +#: contrib/localflavor/uk/uk_regions.py:75 +msgid "Borders" +msgstr "Borders" + +#: contrib/localflavor/uk/uk_regions.py:76 +msgid "Central Scotland" +msgstr "Centre" + +#: contrib/localflavor/uk/uk_regions.py:77 +msgid "Dumfries and Galloway" +msgstr "Dumfries and Galloway" + +#: contrib/localflavor/uk/uk_regions.py:78 +msgid "Fife" +msgstr "Fife" + +#: contrib/localflavor/uk/uk_regions.py:79 +msgid "Grampian" +msgstr "Grampian" + +#: contrib/localflavor/uk/uk_regions.py:80 +msgid "Highland" +msgstr "Highland" + +#: contrib/localflavor/uk/uk_regions.py:81 +msgid "Lothian" +msgstr "Lothian" + +#: contrib/localflavor/uk/uk_regions.py:82 +msgid "Orkney Islands" +msgstr "Orcades" + +#: contrib/localflavor/uk/uk_regions.py:83 +msgid "Shetland Islands" +msgstr "îles Shetland" + +#: contrib/localflavor/uk/uk_regions.py:84 +msgid "Strathclyde" +msgstr "Strathclyde" + +#: contrib/localflavor/uk/uk_regions.py:85 +msgid "Tayside" +msgstr "Tayside" + +#: contrib/localflavor/uk/uk_regions.py:86 +msgid "Western Isles" +msgstr "Hébrides extérieures" + +#: contrib/localflavor/uk/uk_regions.py:90 +msgid "England" +msgstr "Angleterre" + +#: contrib/localflavor/uk/uk_regions.py:91 +msgid "Northern Ireland" +msgstr "Irlande du Nord" + +#: contrib/localflavor/uk/uk_regions.py:92 +msgid "Scotland" +msgstr "Écosse" + +#: contrib/localflavor/uk/uk_regions.py:93 +msgid "Wales" +msgstr "Pays de Galles" + +#: contrib/localflavor/us/forms.py:16 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." msgstr "Entrez un code postal Américain (format XXXXX ou XXXXX-XXXX)." -#: contrib/localflavor/us/forms.py:51 +#: contrib/localflavor/us/forms.py:54 msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." msgstr "Entrez un numéro de sécurité sociale Américain (format XXX-XX-XXXX)." -#: contrib/localflavor/ch/ch_states.py:5 -msgid "Aargau" -msgstr "Argovie" +#: contrib/localflavor/za/forms.py:20 +msgid "Enter a valid South African ID number" +msgstr "Entrez un numero d'identification sud-africain valide." -#: contrib/localflavor/ch/ch_states.py:6 -msgid "Appenzell Innerrhoden" -msgstr "Appenzell Rhodes-Intérieures" +#: contrib/localflavor/za/forms.py:54 +msgid "Enter a valid South African postal code" +msgstr "Entrez un code postal sud-africain valide." -#: contrib/localflavor/ch/ch_states.py:7 -msgid "Appenzell Ausserrhoden" -msgstr "Appenzell Rhodes-Extérieures" +#: contrib/localflavor/za/za_provinces.py:4 +msgid "Eastern Cape" +msgstr "Cap-Oriental" -#: contrib/localflavor/ch/ch_states.py:8 -msgid "Basel-Stadt" -msgstr "Bâle-Ville" +#: contrib/localflavor/za/za_provinces.py:5 +msgid "Free State" +msgstr "État-Libre" -#: contrib/localflavor/ch/ch_states.py:9 -msgid "Basel-Land" -msgstr "Bâle-Campagne" +#: contrib/localflavor/za/za_provinces.py:6 +msgid "Gauteng" +msgstr "Gauteng" -#: contrib/localflavor/ch/ch_states.py:10 -msgid "Berne" -msgstr "Berne" +#: contrib/localflavor/za/za_provinces.py:7 +msgid "KwaZulu-Natal" +msgstr "KwaZulu-Natal" -#: contrib/localflavor/ch/ch_states.py:11 -msgid "Fribourg" -msgstr "Fribourg" +#: contrib/localflavor/za/za_provinces.py:8 +msgid "Limpopo" +msgstr "Limpopo" -#: contrib/localflavor/ch/ch_states.py:12 -msgid "Geneva" -msgstr "Genève" +#: contrib/localflavor/za/za_provinces.py:9 +msgid "Mpumalanga" +msgstr "Mpumalanga" -#: contrib/localflavor/ch/ch_states.py:13 -msgid "Glarus" -msgstr "Glaris" +#: contrib/localflavor/za/za_provinces.py:10 +msgid "Northern Cape" +msgstr "Cap-du-Nord" -#: contrib/localflavor/ch/ch_states.py:14 -msgid "Graubuenden" -msgstr "Grisons" +#: contrib/localflavor/za/za_provinces.py:11 +msgid "North West" +msgstr "Nord-Ouest" -#: contrib/localflavor/ch/ch_states.py:15 -msgid "Jura" -msgstr "Jura" +#: contrib/localflavor/za/za_provinces.py:12 +msgid "Western Cape" +msgstr "Cap-Occidental" -#: contrib/localflavor/ch/ch_states.py:16 -msgid "Lucerne" -msgstr "Lucerne" +#: contrib/redirects/models.py:7 +msgid "redirect from" +msgstr "redirigé depuis" -#: contrib/localflavor/ch/ch_states.py:17 -msgid "Neuchatel" -msgstr "Neuchâtel" - -#: contrib/localflavor/ch/ch_states.py:18 -msgid "Nidwalden" -msgstr "Nidwald" - -#: contrib/localflavor/ch/ch_states.py:19 -msgid "Obwalden" -msgstr "Obwald" - -#: contrib/localflavor/ch/ch_states.py:20 -msgid "Schaffhausen" -msgstr "Schaffhouse" - -#: contrib/localflavor/ch/ch_states.py:21 -msgid "Schwyz" -msgstr "Suisse" - -#: contrib/localflavor/ch/ch_states.py:22 -msgid "Solothurn" -msgstr "Soleure" - -#: contrib/localflavor/ch/ch_states.py:23 -msgid "St. Gallen" -msgstr "Saint Gall" - -#: contrib/localflavor/ch/ch_states.py:24 -msgid "Thurgau" -msgstr "Thuringe" - -#: contrib/localflavor/ch/ch_states.py:25 -msgid "Ticino" -msgstr "Tessin" - -#: contrib/localflavor/ch/ch_states.py:26 -msgid "Uri" -msgstr "Uri" - -#: contrib/localflavor/ch/ch_states.py:27 -msgid "Valais" -msgstr "Valais" - -#: contrib/localflavor/ch/ch_states.py:28 -msgid "Vaud" -msgstr "Vaud" - -#: contrib/localflavor/ch/ch_states.py:29 -msgid "Zug" -msgstr "Zoug" - -#: contrib/localflavor/ch/ch_states.py:30 -msgid "Zurich" -msgstr "Zurich" - -#: contrib/localflavor/ch/forms.py:90 +#: contrib/redirects/models.py:8 msgid "" -"Enter a valid Swiss identity or passport card number in X1234567<0 or " -"1234567890 format." +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." msgstr "" -"Entrez un numéro de passeport ou de carte d'identité valide au format " -"X1234567<0 ou 1234567890." +"Ceci doit être un chemin absolu, sans nom de domaine. Par exemple: '/" +"evenements/rechercher/'." -#: contrib/localflavor/is_/forms.py:17 +#: contrib/redirects/models.py:9 +msgid "redirect to" +msgstr "redirigé vers" + +#: contrib/redirects/models.py:10 msgid "" -"Enter a valid Icelandic identification number. The format is XXXXXX-XXXX." -msgstr "Entrez un code postal islandais valide (format XXXXXX-XXXX)." +"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/localflavor/is_/forms.py:31 -msgid "The Icelandic identification number is not valid." -msgstr "Le numéro d'identification Islandais est invalide." +#: contrib/redirects/models.py:13 +msgid "redirect" +msgstr "redirige" -#: contrib/localflavor/cl/forms.py:22 -msgid "Enter valid a Chilean RUT. The format is XX.XXX.XXX-X." -msgstr "Entrez un RUT Chilien valide (format XX.XXX.XXX-X)." +#: contrib/redirects/models.py:14 +msgid "redirects" +msgstr "redirige" -#: contrib/localflavor/cl/forms.py:27 -msgid "Enter valid a Chilean RUT" -msgstr "Entrez un RUT Chilien valide." - -#: contrib/sessions/models.py:68 +#: contrib/sessions/models.py:41 msgid "session key" msgstr "clé de session" -#: contrib/sessions/models.py:69 +#: contrib/sessions/models.py:42 msgid "session data" msgstr "données de session" -#: contrib/sessions/models.py:70 +#: contrib/sessions/models.py:43 msgid "expire date" msgstr "date d'expiration" -#: contrib/sessions/models.py:74 +#: contrib/sessions/models.py:48 msgid "session" msgstr "session" -#: contrib/sessions/models.py:75 +#: contrib/sessions/models.py:49 msgid "sessions" msgstr "sessions" -#: contrib/flatpages/models.py:8 +#: contrib/sites/models.py:32 +msgid "domain name" +msgstr "nom de domaine" + +#: contrib/sites/models.py:33 +msgid "display name" +msgstr "nom à afficher" + +#: contrib/sites/models.py:37 +msgid "site" +msgstr "site" + +#: contrib/sites/models.py:38 +msgid "sites" +msgstr "sites" + +#: core/validators.py:72 +msgid "This value must contain only letters, numbers and underscores." +msgstr "" +"Ce champ ne doit contenir que des lettres, des nombres et destirets bas _." + +#: core/validators.py:76 msgid "" -"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +"This value must contain only letters, numbers, underscores, dashes or " +"slashes." msgstr "" -"Par exemple : '/a_propos/contact/'. Vérifiez la présence du caractère " -"'/' en début et en fin de chaine." +"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _,des " +"traits d'union, et des '/'." -#: contrib/flatpages/models.py:9 -msgid "title" -msgstr "titre" +#: core/validators.py:80 +msgid "This value must contain only letters, numbers, underscores or hyphens." +msgstr "" +"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _et " +"des traits d'union." -#: contrib/flatpages/models.py:10 -msgid "content" -msgstr "contenu" +#: core/validators.py:84 +msgid "Uppercase letters are not allowed here." +msgstr "Les lettres majuscules ne sont pas autorisées ici." -#: contrib/flatpages/models.py:11 -msgid "enable comments" -msgstr "autoriser les commentaires" +#: core/validators.py:88 +msgid "Lowercase letters are not allowed here." +msgstr "Les lettres minuscules ne sont pas autorisées ici." -#: contrib/flatpages/models.py:12 -msgid "template name" -msgstr "nom du template" +#: core/validators.py:95 +msgid "Enter only digits separated by commas." +msgstr "Saisissez uniquement des chiffres séparés par des virgules." -#: contrib/flatpages/models.py:13 +#: core/validators.py:107 +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:111 +msgid "Please enter a valid IP address." +msgstr "Entrez une adresse IP valide." + +#: core/validators.py:115 +msgid "Empty values are not allowed here." +msgstr "Vous ne pouvez pas laisser ce champ vide." + +#: core/validators.py:119 +msgid "Non-numeric characters aren't allowed here." +msgstr "Les caractères non numériques ne sont pas autorisés ici." + +#: core/validators.py:123 +msgid "This value can't be comprised solely of digits." +msgstr "Cette valeur ne peut pas être composé uniquement de chiffres." + +#: core/validators.py:128 newforms/fields.py:151 +msgid "Enter a whole number." +msgstr "Entrez un nombre entier." + +#: core/validators.py:132 +msgid "Only alphabetical characters are allowed here." +msgstr "Seules les lettres de l'alphabet sont autorisées ici." + +#: core/validators.py:147 +msgid "Year must be 1900 or later." +msgstr "L'année doit être supérieure à 1900." + +#: core/validators.py:151 +#, python-format +msgid "Invalid date: %s" +msgstr "Date invalide : %s" + +#: core/validators.py:156 db/models/fields/__init__.py:522 +msgid "Enter a valid date in YYYY-MM-DD format." +msgstr "Entrez une date valide au format AAAA-MM-JJ." + +#: core/validators.py:161 +msgid "Enter a valid time in HH:MM format." +msgstr "Entrez une heure valide au format HH:MM." + +#: core/validators.py:165 db/models/fields/__init__.py:599 +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:170 newforms/fields.py:402 +msgid "Enter a valid e-mail address." +msgstr "Entrez une adresse de courriel valide." + +#: core/validators.py:182 core/validators.py:474 newforms/fields.py:432 +#: oldforms/__init__.py:687 +msgid "No file was submitted. Check the encoding type on the form." +msgstr "Aucun fichier n'a été soumis. Vérifiez le type d'encodage du formulaire." + +#: core/validators.py:193 newforms/fields.py:458 msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." msgstr "" -"Par exemple: 'flatfiles/contact_page'. Sans définition, le système utilisera " -"'flatfiles/default'." +"Envoyez une image valide. Le fichier que vous avez transferé n'est pas une " +"image ou bien est corrompu." -#: contrib/flatpages/models.py:14 -msgid "registration required" -msgstr "enregistrement requis" +#: core/validators.py:200 +#, python-format +msgid "The URL %s does not point to a valid image." +msgstr "L'URL %s ne pointe pas vers une image valide." -#: contrib/flatpages/models.py:14 -msgid "If this is checked, only logged-in users will be able to view the page." +#: core/validators.py:204 +#, python-format +msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." msgstr "" -"Si coché, seuls les utilisateurs connectés auront la possibilité de voir " -"cette page." +"Les numéros de téléphone doivent être au format XXX-XXX-XXXX. \"%s\" est " +"incorrect." -#: contrib/flatpages/models.py:19 -msgid "flat page" -msgstr "page statique" +#: core/validators.py:212 +#, 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." -#: contrib/flatpages/models.py:20 -msgid "flat pages" -msgstr "pages statiques" +#: core/validators.py:216 +msgid "A valid URL is required." +msgstr "Une URL valide est requise." + +#: core/validators.py:230 +#, python-format +msgid "" +"Valid HTML is required. Specific errors are:\n" +"%s" +msgstr "" +"Du HTML valide est requis. Les erreurs sont les suivantes :\n" +"%s" + +#: core/validators.py:237 +#, python-format +msgid "Badly formed XML: %s" +msgstr "XML mal formé : %s" + +#: core/validators.py:254 +#, python-format +msgid "Invalid URL: %s" +msgstr "URL invalide : %s" + +#: core/validators.py:259 core/validators.py:261 +#, python-format +msgid "The URL %s is a broken link." +msgstr "L'URL %s est un lien cassé." + +#: core/validators.py:267 +msgid "Enter a valid U.S. state abbreviation." +msgstr "Entrez une abréviation d'État Américain valide." + +#: core/validators.py:281 +#, python-format +msgid "Watch your mouth! The word %s is not allowed here." +msgstr "Attention à votre langage ! Le mot %s n'est pas autorisé ici." + +#: core/validators.py:288 +#, python-format +msgid "This field must match the '%s' field." +msgstr "Ce champ doit correspondre au champ '%s'." + +#: core/validators.py:307 +msgid "Please enter something for at least one field." +msgstr "Veuillez saisir quelque chose dans au moins un des champs." + +#: core/validators.py:316 core/validators.py:327 +msgid "Please enter both fields or leave them both empty." +msgstr "" +"Veuillez renseigner les deux champs ou les laisser tous les deux vides." + +#: core/validators.py:335 +#, 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:348 +#, 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:367 +msgid "Duplicate values are not allowed." +msgstr "Les valeurs identiques ne sont pas autorisées." + +#: core/validators.py:382 +#, python-format +msgid "This value must be between %(lower)s and %(upper)s." +msgstr "Cette valeur doit être comprise entre %(lower)s et %(upper)s." + +#: core/validators.py:384 +#, python-format +msgid "This value must be at least %s." +msgstr "Cette valeur doit être au moins %s." + +#: core/validators.py:386 +#, python-format +msgid "This value must be no more than %s." +msgstr "Cette valeur ne doit pas dépasser %s." + +#: core/validators.py:427 +#, python-format +msgid "This value must be a power of %s." +msgstr "Cette valeur doit être une puissance de %s." + +#: core/validators.py:437 +msgid "Please enter a valid decimal number." +msgstr "Veuillez saisir un nombre décimal valide." + +#: core/validators.py:444 +#, python-format +msgid "Please enter a valid decimal number with at most %s total digit." +"Please enter a valid decimal number with at most %s total digits." +msgstr "Veuillez saisir un nombre décimal valide avec au plus %s chiffre." +"Veuillez saisir un nombre décimal valide avec au plus %s chiffres." + +#: core/validators.py:447 +#, python-format +msgid "" +"Please enter a valid decimal number with a whole part of at most %s digit." +"Please enter a valid decimal number with a whole part of at most %s digits." +msgstr "" +"Veuillez saisir un nombre décimal valide avec une partie entière de %s " +"chiffre au plus." +"Veuillez saisir un nombre décimal valide avec une partie entière de %s " +"chiffres au plus." + +#: core/validators.py:450 +#, python-format +msgid "Please enter a valid decimal number with at most %s decimal place." +"Please enter a valid decimal number with at most %s decimal places." +msgstr "Veuillez saisir un nombre décimal valide avec au plus %s chiffre après la virgiule." +"Veuillez saisir un nombre décimal valide avec au plus %s chiffres après la virgiule." + +#: core/validators.py:458 +msgid "Please enter a valid floating point number." +msgstr "Veuillez entrer un nombre à virgule flottante valide." + +#: core/validators.py:467 +#, 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 %s octets." + +#: core/validators.py:468 +#, 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 %s octets." + +#: core/validators.py:485 +msgid "The format for this field is wrong." +msgstr "Le format de ce champ est mauvais." + +#: core/validators.py:500 +msgid "This field is invalid." +msgstr "Ce champ est invalide." + +#: core/validators.py:536 +#, python-format +msgid "Could not retrieve anything from %s." +msgstr "Impossible de récupérer quoi que ce soit depuis %s." + +#: core/validators.py:539 +#, python-format +msgid "" +"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." +msgstr "" +"L'entête Content-Type '%(contenttype)s', renvoyée par l'url %(url)s n'est " +"pas valide." + +#: core/validators.py:572 +#, python-format +msgid "" +"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " +"\"%(start)s\".)" +msgstr "" +"Veuillez fermer le tag %(tag)s à la ligne %(line)s. (Ligne débutant par \"%" +"(start)s\".)" + +#: core/validators.py:576 +#, python-format +msgid "" +"Some text starting on line %(line)s is not allowed in that context. (Line " +"starts with \"%(start)s\".)" +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:581 +#, python-format +msgid "" +"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"\"%(attr)s\" ligne %(line)s n'est pas un attribut valide. (Ligne débutant " +"par \"%(start)s\".)" + +#: core/validators.py:586 +#, python-format +msgid "" +"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"\"<%(tag)s>\" ligne %(line)s n'est pas un tag valide. (Ligne débutant par \"%" +"(start)s\".)" + +#: core/validators.py:590 +#, python-format +msgid "" +"A tag on line %(line)s is missing one or more required attributes. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Un tag, ou un ou plusieurs attributs, de la ligne %(line)s est manquant. " +"(Ligne débutant par \"%(start)s\".)" + +#: core/validators.py:595 +#, python-format +msgid "" +"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"La valeur de l'attribut \"%(attr)s\" de la ligne %(line)s n'est pas valide. " +"(Ligne débutant par \"%(start)s\".)" + +#: db/models/manipulators.py:308 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "%(object)s·de ce·%(type)s·existent déjà pour le %(field)s données." + +#: db/models/fields/__init__.py:52 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "%(optname)s avec le champ %(fieldname)s existe déjà." + +#: db/models/fields/__init__.py:161 db/models/fields/__init__.py:322 +#: db/models/fields/__init__.py:754 db/models/fields/__init__.py:765 +#: newforms/fields.py:45 oldforms/__init__.py:374 +msgid "This field is required." +msgstr "Ce champ est obligatoire." + +#: db/models/fields/__init__.py:422 +msgid "This value must be an integer." +msgstr "Cette valeur doit être un entier." + +#: db/models/fields/__init__.py:461 +msgid "This value must be either True or False." +msgstr "Cette valeur doit être soit Vraie soit Fausse." + +#: db/models/fields/__init__.py:485 +msgid "This field cannot be null." +msgstr "Ce champ ne peut pas être vide." + +#: db/models/fields/__init__.py:663 +msgid "This value must be a decimal number." +msgstr "Cette valeur doit être un nombre décimal." + +#: db/models/fields/__init__.py:774 +msgid "Enter a valid filename." +msgstr "Entrez un nom de fichier valide." + +#: db/models/fields/__init__.py:945 +msgid "This value must be either None, True or False." +msgstr "Cette valeur doit être Nulle, Vraie ou Fausse." + +#: db/models/fields/related.py:93 +#, python-format +msgid "Please enter a valid %s." +msgstr "Entrez un %s valide." + +#: db/models/fields/related.py:694 +msgid "Separate multiple IDs with commas." +msgstr "Séparez les ID par des virgules." + +#: db/models/fields/related.py:696 +msgid "" +"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" +"Maintenez \"Contrôle (ctrl)\", ou \"Commande (touche pomme)\" sur un Mac, " +"pour en sélectionner plusieurs." + +#: db/models/fields/related.py:743 +#, python-format +msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." +"Please enter valid %(self)s IDs. The values %(value)r are invalid." +msgstr "Entrez un ID %(self)s valide. La valeur %(value)r est invalide." +"Entrez des ID %(self)s valides. Les valeurs %(value)r sont invalides." + +#: newforms/fields.py:46 +msgid "Enter a valid value." +msgstr "Entrez une valeur valide." + +#: newforms/fields.py:123 +#, python-format +msgid "Ensure this value has at most %(max)d characters (it has %(length)d)." +msgstr "Assurez-vous que cette valeur fait moins de %(max)d caractères (il fait actuellement %(length)d caractères)." + +#: newforms/fields.py:124 +#, python-format +msgid "Ensure this value has at least %(min)d characters (it has %(length)d)." +msgstr "Assurez-vous que cette valeur fait plus de %(min)d caractères (il fait actuellement %(length)d caractères)." + +#: newforms/fields.py:152 newforms/fields.py:181 newforms/fields.py:210 +#, python-format +msgid "Ensure this value is less than or equal to %s." +msgstr "Assurez-vous que cette valeur soit inférieure ou égale à %s." + +#: newforms/fields.py:153 newforms/fields.py:182 newforms/fields.py:211 +#, python-format +msgid "Ensure this value is greater than or equal to %s." +msgstr "Assurez-vous que cette valeur soit supérieure ou égale à %s." + +#: newforms/fields.py:180 newforms/fields.py:209 +msgid "Enter a number." +msgstr "Entrez un nombre." + +#: newforms/fields.py:212 +#, python-format +msgid "Ensure that there are no more than %s digits in total." +msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres au total." + +#: newforms/fields.py:213 +#, python-format +msgid "Ensure that there are no more than %s decimal places." +msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres après la virgule." + +#: newforms/fields.py:214 +#, python-format +msgid "Ensure that there are no more than %s digits before the decimal point." +msgstr "Assurez-vous qu'il n'y a pas plus de %s chiffres avant la virgule." + +#: newforms/fields.py:262 newforms/fields.py:723 +msgid "Enter a valid date." +msgstr "Entrez une date valide." + +#: newforms/fields.py:295 newforms/fields.py:724 +msgid "Enter a valid time." +msgstr "Entrez une heure valide." + +#: newforms/fields.py:334 +msgid "Enter a valid date/time." +msgstr "Entrez une date et une heure valides." + +#: newforms/fields.py:433 +msgid "No file was submitted." +msgstr "Aucun fichier n'a été soumis." + +#: newforms/fields.py:434 oldforms/__init__.py:689 +msgid "The submitted file is empty." +msgstr "Le fichier soumis est vide." + +#: newforms/fields.py:496 +msgid "Enter a valid URL." +msgstr "Entrez une URL valide." + +#: newforms/fields.py:497 +msgid "This URL appears to be a broken link." +msgstr "Cette URL semble être cassée." + +#: newforms/fields.py:559 newforms/models.py:300 +msgid "Select a valid choice. That choice is not one of the available choices." +msgstr "" +"Sélectionnez un choix valide. Ce choix ne fait pas partie de ceux " +"disponibles." + +#: newforms/fields.py:598 +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "Sélectionnez un choix valide. %(value)s n'en fait pas partie." + +#: newforms/fields.py:599 newforms/fields.py:661 newforms/models.py:360 +msgid "Enter a list of values." +msgstr "Entrez une liste de valeurs." + +#: newforms/fields.py:752 +msgid "Enter a valid IPv4 address." +msgstr "Entrez une adresse IPv4 valide." + +#: newforms/models.py:361 +#, 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." + +#: oldforms/__init__.py:409 +#, python-format +msgid "Ensure your text is less than %s character." +msgstr "Assurez-vous que votre texte fait moins de %s caractère." + +#: oldforms/__init__.py:414 +msgid "Line breaks are not allowed here." +msgstr "Les retours à la ligne ne sont pas autorisés ici." + +#: oldforms/__init__.py:512 oldforms/__init__.py:586 oldforms/__init__.py:625 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "Sélectionnez un choix valide ; '%(data)s' n'est pas dans %(choices)s." + +#: oldforms/__init__.py:745 +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Entrez un nombre entier entre -32 768 et 32 767." + +#: oldforms/__init__.py:755 +msgid "Enter a positive number." +msgstr "Entrez un nombre entier positif." + +#: oldforms/__init__.py:765 +msgid "Enter a whole number between 0 and 32,767." +msgstr "Entrez un nombre entier entre 0 et 32 767." + +#: template/defaultfilters.py:695 +msgid "yes,no,maybe" +msgstr "oui, non, peut-être" + +#: template/defaultfilters.py:726 +#, python-format +msgid "%(size)d byte" +msgstr "%(size)d octet" + +#: template/defaultfilters.py:728 +#, python-format +msgid "%.1f KB" +msgstr "%.1f Ko" + +#: template/defaultfilters.py:730 +#, python-format +msgid "%.1f MB" +msgstr "%.1f Mo" + +#: template/defaultfilters.py:731 +#, python-format +msgid "%.1f GB" +msgstr "%.1f Go" + +#: utils/dateformat.py:41 +msgid "p.m." +msgstr "après-midi" + +#: utils/dateformat.py:42 +msgid "a.m." +msgstr "matin" + +#: utils/dateformat.py:47 +msgid "PM" +msgstr "Matin" + +#: utils/dateformat.py:48 +msgid "AM" +msgstr "Après-midi" + +#: utils/dateformat.py:97 +msgid "midnight" +msgstr "minuit" + +#: utils/dateformat.py:99 +msgid "noon" +msgstr "midi" #: utils/dates.py:6 msgid "Monday" @@ -2908,126 +4271,91 @@ msgstr "Nov." msgid "Dec." msgstr "Déc." -#: utils/timesince.py:12 +#: utils/text.py:127 +msgid "or" +msgstr "ou" + +#: utils/timesince.py:21 msgid "year" -msgid_plural "years" -msgstr[0] "année" -msgstr[1] "années" +msgstr "année" -#: utils/timesince.py:13 +#: utils/timesince.py:22 msgid "month" -msgid_plural "months" -msgstr[0] "mois" -msgstr[1] "mois" +msgstr "mois" -#: utils/timesince.py:14 +#: utils/timesince.py:23 msgid "week" -msgid_plural "weeks" -msgstr[0] "semaine" -msgstr[1] "semaines" +msgstr "semaine" -#: utils/timesince.py:15 +#: utils/timesince.py:24 msgid "day" -msgid_plural "days" -msgstr[0] "journée" -msgstr[1] "jours" +msgstr "journée" -#: utils/timesince.py:16 +#: utils/timesince.py:25 msgid "hour" -msgid_plural "hours" -msgstr[0] "heure" -msgstr[1] "heures" +msgstr "heure" -#: utils/timesince.py:17 +#: utils/timesince.py:26 msgid "minute" -msgid_plural "minutes" -msgstr[0] "minute" -msgstr[1] "minutes" +msgstr "minute" -#: utils/timesince.py:40 -#, python-format -msgid "%d milliseconds" -msgstr "%d millisecondes" +#: utils/timesince.py:46 +msgid "minutes" +msgstr "minutes" -#: utils/timesince.py:41 +#: utils/timesince.py:51 #, python-format msgid "%(number)d %(type)s" msgstr "%(number)d %(type)s" -#: utils/timesince.py:47 +#: utils/timesince.py:57 #, python-format msgid ", %(number)d %(type)s" msgstr ", %(number)d %(type)s" -#: utils/dateformat.py:41 -msgid "p.m." -msgstr "après-midi" - -#: utils/dateformat.py:42 -msgid "a.m." -msgstr "matin" - -#: utils/dateformat.py:47 -msgid "PM" -msgstr "Matin" - -#: utils/dateformat.py:48 -msgid "AM" -msgstr "Après-midi" - -#: utils/dateformat.py:97 -msgid "midnight" -msgstr "minuit" - -#: utils/dateformat.py:99 -msgid "noon" -msgstr "midi" - -#: utils/translation/trans_real.py:391 +#: utils/translation/trans_real.py:403 msgid "DATE_FORMAT" msgstr "j F Y" -#: utils/translation/trans_real.py:392 +#: utils/translation/trans_real.py:404 msgid "DATETIME_FORMAT" msgstr "j F Y, G:i" -#: utils/translation/trans_real.py:393 +#: utils/translation/trans_real.py:405 msgid "TIME_FORMAT" msgstr "G:i:s" -#: utils/translation/trans_real.py:409 +#: utils/translation/trans_real.py:421 msgid "YEAR_MONTH_FORMAT" msgstr "F Y" -#: utils/translation/trans_real.py:410 +#: utils/translation/trans_real.py:422 msgid "MONTH_DAY_FORMAT" msgstr "j F" -#: template/defaultfilters.py:485 -msgid "yes,no,maybe" -msgstr "oui, non, peut-être" - -#: template/defaultfilters.py:514 +#: views/generic/create_update.py:43 #, python-format -msgid "%(size)d byte" -msgid_plural "%(size)d bytes" -msgstr[0] "%(size)d octet" -msgstr[1] "%(size)d octets" +msgid "The %(verbose_name)s was created successfully." +msgstr "L'objet %(verbose_name)s a été créé avec succès." -#: template/defaultfilters.py:516 +#: views/generic/create_update.py:117 #, python-format -msgid "%.1f KB" -msgstr "%.1f Ko" +msgid "The %(verbose_name)s was updated successfully." +msgstr "L'objet %(verbose_name)s a été mis à jour avec succès." -#: template/defaultfilters.py:518 +#: views/generic/create_update.py:184 #, python-format -msgid "%.1f MB" -msgstr "%.1f Mo" +msgid "The %(verbose_name)s was deleted." +msgstr "L'objet %(verbose_name)s a été supprimé." -#: template/defaultfilters.py:519 -#, python-format -msgid "%.1f GB" -msgstr "%.1f Go" +#~ msgid "" +#~ "Enter a postcode. A space is required between the two postcode parts." +#~ msgstr "" +#~ "Entrez un code postal Anglais. Un espace est requis entre les deux " +#~ "parties." + +#~ msgid "%d milliseconds" +#~ msgstr "%d millisecondes" #~ msgid "AnonymousUser" #~ msgstr "Anonyme" @@ -3035,24 +4363,6 @@ msgstr "%.1f Go" #~ msgid "One or more %(fieldname)s in %(name)s :" #~ msgstr "Un ou plusieurs %(fieldname)s dans %(name)s :" -#~ msgid "Separate multiple IDs with commas." -#~ msgstr "Séparez les ID par des virgules." - -#~ msgid "Added %s." -#~ msgstr "Ajouté %s." - -#~ msgid "Changed %s." -#~ msgstr "Modifié %s." - -#~ msgid "Deleted %s." -#~ msgstr "Supprimé %s." - -#~ msgid "Ordering" -#~ msgstr "Tri" - -#~ msgid "Order:" -#~ msgstr "Ordre :" - #~ msgid "%dth" #~ msgstr "%de" diff --git a/django/conf/locale/fr/LC_MESSAGES/djangojs.mo b/django/conf/locale/fr/LC_MESSAGES/djangojs.mo index 44f04e3b7e..33e508761f 100644 Binary files a/django/conf/locale/fr/LC_MESSAGES/djangojs.mo and b/django/conf/locale/fr/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/fr/LC_MESSAGES/djangojs.po b/django/conf/locale/fr/LC_MESSAGES/djangojs.po index 3d6a2aaca3..ce457d47a5 100644 --- a/django/conf/locale/fr/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/fr/LC_MESSAGES/djangojs.po @@ -1,11 +1,10 @@ # French translation for js. # Copyright (C) 2005 Mikaël Barbero # This file is distributed under the same license as the PACKAGE package. -# Mikaël Barbero , 2005. # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-24 16:39+0100\n" "PO-Revision-Date: 2005-12-24 16:39+0100\n" diff --git a/django/conf/locale/ga/LC_MESSAGES/django.mo b/django/conf/locale/ga/LC_MESSAGES/django.mo index 5699e583f1..de4efd3abe 100644 Binary files a/django/conf/locale/ga/LC_MESSAGES/django.mo and b/django/conf/locale/ga/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ga/LC_MESSAGES/django.po b/django/conf/locale/ga/LC_MESSAGES/django.po index d74fa9e1d3..6c9b556a7e 100644 --- a/django/conf/locale/ga/LC_MESSAGES/django.po +++ b/django/conf/locale/ga/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-01-23 11:04+0000\n" "PO-Revision-Date: 2008-01-23 11:42+0100\n" diff --git a/django/conf/locale/ga/LC_MESSAGES/djangojs.mo b/django/conf/locale/ga/LC_MESSAGES/djangojs.mo index 304bba542f..ba93d354d1 100644 Binary files a/django/conf/locale/ga/LC_MESSAGES/djangojs.mo and b/django/conf/locale/ga/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/ga/LC_MESSAGES/djangojs.po b/django/conf/locale/ga/LC_MESSAGES/djangojs.po index b679c8deea..0b935f1eac 100644 --- a/django/conf/locale/ga/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/ga/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-09-14 12:33+0100\n" "PO-Revision-Date: 2008-01-23 11:04+0100\n" diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo index ae0783f43d..491d161b5f 100644 Binary files a/django/conf/locale/gl/LC_MESSAGES/django.mo and b/django/conf/locale/gl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po index ef02b59e87..f5db1f052d 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.po +++ b/django/conf/locale/gl/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-05-28 12:56+0200\n" "PO-Revision-Date: 2007-05-28 17:29+0200\n" diff --git a/django/conf/locale/gl/LC_MESSAGES/djangojs.mo b/django/conf/locale/gl/LC_MESSAGES/djangojs.mo index 140f9a220e..fcb6976db3 100644 Binary files a/django/conf/locale/gl/LC_MESSAGES/djangojs.mo and b/django/conf/locale/gl/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/gl/LC_MESSAGES/djangojs.po b/django/conf/locale/gl/LC_MESSAGES/djangojs.po index 2a8f284659..9d273db4fc 100644 --- a/django/conf/locale/gl/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/gl/LC_MESSAGES/djangojs.po @@ -1,11 +1,10 @@ # Translation of djangojs.po to Galego. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Afonso Fernández Nogueira , 2005. # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: 2005-07-02 13:25+0200\n" diff --git a/django/conf/locale/he/LC_MESSAGES/django.mo b/django/conf/locale/he/LC_MESSAGES/django.mo index 9f4e124527..9aca2b263b 100644 Binary files a/django/conf/locale/he/LC_MESSAGES/django.mo and b/django/conf/locale/he/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/he/LC_MESSAGES/django.po b/django/conf/locale/he/LC_MESSAGES/django.po index 191a06cab7..996d940338 100644 --- a/django/conf/locale/he/LC_MESSAGES/django.po +++ b/django/conf/locale/he/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django 0.95\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-11-10 02:19+0200\n" "PO-Revision-Date: 2007-10-07 01:31+0200\n" diff --git a/django/conf/locale/he/LC_MESSAGES/djangojs.mo b/django/conf/locale/he/LC_MESSAGES/djangojs.mo index 09ecd64d87..94480683a3 100644 Binary files a/django/conf/locale/he/LC_MESSAGES/djangojs.mo and b/django/conf/locale/he/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/he/LC_MESSAGES/djangojs.po b/django/conf/locale/he/LC_MESSAGES/djangojs.po index 0f94f2ef09..cc68885195 100644 --- a/django/conf/locale/he/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/he/LC_MESSAGES/djangojs.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: djangojs 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-05-06 13:08+0300\n" "PO-Revision-Date: 2007-05-06 13:08+0300\n" diff --git a/django/conf/locale/hr/LC_MESSAGES/django.mo b/django/conf/locale/hr/LC_MESSAGES/django.mo index 1a32d1636e..adbbfa1d7d 100644 Binary files a/django/conf/locale/hr/LC_MESSAGES/django.mo and b/django/conf/locale/hr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/hr/LC_MESSAGES/django.po b/django/conf/locale/hr/LC_MESSAGES/django.po index a42a689c1f..84128bad68 100644 --- a/django/conf/locale/hr/LC_MESSAGES/django.po +++ b/django/conf/locale/hr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-01-06 16:24+0100\n" "PO-Revision-Date: 2008-01-05 00:42+0100\n" diff --git a/django/conf/locale/hr/LC_MESSAGES/djangojs.mo b/django/conf/locale/hr/LC_MESSAGES/djangojs.mo index 62fe73b605..c4b71f0fa2 100644 Binary files a/django/conf/locale/hr/LC_MESSAGES/djangojs.mo and b/django/conf/locale/hr/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/hr/LC_MESSAGES/djangojs.po b/django/conf/locale/hr/LC_MESSAGES/djangojs.po index eca39ec7a2..7aa988c43d 100644 --- a/django/conf/locale/hr/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/hr/LC_MESSAGES/djangojs.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: djangojs\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-13 11:13+1000\n" "PO-Revision-Date: 2008-01-05 01:45+0100\n" diff --git a/django/conf/locale/hu/LC_MESSAGES/django.mo b/django/conf/locale/hu/LC_MESSAGES/django.mo index a46cb69ad5..60c544a3c2 100644 Binary files a/django/conf/locale/hu/LC_MESSAGES/django.mo and b/django/conf/locale/hu/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/hu/LC_MESSAGES/django.po b/django/conf/locale/hu/LC_MESSAGES/django.po index a00ed9c6cf..2f1d10a0a1 100644 --- a/django/conf/locale/hu/LC_MESSAGES/django.po +++ b/django/conf/locale/hu/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-08-21 02:23+0200\n" "PO-Revision-Date: 2007-08-21 02:28+0200\n" diff --git a/django/conf/locale/hu/LC_MESSAGES/djangojs.mo b/django/conf/locale/hu/LC_MESSAGES/djangojs.mo index c481ba2e19..e5389840cc 100644 Binary files a/django/conf/locale/hu/LC_MESSAGES/djangojs.mo and b/django/conf/locale/hu/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/hu/LC_MESSAGES/djangojs.po b/django/conf/locale/hu/LC_MESSAGES/djangojs.po index 186902ecdc..26f0232f2e 100644 --- a/django/conf/locale/hu/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/hu/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: djangojs\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: 2007-09-13 13:30+0200\n" diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo index f54ca63c69..1a95aad2fb 100644 Binary files a/django/conf/locale/is/LC_MESSAGES/django.mo and b/django/conf/locale/is/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po index 92a05846b0..82cfa6741e 100644 --- a/django/conf/locale/is/LC_MESSAGES/django.po +++ b/django/conf/locale/is/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-01-18 15:00+0000\n" "PO-Revision-Date: 2008-01-18 17:16+0100\n" diff --git a/django/conf/locale/is/LC_MESSAGES/djangojs.mo b/django/conf/locale/is/LC_MESSAGES/djangojs.mo index 55a333b5a5..1a11690ab6 100644 Binary files a/django/conf/locale/is/LC_MESSAGES/djangojs.mo and b/django/conf/locale/is/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/is/LC_MESSAGES/djangojs.po b/django/conf/locale/is/LC_MESSAGES/djangojs.po index dec49d6eaa..c68e77d330 100644 --- a/django/conf/locale/is/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/is/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Djangojs CVS\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: 2006-05-13 11:48-0000\n" diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo index c32cc69f53..fc820c6bbc 100644 Binary files a/django/conf/locale/it/LC_MESSAGES/django.mo and b/django/conf/locale/it/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po index 86356ddabf..0020b0d3f7 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # This file is distributed under the same license as the Django package. msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-02-02 18:31+0100\n" "PO-Revision-Date: 2008-03-02 11:40+0100\n" diff --git a/django/conf/locale/it/LC_MESSAGES/djangojs.mo b/django/conf/locale/it/LC_MESSAGES/djangojs.mo index 49620a7942..21a0b5f7ec 100644 Binary files a/django/conf/locale/it/LC_MESSAGES/djangojs.mo and b/django/conf/locale/it/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/it/LC_MESSAGES/djangojs.po b/django/conf/locale/it/LC_MESSAGES/djangojs.po index 7c8d438855..6c32d849d0 100644 --- a/django/conf/locale/it/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/it/LC_MESSAGES/djangojs.po @@ -3,11 +3,9 @@ # Copyright (C) 2006 the Lawrence Journal-World # This file is distributed under the same license as the Django package. # -# Carlo C8E Miron , 2006. -# Nicola 'tekNico' Larosa , 2007. msgid "" msgstr "" -"Project-Id-Version: djangojs\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-02-26 20:46+0100\n" "PO-Revision-Date: 2007-02-26 20:55+0100\n" diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo index 47779f17bf..db9ad3df17 100644 Binary files a/django/conf/locale/ja/LC_MESSAGES/django.mo and b/django/conf/locale/ja/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po index 5e78809bdf..839c452816 100644 --- a/django/conf/locale/ja/LC_MESSAGES/django.po +++ b/django/conf/locale/ja/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-31 21:26+0900\n" "PO-Revision-Date: 2006-05-18 00:28+0900\n" diff --git a/django/conf/locale/ja/LC_MESSAGES/djangojs.mo b/django/conf/locale/ja/LC_MESSAGES/djangojs.mo index 45a4ff9f67..6abe6ead2e 100644 Binary files a/django/conf/locale/ja/LC_MESSAGES/djangojs.mo and b/django/conf/locale/ja/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/ja/LC_MESSAGES/djangojs.po b/django/conf/locale/ja/LC_MESSAGES/djangojs.po index d35b88aa73..fb84fa53e2 100644 --- a/django/conf/locale/ja/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/ja/LC_MESSAGES/djangojs.po @@ -4,7 +4,7 @@ # makoto tsuyuki , 2005. msgid "" msgstr "" -"Project-Id-Version: Django 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-03-26 23:41+0900\n" "PO-Revision-Date: 2006-05-08 13:39+0900\n" diff --git a/django/conf/locale/ka/LC_MESSAGES/django.mo b/django/conf/locale/ka/LC_MESSAGES/django.mo index 3ef5b610f4..0b611080d0 100644 Binary files a/django/conf/locale/ka/LC_MESSAGES/django.mo and b/django/conf/locale/ka/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ka/LC_MESSAGES/django.po b/django/conf/locale/ka/LC_MESSAGES/django.po index d7995e3234..c189e67a81 100644 --- a/django/conf/locale/ka/LC_MESSAGES/django.po +++ b/django/conf/locale/ka/LC_MESSAGES/django.po @@ -2,10 +2,9 @@ # Copyright (C) 2008 # This file is distributed under the same license as the PACKAGE package. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-02-22 21:55+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/conf/locale/ka/LC_MESSAGES/djangojs.mo b/django/conf/locale/ka/LC_MESSAGES/djangojs.mo index 3725146189..bb7079422c 100644 Binary files a/django/conf/locale/ka/LC_MESSAGES/djangojs.mo and b/django/conf/locale/ka/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/ka/LC_MESSAGES/djangojs.po b/django/conf/locale/ka/LC_MESSAGES/djangojs.po index 61aaf1070a..e23b600d00 100644 --- a/django/conf/locale/ka/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/ka/LC_MESSAGES/djangojs.po @@ -2,10 +2,9 @@ # Copyright (C) 2008 # This file is distributed under the same license as the PACKAGE package. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: django 0.97\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-02-16 22:31+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/conf/locale/km/LC_MESSAGES/django.mo b/django/conf/locale/km/LC_MESSAGES/django.mo index cd42e6a5f9..91f0628a08 100644 Binary files a/django/conf/locale/km/LC_MESSAGES/django.mo and b/django/conf/locale/km/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/km/LC_MESSAGES/django.po b/django/conf/locale/km/LC_MESSAGES/django.po index 5592c4a2a1..faf3a915b5 100644 --- a/django/conf/locale/km/LC_MESSAGES/django.po +++ b/django/conf/locale/km/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: 01\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: sengtha@e-khmer.com\n" "POT-Creation-Date: 2007-01-15 15:43+0200\n" "PO-Revision-Date: 2007-08-10 00:21+0900\n" diff --git a/django/conf/locale/km/LC_MESSAGES/djangojs.mo b/django/conf/locale/km/LC_MESSAGES/djangojs.mo index 61d8cdc8fc..613f548b06 100644 Binary files a/django/conf/locale/km/LC_MESSAGES/djangojs.mo and b/django/conf/locale/km/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/km/LC_MESSAGES/djangojs.po b/django/conf/locale/km/LC_MESSAGES/djangojs.po index 031b302dd6..6084219772 100644 --- a/django/conf/locale/km/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/km/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: 01\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: sengtha@e-khmer.com\n" "POT-Creation-Date: 2007-01-15 15:43+0200\n" "PO-Revision-Date: 2007-01-21 01:25+0900\n" diff --git a/django/conf/locale/kn/LC_MESSAGES/django.mo b/django/conf/locale/kn/LC_MESSAGES/django.mo index 9dcde15267..8c9fe23516 100644 Binary files a/django/conf/locale/kn/LC_MESSAGES/django.mo and b/django/conf/locale/kn/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/kn/LC_MESSAGES/django.po b/django/conf/locale/kn/LC_MESSAGES/django.po index b89ef6f706..37c632c5fb 100644 --- a/django/conf/locale/kn/LC_MESSAGES/django.po +++ b/django/conf/locale/kn/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django-kn 0.1\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-25 15:43+0200\n" "PO-Revision-Date: 2007-01-08 20:22+0530\n" diff --git a/django/conf/locale/kn/LC_MESSAGES/djangojs.mo b/django/conf/locale/kn/LC_MESSAGES/djangojs.mo index cbb9fb5ffc..60272ca6c1 100644 Binary files a/django/conf/locale/kn/LC_MESSAGES/djangojs.mo and b/django/conf/locale/kn/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/kn/LC_MESSAGES/djangojs.po b/django/conf/locale/kn/LC_MESSAGES/djangojs.po index 38b4a6d341..590943642d 100644 --- a/django/conf/locale/kn/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/kn/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django-kn 0.1\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-25 15:43+0200\n" "PO-Revision-Date: 2007-01-08 20:22+0530\n" diff --git a/django/conf/locale/ko/LC_MESSAGES/django.mo b/django/conf/locale/ko/LC_MESSAGES/django.mo index 9b576377ae..d20015784d 100644 Binary files a/django/conf/locale/ko/LC_MESSAGES/django.mo and b/django/conf/locale/ko/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ko/LC_MESSAGES/django.po b/django/conf/locale/ko/LC_MESSAGES/django.po index 264c5f630d..fee48952a3 100644 --- a/django/conf/locale/ko/LC_MESSAGES/django.po +++ b/django/conf/locale/ko/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Django 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-24 12:33+0900\n" "PO-Revision-Date: 2007-04-06 11:04+0900\n" diff --git a/django/conf/locale/ko/LC_MESSAGES/djangojs.mo b/django/conf/locale/ko/LC_MESSAGES/djangojs.mo index 7b70530c1a..cdc19a15f3 100644 Binary files a/django/conf/locale/ko/LC_MESSAGES/djangojs.mo and b/django/conf/locale/ko/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/ko/LC_MESSAGES/djangojs.po b/django/conf/locale/ko/LC_MESSAGES/djangojs.po index d76174c3a3..fe1c7a453a 100644 --- a/django/conf/locale/ko/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/ko/LC_MESSAGES/djangojs.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-06 11:10+0900\n" "PO-Revision-Date: 2007-04-06 11:15+0900\n" diff --git a/django/conf/locale/lv/LC_MESSAGES/django.mo b/django/conf/locale/lv/LC_MESSAGES/django.mo index e3cd24cfb7..ad9bf703ba 100644 Binary files a/django/conf/locale/lv/LC_MESSAGES/django.mo and b/django/conf/locale/lv/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/lv/LC_MESSAGES/django.po b/django/conf/locale/lv/LC_MESSAGES/django.po index bf73a61615..c6541d2c5d 100644 --- a/django/conf/locale/lv/LC_MESSAGES/django.po +++ b/django/conf/locale/lv/LC_MESSAGES/django.po @@ -1,12 +1,11 @@ # Django Latvian translation. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# ARVIS BICKOVSKIS , 2006. # # , fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-05-07 23:28+0300\n" "PO-Revision-Date: 2007-05-08 00:35+0300\n" diff --git a/django/conf/locale/lv/LC_MESSAGES/djangojs.mo b/django/conf/locale/lv/LC_MESSAGES/djangojs.mo index 1835996a67..6f9a8a8e42 100644 Binary files a/django/conf/locale/lv/LC_MESSAGES/djangojs.mo and b/django/conf/locale/lv/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/lv/LC_MESSAGES/djangojs.po b/django/conf/locale/lv/LC_MESSAGES/djangojs.po index 4c904ab068..2e1d307ce3 100644 --- a/django/conf/locale/lv/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/lv/LC_MESSAGES/djangojs.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-02-15 10:46+1100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/conf/locale/mk/LC_MESSAGES/django.mo b/django/conf/locale/mk/LC_MESSAGES/django.mo index e67d94fae1..21e3ff7c5d 100644 Binary files a/django/conf/locale/mk/LC_MESSAGES/django.mo and b/django/conf/locale/mk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/mk/LC_MESSAGES/django.po b/django/conf/locale/mk/LC_MESSAGES/django.po index b0a9c92c08..c28d098515 100644 --- a/django/conf/locale/mk/LC_MESSAGES/django.po +++ b/django/conf/locale/mk/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # Georgi Stanojevski , 2006, 2007. msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-07 19:51+0200\n" "PO-Revision-Date: 2007-04-07 20:29+0200\n" diff --git a/django/conf/locale/mk/LC_MESSAGES/djangojs.mo b/django/conf/locale/mk/LC_MESSAGES/djangojs.mo index 64971dc55e..200ddceae3 100644 Binary files a/django/conf/locale/mk/LC_MESSAGES/djangojs.mo and b/django/conf/locale/mk/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/mk/LC_MESSAGES/djangojs.po b/django/conf/locale/mk/LC_MESSAGES/djangojs.po index 0c06326fd5..122a1890db 100644 --- a/django/conf/locale/mk/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/mk/LC_MESSAGES/djangojs.po @@ -3,7 +3,7 @@ # Georgi Stanojevski , 2006, 2007. msgid "" msgstr "" -"Project-Id-Version: djangojs\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-02-15 10:53+1100\n" "PO-Revision-Date: 2007-02-24 13:49+0100\n" diff --git a/django/conf/locale/nl/LC_MESSAGES/django.mo b/django/conf/locale/nl/LC_MESSAGES/django.mo index 09889e7c81..3797766bc9 100644 Binary files a/django/conf/locale/nl/LC_MESSAGES/django.mo and b/django/conf/locale/nl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/nl/LC_MESSAGES/django.po b/django/conf/locale/nl/LC_MESSAGES/django.po index 7dc61e6a61..13143c5b8b 100644 --- a/django/conf/locale/nl/LC_MESSAGES/django.po +++ b/django/conf/locale/nl/LC_MESSAGES/django.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: Django 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-02-27 08:53+0100\n" "PO-Revision-Date: 2008-02-27 11:22+0100\n" diff --git a/django/conf/locale/nl/LC_MESSAGES/djangojs.mo b/django/conf/locale/nl/LC_MESSAGES/djangojs.mo index 96e43fac68..22015ed3b9 100644 Binary files a/django/conf/locale/nl/LC_MESSAGES/djangojs.mo and b/django/conf/locale/nl/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/nl/LC_MESSAGES/djangojs.po b/django/conf/locale/nl/LC_MESSAGES/djangojs.po index 1279fe5623..e9a5d66ade 100644 --- a/django/conf/locale/nl/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/nl/LC_MESSAGES/djangojs.po @@ -1,11 +1,10 @@ # Dutch Javascript translations. # Copyright (C) 2006 # This file is distributed under the same license as the Django package. -# Rudolph Froger , 2006. # msgid "" msgstr "" -"Project-Id-Version: Django 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-02-27 10:34+0100\n" "PO-Revision-Date: 2008-02-27 11:22+0100\n" diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo index bd82c8952e..1009491ba6 100644 Binary files a/django/conf/locale/no/LC_MESSAGES/django.mo and b/django/conf/locale/no/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po index 5894d3b6e8..75f3d45188 100644 --- a/django/conf/locale/no/LC_MESSAGES/django.po +++ b/django/conf/locale/no/LC_MESSAGES/django.po @@ -1,11 +1,10 @@ # translation of django.po to norwegian # Copyright (C) 2005 and beyond # This file is distributed under the same license as the Django package. -# Espen Grindhaug , Nov 2005. # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-16 10:12+0200\n" "PO-Revision-Date: 2007-08-29 18:22+0200\n" diff --git a/django/conf/locale/no/LC_MESSAGES/djangojs.mo b/django/conf/locale/no/LC_MESSAGES/djangojs.mo index 4321934ca6..1388ec9b7e 100644 Binary files a/django/conf/locale/no/LC_MESSAGES/djangojs.mo and b/django/conf/locale/no/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/no/LC_MESSAGES/djangojs.po b/django/conf/locale/no/LC_MESSAGES/djangojs.po index 035c1bc5bf..b94c7696c8 100644 --- a/django/conf/locale/no/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/no/LC_MESSAGES/djangojs.po @@ -1,11 +1,10 @@ # translation of djangojs.po to norwegian # Copyright (C) 2005 and beyond # This file is distributed under the same license as the Django package. -# Espen Grindhaug , 2006. # msgid "" msgstr "" -"Project-Id-Version: djangojs\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: 2007-08-29 18:22+0200\n" diff --git a/django/conf/locale/pl/LC_MESSAGES/django.mo b/django/conf/locale/pl/LC_MESSAGES/django.mo index 59f5b0d977..6677af0674 100644 Binary files a/django/conf/locale/pl/LC_MESSAGES/django.mo and b/django/conf/locale/pl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/pl/LC_MESSAGES/django.po b/django/conf/locale/pl/LC_MESSAGES/django.po index 144682a39b..c33afac470 100644 --- a/django/conf/locale/pl/LC_MESSAGES/django.po +++ b/django/conf/locale/pl/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the django package. msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-02-25 12:45+0100\n" "PO-Revision-Date: 2008-02-25 15:53+0100\n" diff --git a/django/conf/locale/pl/LC_MESSAGES/djangojs.mo b/django/conf/locale/pl/LC_MESSAGES/djangojs.mo index eb162ab3a1..22dc828796 100644 Binary files a/django/conf/locale/pl/LC_MESSAGES/djangojs.mo and b/django/conf/locale/pl/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/pl/LC_MESSAGES/djangojs.po b/django/conf/locale/pl/LC_MESSAGES/djangojs.po index 17af50f2ae..829fe8f359 100644 --- a/django/conf/locale/pl/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/pl/LC_MESSAGES/djangojs.po @@ -1,11 +1,9 @@ # translation of djangojs.po to Polish -# Copyright (C) 2007 Michal Chruszcz # This file is distributed under the same license as the django package. # -# Michal Chruszcz , 2007. msgid "" msgstr "" -"Project-Id-Version: 0.1\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: 2007-03-12 11:42+0100\n" diff --git a/django/conf/locale/pt/LC_MESSAGES/django.mo b/django/conf/locale/pt/LC_MESSAGES/django.mo index 179119b8a1..66632e8879 100644 Binary files a/django/conf/locale/pt/LC_MESSAGES/django.mo and b/django/conf/locale/pt/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/pt/LC_MESSAGES/django.po b/django/conf/locale/pt/LC_MESSAGES/django.po index ba306541e8..203eec4a52 100644 --- a/django/conf/locale/pt/LC_MESSAGES/django.po +++ b/django/conf/locale/pt/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django 0.96pre\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-03-15 15:43+0200\n" "PO-Revision-Date: 2007-03-16 10:00+0000\n" diff --git a/django/conf/locale/pt/LC_MESSAGES/djangojs.mo b/django/conf/locale/pt/LC_MESSAGES/djangojs.mo index 669dd9d119..26ad584b7e 100644 Binary files a/django/conf/locale/pt/LC_MESSAGES/djangojs.mo and b/django/conf/locale/pt/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/pt/LC_MESSAGES/djangojs.po b/django/conf/locale/pt/LC_MESSAGES/djangojs.po index 90f4b9de86..130a75f9cf 100644 --- a/django/conf/locale/pt/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/pt/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django 0.96pre\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-03-15 11:51+0100\n" "PO-Revision-Date: 2007-03-16 10:01+0000\n" diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo index 6e3af1681c..0af7f3d056 100644 Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po index 540d1b51bb..229b9d0314 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-03-28 12:02-0300\n" "PO-Revision-Date: 2007-04-02 17:20+0200\n" diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo b/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo index 31a2b1b3c0..8ca54a4ff9 100644 Binary files a/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo and b/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.po b/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.po index 299fc6526a..6dc395cf52 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/djangojs.po @@ -1,11 +1,10 @@ # Português do Brasil translation of django. # Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# Carlos Eduardo de Paula , 2006. # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: 2006-11-01 17:45-0300\n" diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo index 9b46b6c6d6..7742ece5b1 100644 Binary files a/django/conf/locale/ro/LC_MESSAGES/django.mo and b/django/conf/locale/ro/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po index 09494d7b4e..e92f4f448f 100644 --- a/django/conf/locale/ro/LC_MESSAGES/django.po +++ b/django/conf/locale/ro/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: Django \n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-16 10:12+0200\n" "PO-Revision-Date: 2005-11-08 19:06+GMT+2\n" diff --git a/django/conf/locale/ro/LC_MESSAGES/djangojs.mo b/django/conf/locale/ro/LC_MESSAGES/djangojs.mo index 1db40df910..fae1fdc90e 100644 Binary files a/django/conf/locale/ro/LC_MESSAGES/djangojs.mo and b/django/conf/locale/ro/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/ro/LC_MESSAGES/djangojs.po b/django/conf/locale/ro/LC_MESSAGES/djangojs.po index 4084313848..120d08d70d 100644 --- a/django/conf/locale/ro/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/ro/LC_MESSAGES/djangojs.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-06-28 17:36+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo index 5718d58bcb..f657bf32f6 100644 Binary files a/django/conf/locale/ru/LC_MESSAGES/django.mo and b/django/conf/locale/ru/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po index cbd995c81f..e920c565f0 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django 0.95\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-05-04 16:07+1300\n" "PO-Revision-Date: 2006-09-07 15:28+0300\n" diff --git a/django/conf/locale/ru/LC_MESSAGES/djangojs.mo b/django/conf/locale/ru/LC_MESSAGES/djangojs.mo index 2f9cd614a5..2d96679d83 100644 Binary files a/django/conf/locale/ru/LC_MESSAGES/djangojs.mo and b/django/conf/locale/ru/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/ru/LC_MESSAGES/djangojs.po b/django/conf/locale/ru/LC_MESSAGES/djangojs.po index 189c000422..66be20e547 100644 --- a/django/conf/locale/ru/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/ru/LC_MESSAGES/djangojs.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-03-01 17:11+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo index 169f270969..b52cb26c8f 100644 Binary files a/django/conf/locale/sk/LC_MESSAGES/django.mo and b/django/conf/locale/sk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po index 89dd4897bb..1e5bf89d24 100644 --- a/django/conf/locale/sk/LC_MESSAGES/django.po +++ b/django/conf/locale/sk/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-24 09:56-0400\n" "PO-Revision-Date: 2007-06-22 20:54-0400\n" diff --git a/django/conf/locale/sk/LC_MESSAGES/djangojs.mo b/django/conf/locale/sk/LC_MESSAGES/djangojs.mo index 1a168078c6..0682827f6b 100644 Binary files a/django/conf/locale/sk/LC_MESSAGES/djangojs.mo and b/django/conf/locale/sk/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/sk/LC_MESSAGES/djangojs.po b/django/conf/locale/sk/LC_MESSAGES/djangojs.po index f442a15ff1..d65ac78751 100644 --- a/django/conf/locale/sk/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/sk/LC_MESSAGES/djangojs.po @@ -1,7 +1,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django 1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-04-01 19:21+0200\n" "PO-Revision-Date: 2007-04-03 21:48+0200\n" diff --git a/django/conf/locale/sl/LC_MESSAGES/django.mo b/django/conf/locale/sl/LC_MESSAGES/django.mo index 58e5bd836a..e7865e4c55 100644 Binary files a/django/conf/locale/sl/LC_MESSAGES/django.mo and b/django/conf/locale/sl/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sl/LC_MESSAGES/django.po b/django/conf/locale/sl/LC_MESSAGES/django.po index 80dfeb2cfe..2796ddb3a8 100644 --- a/django/conf/locale/sl/LC_MESSAGES/django.po +++ b/django/conf/locale/sl/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the PACKAGE package. msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-02 13:55+0200\n" "PO-Revision-Date: 2007-07-02 14:47+0100\n" diff --git a/django/conf/locale/sl/LC_MESSAGES/djangojs.mo b/django/conf/locale/sl/LC_MESSAGES/djangojs.mo index 51fadfa406..14d7ffe4e8 100644 Binary files a/django/conf/locale/sl/LC_MESSAGES/djangojs.mo and b/django/conf/locale/sl/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/sl/LC_MESSAGES/djangojs.po b/django/conf/locale/sl/LC_MESSAGES/djangojs.po index b6a7b05605..8ad259a37d 100644 --- a/django/conf/locale/sl/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/sl/LC_MESSAGES/djangojs.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: DJANGO-JS\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-02 13:55+0200\n" "PO-Revision-Date: 2007-07-02 13:56+0100\n" diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo index c942838b09..08ed5b16e5 100644 Binary files a/django/conf/locale/sr/LC_MESSAGES/django.mo and b/django/conf/locale/sr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po index 3d7cef4f2b..4053068d9b 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -1,6 +1,6 @@ msgid "" msgstr "" -"Project-Id-Version: Django Serbian (latin) translation v1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-16 10:11+0200\n" "PO-Revision-Date: 2007-02-20 18:50+0100\n" diff --git a/django/conf/locale/sr/LC_MESSAGES/djangojs.mo b/django/conf/locale/sr/LC_MESSAGES/djangojs.mo index d4036a893e..5713185742 100644 Binary files a/django/conf/locale/sr/LC_MESSAGES/djangojs.mo and b/django/conf/locale/sr/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/sr/LC_MESSAGES/djangojs.po b/django/conf/locale/sr/LC_MESSAGES/djangojs.po index a70d878ea4..65a17757f7 100644 --- a/django/conf/locale/sr/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/sr/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: 2007-02-20 18:51+0100\n" diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo index 7e554be63c..8a6dcb7f8b 100644 Binary files a/django/conf/locale/sv/LC_MESSAGES/django.mo and b/django/conf/locale/sv/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po index a39ccebf21..2154850aed 100644 --- a/django/conf/locale/sv/LC_MESSAGES/django.po +++ b/django/conf/locale/sv/LC_MESSAGES/django.po @@ -4,11 +4,11 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-02 21:20+0100\n" -"PO-Revision-Date: 2008-02-02 21:25+0100\n" -"Last-Translator: Mikko Hellsing \n" +"POT-Creation-Date: 2008-03-16 16:53+0100\n" +"PO-Revision-Date: 2008-03-02 00:49+0100\n" +"Last-Translator: Ludvig Ericson \n" "Language-Team: Django I18N \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -66,134 +66,142 @@ msgid "Argentinean Spanish" msgstr "Argentisk Spanska" #: conf/global_settings.py:51 +msgid "Basque" +msgstr "Baskiska" + +#: conf/global_settings.py:52 msgid "Persian" msgstr "Persiska" -#: conf/global_settings.py:52 +#: conf/global_settings.py:53 msgid "Finnish" msgstr "Finska" -#: conf/global_settings.py:53 +#: conf/global_settings.py:54 msgid "French" msgstr "Franska" -#: conf/global_settings.py:54 -msgid "Gaeilge" -msgstr "Gaeliska" - #: conf/global_settings.py:55 +msgid "Irish" +msgstr "Irländska" + +#: conf/global_settings.py:56 msgid "Galician" msgstr "Galisiska" -#: conf/global_settings.py:56 +#: conf/global_settings.py:57 msgid "Hungarian" msgstr "Ungerska" -#: conf/global_settings.py:57 +#: conf/global_settings.py:58 msgid "Hebrew" msgstr "Hebreiska" -#: conf/global_settings.py:58 +#: conf/global_settings.py:59 msgid "Croatian" msgstr "Kroatiska" -#: conf/global_settings.py:59 +#: conf/global_settings.py:60 msgid "Icelandic" msgstr "Isländska" -#: conf/global_settings.py:60 +#: conf/global_settings.py:61 msgid "Italian" msgstr "Italienska" -#: conf/global_settings.py:61 +#: conf/global_settings.py:62 msgid "Japanese" msgstr "Japanska" -#: conf/global_settings.py:62 +#: conf/global_settings.py:63 +msgid "Georgian" +msgstr "Georgiska" + +#: conf/global_settings.py:64 msgid "Korean" msgstr "Koreanska" -#: conf/global_settings.py:63 +#: conf/global_settings.py:65 msgid "Khmer" msgstr "Khmer" -#: conf/global_settings.py:64 +#: conf/global_settings.py:66 msgid "Kannada" msgstr "Kannada" -#: conf/global_settings.py:65 +#: conf/global_settings.py:67 msgid "Latvian" msgstr "Lettiska" -#: conf/global_settings.py:66 +#: conf/global_settings.py:68 msgid "Macedonian" msgstr "Makedonska" -#: conf/global_settings.py:67 +#: conf/global_settings.py:69 msgid "Dutch" msgstr "Holländska" -#: conf/global_settings.py:68 +#: conf/global_settings.py:70 msgid "Norwegian" msgstr "Norska" -#: conf/global_settings.py:69 +#: conf/global_settings.py:71 msgid "Polish" msgstr "Polska" -#: conf/global_settings.py:70 +#: conf/global_settings.py:72 msgid "Portugese" msgstr "Portugisiska" -#: conf/global_settings.py:71 +#: conf/global_settings.py:73 msgid "Brazilian" msgstr "Brasilianska" -#: conf/global_settings.py:72 +#: conf/global_settings.py:74 msgid "Romanian" msgstr "Rumänska" -#: conf/global_settings.py:73 +#: conf/global_settings.py:75 msgid "Russian" msgstr "Ryska" -#: conf/global_settings.py:74 +#: conf/global_settings.py:76 msgid "Slovak" msgstr "Slovakiska" -#: conf/global_settings.py:75 +#: conf/global_settings.py:77 msgid "Slovenian" msgstr "Slovenska" -#: conf/global_settings.py:76 +#: conf/global_settings.py:78 msgid "Serbian" msgstr "Serbiska" -#: conf/global_settings.py:77 +#: conf/global_settings.py:79 msgid "Swedish" msgstr "Svenska" -#: conf/global_settings.py:78 +#: conf/global_settings.py:80 msgid "Tamil" msgstr "Tamilska" -#: conf/global_settings.py:79 +#: conf/global_settings.py:81 msgid "Telugu" msgstr "Telugu" -#: conf/global_settings.py:80 +#: conf/global_settings.py:82 msgid "Turkish" msgstr "Turkiska" -#: conf/global_settings.py:81 +#: conf/global_settings.py:83 msgid "Ukrainian" msgstr "Ukrainska" -#: conf/global_settings.py:82 +#: conf/global_settings.py:84 msgid "Simplified Chinese" msgstr "Förenklad Kinesiska" -#: conf/global_settings.py:83 +#: conf/global_settings.py:85 msgid "Traditional Chinese" msgstr "Traditionell Kinesiska" @@ -225,11 +233,11 @@ msgstr "Senaste 7 dagarna" #: contrib/admin/filterspecs.py:119 msgid "This month" -msgstr "Den här månaden" +msgstr "Denna månad" #: contrib/admin/filterspecs.py:121 msgid "This year" -msgstr "Det här året" +msgstr "Detta år" #: contrib/admin/filterspecs.py:147 newforms/widgets.py:231 #: oldforms/__init__.py:592 @@ -395,7 +403,7 @@ msgid "" "following types of objects:" msgstr "" "Att ta bort %(object_name)s '%(escaped_object)s' skulle innebära att " -"relaterade objekt togs bort men ditt konto har inte rättigheter att ta bort " +"relaterade objekt togs bort, men ditt konto har inte rättigheter att ta bort " "följande objekttyper:" #: contrib/admin/templates/admin/delete_confirmation.html:20 @@ -471,7 +479,7 @@ msgid "Password:" msgstr "Lösenord:" #: contrib/admin/templates/admin/login.html:25 -#: contrib/admin/views/decorators.py:25 +#: contrib/admin/views/decorators.py:31 msgid "Log in" msgstr "Logga in" @@ -496,7 +504,7 @@ msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -"Det här objektet har ingen ändringshistorik. Det lades antagligen inte till " +"Detta objekt har ingen ändringshistorik. Det lades antagligen inte till " "via denna administrationssida." #: contrib/admin/templates/admin/pagination.html:10 @@ -596,7 +604,7 @@ msgstr "" #: contrib/admin/templates/admin_doc/bookmarklets.html:18 msgid "Documentation for this page" -msgstr "Dokumentation för den här sidan" +msgstr "Dokumentation för denna sida" #: contrib/admin/templates/admin_doc/bookmarklets.html:19 msgid "" @@ -620,7 +628,7 @@ msgstr "" #: contrib/admin/templates/admin_doc/bookmarklets.html:24 msgid "Edit this object (current window)" -msgstr "Redigera det här objektet (aktuellt fönster)" +msgstr "Redigera detta objekt (aktuellt fönster)" #: contrib/admin/templates/admin_doc/bookmarklets.html:25 msgid "Jumps to the admin page for pages that represent a single object." @@ -630,7 +638,7 @@ msgstr "" #: contrib/admin/templates/admin_doc/bookmarklets.html:27 msgid "Edit this object (new window)" -msgstr "Redigera det här objektet (nytt fönster)" +msgstr "Redigera detta objekt (nytt fönster)" #: contrib/admin/templates/admin_doc/bookmarklets.html:28 msgid "As above, but opens the admin page in a new window." @@ -707,7 +715,7 @@ msgstr "" #: contrib/admin/templates/registration/password_reset_email.html:2 msgid "You're receiving this e-mail because you requested a password reset" msgstr "" -"Du får det här e-postbrevet eftersom du bad om att få lösenordet nollställt" +"Du får detta e-postbrev eftersom du bad om att få lösenordet nollställt" #: contrib/admin/templates/registration/password_reset_email.html:3 #, python-format @@ -722,7 +730,7 @@ msgstr "Ditt nya lösenord är: %(new_password)s" #: contrib/admin/templates/registration/password_reset_email.html:7 msgid "Feel free to change this password by going to this page:" msgstr "" -"Du är välkommen att ändra det här lösenordet genom att gå till den här sidan:" +"Du är välkommen att ändra detta lösenord genom att gå till denna sida:" #: contrib/admin/templates/registration/password_reset_email.html:11 msgid "Your username, in case you've forgotten:" @@ -796,7 +804,7 @@ msgstr "Lösenordet ändrades." msgid "Change password: %s" msgstr "Ändra lösenord: %s" -#: contrib/admin/views/decorators.py:11 contrib/auth/forms.py:60 +#: contrib/admin/views/decorators.py:17 contrib/auth/forms.py:60 msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." @@ -804,7 +812,7 @@ msgstr "" "Var god ange ett korrekt användarnamn och lösenord. Tänk på att skilja " "mellan gemener och versaler." -#: contrib/admin/views/decorators.py:63 +#: contrib/admin/views/decorators.py:69 msgid "" "Please log in again, because your session has expired. Don't worry: Your " "submission has been saved." @@ -812,19 +820,19 @@ msgstr "" "Du måste logga in igen eftersom din session har förfallit. Oroa dig inte: " "Din data har sparats." -#: contrib/admin/views/decorators.py:70 +#: contrib/admin/views/decorators.py:76 msgid "" "Looks like your browser isn't configured to accept cookies. Please enable " "cookies, reload this page, and try again." msgstr "" "Det verkar som att din webläsare inte är konfigurerad att acceptera cookies. " -"Aktivera cookies, ladda om den här sidan och försök igen." +"Aktivera cookies, ladda om denna sida och försök igen." -#: contrib/admin/views/decorators.py:84 +#: contrib/admin/views/decorators.py:90 msgid "Usernames cannot contain the '@' character." msgstr "Användarnamn får inte innehålla '@'-tecknet." -#: contrib/admin/views/decorators.py:86 +#: contrib/admin/views/decorators.py:92 #, python-format msgid "Your e-mail address is not your username. Try '%s' instead." msgstr "Din e-postadress är inte ditt användarnamn. Försök med '%s' istället." @@ -852,7 +860,7 @@ msgstr "Applikation %r hittades inte" #: contrib/admin/views/doc.py:173 #, python-format msgid "Model %(name)r not found in app %(label)r" -msgstr "Modellen %(name)r hittades inte i applikation %(label)r" +msgstr "Modell %(name)r hittades inte i applikation %(label)r" #: contrib/admin/views/doc.py:185 #, python-format @@ -1170,7 +1178,7 @@ msgstr "personalstatus" #: contrib/auth/models.py:136 msgid "Designates whether the user can log into this admin site." -msgstr "Avgör om användaren kan logga in på den här adminsidan." +msgstr "Avgör om användaren kan logga in på denna adminsida." #: contrib/auth/models.py:137 msgid "active" @@ -1193,7 +1201,7 @@ msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -"Anger att den här användaren har alla rättigheter utan att uttryckligen " +"Anger att denna användare har alla rättigheter utan att uttryckligen " "tilldela dem." #: contrib/auth/models.py:139 @@ -1314,8 +1322,8 @@ msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." msgstr "" -"Bocka för den här rutan om kommentaren är olämplig. Ett \"Den här " -"kommentaren har tagits bort\"-meddelande kommer visas istället." +"Bocka för denna ruta om kommentaren är olämplig. Ett \"Denna " +"kommentar har tagits bort\"-meddelande kommer visas istället." #: contrib/comments/models.py:96 msgid "comments" @@ -1388,7 +1396,7 @@ msgid "" "\n" "%(text)s" msgstr "" -"Den här kommentaren flaggades av %(user)s:\n" +"Denna kommentar flaggades av %(user)s:\n" "\n" "%(text)s" @@ -1465,7 +1473,7 @@ msgstr "Ditt namn:" #: contrib/comments/views/comments.py:28 msgid "" "This rating is required because you've entered at least one other rating." -msgstr "Det här betyget krävs eftersom du har fyllt i minst ett annat betyg." +msgstr "Detta betyg krävs eftersom du har fyllt i minst ett annat betyg." #: contrib/comments/views/comments.py:112 #, python-format @@ -1480,12 +1488,12 @@ msgid_plural "" "\n" "%(text)s" msgstr[0] "" -"Den här kommentaren postades av en användare som har postat färre än %(count)" +"Denna kommentar postades av en användare som har postat färre än %(count)" "s kommentar:\n" "\n" "%(text)s" msgstr[1] "" -"Den här kommentaren postades av en användare som har postat färre än %(count)" +"Denna kommentar postades av en användare som har postat färre än %(count)" "s kommentarer:\n" "\n" "%(text)s" @@ -1497,7 +1505,7 @@ msgid "" "\n" "%(text)s" msgstr "" -"Den här kommentaren postades av en oseriös användare:\n" +"Denna kommentar postades av en oseriös användare:\n" "\n" "%(text)s" @@ -1582,7 +1590,7 @@ msgid "" "Example: 'flatpages/contact_page.html'. If this isn't provided, the system " "will use 'flatpages/default.html'." msgstr "" -"Exempel: 'sidor/kontaktsida.html'. Om det här inte fylls i kommer systemet " +"Exempel: 'sidor/kontaktsida.html'. Om detta inte fylls i kommer systemet " "att använda 'flatpages/default.html'." #: contrib/flatpages/models.py:14 @@ -1592,7 +1600,7 @@ msgstr "registrering krävs" #: contrib/flatpages/models.py:14 msgid "If this is checked, only logged-in users will be able to view the page." msgstr "" -"Om det här bockas för kommer endast inloggade användare kunna se sidan." +"Om detta bockas för kommer endast inloggade användare kunna se sidan." #: contrib/flatpages/models.py:18 msgid "flat page" @@ -1602,110 +1610,110 @@ msgstr "statisk sida" msgid "flat pages" msgstr "statiska sidor" -#: contrib/humanize/templatetags/humanize.py:20 +#: contrib/humanize/templatetags/humanize.py:19 msgid "th" msgstr "" -#: contrib/humanize/templatetags/humanize.py:20 +#: contrib/humanize/templatetags/humanize.py:19 msgid "st" msgstr "" -#: contrib/humanize/templatetags/humanize.py:20 +#: contrib/humanize/templatetags/humanize.py:19 msgid "nd" msgstr "" -#: contrib/humanize/templatetags/humanize.py:20 +#: contrib/humanize/templatetags/humanize.py:19 msgid "rd" msgstr "" -#: contrib/humanize/templatetags/humanize.py:52 +#: contrib/humanize/templatetags/humanize.py:51 #, python-format msgid "%(value).1f million" msgid_plural "%(value).1f million" msgstr[0] "%(value).1f miljon" msgstr[1] "%(value).1f miljoner" -#: contrib/humanize/templatetags/humanize.py:55 +#: contrib/humanize/templatetags/humanize.py:54 #, python-format msgid "%(value).1f billion" msgid_plural "%(value).1f billion" msgstr[0] "%(value)1.f miljard" msgstr[1] "%(value)1.f miljarder" -#: contrib/humanize/templatetags/humanize.py:58 +#: contrib/humanize/templatetags/humanize.py:57 #, python-format msgid "%(value).1f trillion" msgid_plural "%(value).1f trillion" msgstr[0] "%(value)1.f biljon" msgstr[1] "%(value)1.f biljoner" -#: contrib/humanize/templatetags/humanize.py:74 +#: contrib/humanize/templatetags/humanize.py:73 msgid "one" msgstr "ett" -#: contrib/humanize/templatetags/humanize.py:74 +#: contrib/humanize/templatetags/humanize.py:73 msgid "two" msgstr "två" -#: contrib/humanize/templatetags/humanize.py:74 +#: contrib/humanize/templatetags/humanize.py:73 msgid "three" msgstr "tre" -#: contrib/humanize/templatetags/humanize.py:74 +#: contrib/humanize/templatetags/humanize.py:73 msgid "four" msgstr "fyra" -#: contrib/humanize/templatetags/humanize.py:74 +#: contrib/humanize/templatetags/humanize.py:73 msgid "five" msgstr "fem" -#: contrib/humanize/templatetags/humanize.py:74 +#: contrib/humanize/templatetags/humanize.py:73 msgid "six" msgstr "sex" -#: contrib/humanize/templatetags/humanize.py:74 +#: contrib/humanize/templatetags/humanize.py:73 msgid "seven" msgstr "sju" -#: contrib/humanize/templatetags/humanize.py:74 +#: contrib/humanize/templatetags/humanize.py:73 msgid "eight" msgstr "åtta" -#: contrib/humanize/templatetags/humanize.py:74 +#: contrib/humanize/templatetags/humanize.py:73 msgid "nine" msgstr "nio" -#: contrib/humanize/templatetags/humanize.py:94 +#: contrib/humanize/templatetags/humanize.py:93 msgid "today" msgstr "idag" -#: contrib/humanize/templatetags/humanize.py:96 +#: contrib/humanize/templatetags/humanize.py:95 msgid "tomorrow" msgstr "imorgon" -#: contrib/humanize/templatetags/humanize.py:98 +#: contrib/humanize/templatetags/humanize.py:97 msgid "yesterday" msgstr "igår" -#: contrib/localflavor/ar/forms.py:28 +#: contrib/localflavor/ar/forms.py:27 msgid "Enter a postal code in the format NNNN or ANNNNAAA." msgstr "Fyll i ett postnummer med formatet NNNN eller ANNNNAAA." -#: contrib/localflavor/ar/forms.py:50 contrib/localflavor/br/forms.py:96 +#: contrib/localflavor/ar/forms.py:49 contrib/localflavor/br/forms.py:96 #: contrib/localflavor/br/forms.py:135 contrib/localflavor/pe/forms.py:23 #: contrib/localflavor/pe/forms.py:51 msgid "This field requires only numbers." msgstr "Detta fält kräver enbart siffror." -#: contrib/localflavor/ar/forms.py:51 +#: contrib/localflavor/ar/forms.py:50 msgid "This field requires 7 or 8 digits." msgstr "Detta fält kräver 7 eller 8 sifrror." -#: contrib/localflavor/ar/forms.py:80 +#: contrib/localflavor/ar/forms.py:79 msgid "Enter a valid CUIT in XX-XXXXXXXX-X or XXXXXXXXXXXX format." msgstr "Fyll i ett giltigt CUIT med formatet XX-XXXXXXXX-X eller XXXXXXXXXXXX." -#: contrib/localflavor/ar/forms.py:81 +#: contrib/localflavor/ar/forms.py:80 msgid "Invalid CUIT." msgstr "Felaktigt CUIT." @@ -1750,11 +1758,10 @@ msgid "Enter a postal code in the format XXX XXX." msgstr "Fyll i ett postnummer med formatet XXX XXX." #: contrib/localflavor/ca/forms.py:88 -#, fuzzy msgid "Enter a valid Canadian Social Insurance number in XXX-XXX-XXX format." msgstr "" -"Fyll i ett giltigt Kannadensiskt \"social insurance number\" med formatet " -"XXX-XXX-XXX." +"Fyll i ett giltigt Kanadensiskt \"social insurance number\" med formatet XXX-" +"XXX-XXX." #: contrib/localflavor/ch/ch_states.py:5 msgid "Aargau" @@ -1873,19 +1880,16 @@ msgstr "" "X1234567<0 eller 1234567890." #: contrib/localflavor/cl/forms.py:29 -#, fuzzy msgid "Enter a valid Chilean RUT." msgstr "Fyll i ett giltigt chilenskt RUT" #: contrib/localflavor/cl/forms.py:30 -#, fuzzy msgid "Enter a valid Chilean RUT. The format is XX.XXX.XXX-X." msgstr "Fyll i ett giltigt chilenskt RUT. Formatet är XX.XXX.XXX-X." #: contrib/localflavor/cl/forms.py:31 -#, fuzzy msgid "The Chilean RUT is not valid." -msgstr "Det här fältet är ogiltigt." +msgstr "Det chilenska RUT:et var inte giltigt." #: contrib/localflavor/de/de_states.py:5 msgid "Baden-Wuerttemberg" @@ -1977,14 +1981,12 @@ msgid "Alacant" msgstr "" #: contrib/localflavor/es/es_provinces.py:8 -#, fuzzy msgid "Almeria" -msgstr "Aomori" +msgstr "Almería" #: contrib/localflavor/es/es_provinces.py:9 -#, fuzzy msgid "Avila" -msgstr "Akita" +msgstr "Ávila" #: contrib/localflavor/es/es_provinces.py:10 msgid "Badajoz" @@ -1995,262 +1997,243 @@ msgid "Illes Balears" msgstr "" #: contrib/localflavor/es/es_provinces.py:12 -#, fuzzy msgid "Barcelona" -msgstr "Makedonska" +msgstr "Barcelona" #: contrib/localflavor/es/es_provinces.py:13 msgid "Burgos" -msgstr "" +msgstr "Burgos" #: contrib/localflavor/es/es_provinces.py:14 msgid "Caceres" -msgstr "" +msgstr "Cáceres" #: contrib/localflavor/es/es_provinces.py:15 msgid "Cadiz" -msgstr "" +msgstr "Cádiz" #: contrib/localflavor/es/es_provinces.py:16 msgid "Castello" -msgstr "" +msgstr "Castellón" #: contrib/localflavor/es/es_provinces.py:17 msgid "Ciudad Real" -msgstr "" +msgstr "Ciudad Real" #: contrib/localflavor/es/es_provinces.py:18 msgid "Cordoba" -msgstr "" +msgstr "Córdoba" #: contrib/localflavor/es/es_provinces.py:19 msgid "A Coruna" -msgstr "" +msgstr "A Coruña" #: contrib/localflavor/es/es_provinces.py:20 msgid "Cuenca" -msgstr "" +msgstr "Cuenca" #: contrib/localflavor/es/es_provinces.py:21 msgid "Girona" -msgstr "" +msgstr "Girona" #: contrib/localflavor/es/es_provinces.py:22 -#, fuzzy msgid "Granada" -msgstr "Kannada" +msgstr "Granada" #: contrib/localflavor/es/es_provinces.py:23 msgid "Guadalajara" -msgstr "" +msgstr "Guadalajara" #: contrib/localflavor/es/es_provinces.py:24 msgid "Guipuzkoa" -msgstr "" +msgstr "Guipuzkoa" #: contrib/localflavor/es/es_provinces.py:25 msgid "Huelva" -msgstr "" +msgstr "Huelva" #: contrib/localflavor/es/es_provinces.py:26 -#, fuzzy msgid "Huesca" -msgstr "Tisdag" +msgstr "Huesca" #: contrib/localflavor/es/es_provinces.py:27 -#, fuzzy msgid "Jaen" -msgstr "Januari" +msgstr "Jaén" #: contrib/localflavor/es/es_provinces.py:28 -#, fuzzy msgid "Leon" -msgstr "Logga in" +msgstr "León" #: contrib/localflavor/es/es_provinces.py:29 msgid "Lleida" -msgstr "" +msgstr "Lleida" #: contrib/localflavor/es/es_provinces.py:30 #: contrib/localflavor/es/es_regions.py:17 msgid "La Rioja" -msgstr "" +msgstr "La Rioja" #: contrib/localflavor/es/es_provinces.py:31 msgid "Lugo" -msgstr "" +msgstr "Lugo" #: contrib/localflavor/es/es_provinces.py:32 #: contrib/localflavor/es/es_regions.py:18 msgid "Madrid" -msgstr "" +msgstr "Madrid" #: contrib/localflavor/es/es_provinces.py:33 -#, fuzzy msgid "Malaga" -msgstr "Saga" +msgstr "Málaga" #: contrib/localflavor/es/es_provinces.py:34 -#, fuzzy msgid "Murcia" -msgstr "Jura" +msgstr "Murcia" #: contrib/localflavor/es/es_provinces.py:35 msgid "Navarre" -msgstr "" +msgstr "Navarra" #: contrib/localflavor/es/es_provinces.py:36 msgid "Ourense" -msgstr "" +msgstr "Ourense" #: contrib/localflavor/es/es_provinces.py:37 msgid "Asturias" -msgstr "" +msgstr "Asturien" #: contrib/localflavor/es/es_provinces.py:38 -#, fuzzy msgid "Palencia" -msgstr "Galisiska" +msgstr "Palencia" #: contrib/localflavor/es/es_provinces.py:39 msgid "Las Palmas" -msgstr "" +msgstr "Las Palmas" #: contrib/localflavor/es/es_provinces.py:40 msgid "Pontevedra" -msgstr "" +msgstr "Pontevedra" #: contrib/localflavor/es/es_provinces.py:41 -#, fuzzy msgid "Salamanca" -msgstr "Saitama" +msgstr "Salamanca" #: contrib/localflavor/es/es_provinces.py:42 msgid "Santa Cruz de Tenerife" -msgstr "" +msgstr "Santa Cruz de Tenerife" #: contrib/localflavor/es/es_provinces.py:43 #: contrib/localflavor/es/es_regions.py:11 -#, fuzzy msgid "Cantabria" -msgstr "Katalanska" +msgstr "Kantabrien" #: contrib/localflavor/es/es_provinces.py:44 -#, fuzzy msgid "Segovia" -msgstr "Slovenska" +msgstr "Segovia" #: contrib/localflavor/es/es_provinces.py:45 msgid "Seville" -msgstr "" +msgstr "Sevilla" #: contrib/localflavor/es/es_provinces.py:46 -#, fuzzy msgid "Soria" -msgstr "Serbiska" +msgstr "Soria" #: contrib/localflavor/es/es_provinces.py:47 msgid "Tarragona" -msgstr "" +msgstr "Tarragona" #: contrib/localflavor/es/es_provinces.py:48 -#, fuzzy msgid "Teruel" -msgstr "Tis" +msgstr "Teruel" #: contrib/localflavor/es/es_provinces.py:49 msgid "Toledo" -msgstr "" +msgstr "Toledo" #: contrib/localflavor/es/es_provinces.py:50 -#, fuzzy msgid "Valencia" -msgstr "Galisiska" +msgstr "Valencia" #: contrib/localflavor/es/es_provinces.py:51 -#, fuzzy msgid "Valladolid" -msgstr "Valais" +msgstr "Valladolid" #: contrib/localflavor/es/es_provinces.py:52 msgid "Bizkaia" -msgstr "" +msgstr "Biscaya" #: contrib/localflavor/es/es_provinces.py:53 -#, fuzzy msgid "Zamora" -msgstr "Nara" +msgstr "Zamora" #: contrib/localflavor/es/es_provinces.py:54 msgid "Zaragoza" -msgstr "" +msgstr "Zaragoza" #: contrib/localflavor/es/es_provinces.py:55 msgid "Ceuta" -msgstr "" +msgstr "Ceuta" #: contrib/localflavor/es/es_provinces.py:56 msgid "Melilla" -msgstr "" +msgstr "Melilla" #: contrib/localflavor/es/es_regions.py:5 msgid "Andalusia" -msgstr "" +msgstr "Andalusien" #: contrib/localflavor/es/es_regions.py:6 msgid "Aragon" -msgstr "" +msgstr "Aragonien" #: contrib/localflavor/es/es_regions.py:7 msgid "Principality of Asturias" -msgstr "" +msgstr "Asturien" #: contrib/localflavor/es/es_regions.py:8 msgid "Balearic Islands" -msgstr "" +msgstr "Balearerna" #: contrib/localflavor/es/es_regions.py:9 msgid "Basque Country" -msgstr "" +msgstr "Baskien" #: contrib/localflavor/es/es_regions.py:10 -#, fuzzy msgid "Canary Islands" -msgstr "Saarland" +msgstr "Kanarieöarna" #: contrib/localflavor/es/es_regions.py:12 msgid "Castile-La Mancha" -msgstr "" +msgstr "Kastilien-La Mancha" #: contrib/localflavor/es/es_regions.py:13 msgid "Castile and Leon" -msgstr "" +msgstr "Kastilien och Leon" #: contrib/localflavor/es/es_regions.py:14 -#, fuzzy msgid "Catalonia" -msgstr "Katalanska" +msgstr "Katalonien" #: contrib/localflavor/es/es_regions.py:15 msgid "Extremadura" -msgstr "" +msgstr "Extremadura" #: contrib/localflavor/es/es_regions.py:16 -#, fuzzy msgid "Galicia" -msgstr "Galisiska" +msgstr "Galicien" #: contrib/localflavor/es/es_regions.py:19 msgid "Region of Murcia" -msgstr "" +msgstr "Murciaregionen" #: contrib/localflavor/es/es_regions.py:20 msgid "Foral Community of Navarre" -msgstr "" +msgstr "Navarra" #: contrib/localflavor/es/es_regions.py:21 msgid "Valencian Community" -msgstr "" +msgstr "Valenciaregionen" #: contrib/localflavor/es/forms.py:19 msgid "Enter a valid postal code in the range and format 01XXX - 52XXX." @@ -2274,24 +2257,25 @@ msgstr "Var god fyll i giltigt NIF eller NIE." #: contrib/localflavor/es/forms.py:68 msgid "Invalid checksum for NIF." -msgstr "" +msgstr "Ogiltig kontrollsumma för NIF." #: contrib/localflavor/es/forms.py:69 msgid "Invalid checksum for NIE." -msgstr "" +msgstr "Ogiltig kontrollsumma för NIE." #: contrib/localflavor/es/forms.py:70 msgid "Invalid checksum for CIF." -msgstr "" +msgstr "Ogiltig kontrollsumma för CIF." #: contrib/localflavor/es/forms.py:142 msgid "" "Please enter a valid bank account number in format XXXX-XXXX-XX-XXXXXXXXXX." msgstr "" +"Var god fyll i ett giltigt bankkontonummer i XXXX-XXXX-XX-XXXXXXXXXX-format." #: contrib/localflavor/es/forms.py:143 msgid "Invalid checksum for bank account number." -msgstr "" +msgstr "Ogiltig kontrollsumma för bankkontonummer." #: contrib/localflavor/fi/forms.py:28 msgid "Enter a valid Finnish social security number." @@ -2322,7 +2306,7 @@ msgstr "Fyll i ett giltigt personnummer." msgid "Enter a valid VAT number." msgstr "Fyll i ett giltigt VAT-nummer." -#: contrib/localflavor/jp/forms.py:19 +#: contrib/localflavor/jp/forms.py:17 msgid "Enter a postal code in the format XXXXXXX or XXX-XXXX." msgstr "Fyll i ett postnummer med formatet XXXXXXX eller XXX-XXXX." @@ -2572,7 +2556,7 @@ msgstr "Jalisco" #: contrib/localflavor/mx/mx_states.py:26 msgid "Estado de México" -msgstr "" +msgstr "Mexikanska staten" #: contrib/localflavor/mx/mx_states.py:27 msgid "Michoacán" @@ -2716,11 +2700,11 @@ msgstr "Detta fält kräver 11 sifrror." #: contrib/localflavor/pl/forms.py:39 msgid "National Identification Number consists of 11 digits." -msgstr "" +msgstr "\"National Identification Number\" består av 11 siffror." #: contrib/localflavor/pl/forms.py:40 msgid "Wrong checksum for the National Identification Number." -msgstr "" +msgstr "Fel kontrollsumma för \"National Identification Number\"" #: contrib/localflavor/pl/forms.py:72 msgid "" @@ -2730,15 +2714,16 @@ msgstr "" #: contrib/localflavor/pl/forms.py:73 msgid "Wrong checksum for the Tax Number (NIP)." -msgstr "" +msgstr "Fel kontrollsumma för skattenumret (NIP)." #: contrib/localflavor/pl/forms.py:112 msgid "National Business Register Number (REGON) consists of 7 or 9 digits." msgstr "" +"\"National Business Register Number\" (REGON) består av 7 eller 9 siffror." #: contrib/localflavor/pl/forms.py:113 msgid "Wrong checksum for the National Business Register Number (REGON)." -msgstr "" +msgstr "Fel kontrollsumma för \"National Business Register Number\" (REGON)." #: contrib/localflavor/pl/forms.py:156 msgid "Enter a postal code in the format XX-XXX." @@ -2773,9 +2758,8 @@ msgid "Masovia" msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:15 -#, fuzzy msgid "Opole" -msgstr "Valfri" +msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:16 msgid "Subcarpatia" @@ -2786,14 +2770,12 @@ msgid "Podlasie" msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:18 -#, fuzzy msgid "Pomerania" -msgstr "Rumänska" +msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:19 -#, fuzzy msgid "Silesia" -msgstr "Slovenska" +msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:20 msgid "Swietokrzyskie" @@ -2808,14 +2790,12 @@ msgid "Greater Poland" msgstr "" #: contrib/localflavor/pl/pl_voivodeships.py:23 -#, fuzzy msgid "West Pomerania" -msgstr "Mecklenburg-Vorpommern" +msgstr "" #: contrib/localflavor/sk/forms.py:30 -#, fuzzy msgid "Enter a postal code in the format XXXXX or XXX XX." -msgstr "Fyll i ett postnummer med formatet XXXXXXX eller XXX-XXXX." +msgstr "Fyll i ett postnummer med formatet XXXXX eller XXX XX." #: contrib/localflavor/sk/sk_districts.py:8 msgid "Banska Bystrica" @@ -2834,9 +2814,8 @@ msgid "Banovce nad Bebravou" msgstr "" #: contrib/localflavor/sk/sk_districts.py:12 -#, fuzzy msgid "Brezno" -msgstr "Bremen" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:13 msgid "Bratislava I" @@ -2879,14 +2858,12 @@ msgid "Dunajska Streda" msgstr "" #: contrib/localflavor/sk/sk_districts.py:23 -#, fuzzy msgid "Galanta" -msgstr "Galisiska" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:24 -#, fuzzy msgid "Gelnica" -msgstr "Galisiska" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:25 msgid "Hlohovec" @@ -2905,9 +2882,8 @@ msgid "Kezmarok" msgstr "" #: contrib/localflavor/sk/sk_districts.py:29 -#, fuzzy msgid "Komarno" -msgstr "Koreanska" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:30 msgid "Kosice I" @@ -2950,19 +2926,16 @@ msgid "Liptovsky Mikulas" msgstr "" #: contrib/localflavor/sk/sk_districts.py:40 -#, fuzzy msgid "Lucenec" -msgstr "Luzern" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:41 -#, fuzzy msgid "Malacky" -msgstr "Maj" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:42 -#, fuzzy msgid "Martin" -msgstr "Lettiska" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:43 msgid "Medzilaborce" @@ -2981,9 +2954,8 @@ msgid "Namestovo" msgstr "" #: contrib/localflavor/sk/sk_districts.py:47 -#, fuzzy msgid "Nitra" -msgstr "Niigata" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:48 msgid "Nove Mesto nad Vahom" @@ -3002,9 +2974,8 @@ msgid "Pezinok" msgstr "" #: contrib/localflavor/sk/sk_districts.py:52 -#, fuzzy msgid "Piestany" -msgstr "Persiska" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:53 msgid "Poltar" @@ -3047,29 +3018,24 @@ msgid "Ruzomberok" msgstr "" #: contrib/localflavor/sk/sk_districts.py:63 -#, fuzzy msgid "Sabinov" -msgstr "nov" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:64 -#, fuzzy msgid "Senec" -msgstr "Bern" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:65 -#, fuzzy msgid "Senica" -msgstr "Slovenska" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:66 -#, fuzzy msgid "Skalica" -msgstr "Galisiska" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:67 -#, fuzzy msgid "Snina" -msgstr "nio" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:68 msgid "Sobrance" @@ -3092,9 +3058,8 @@ msgid "Svidnik" msgstr "" #: contrib/localflavor/sk/sk_districts.py:73 -#, fuzzy msgid "Sala" -msgstr "Saga" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:74 msgid "Topolcany" @@ -3105,9 +3070,8 @@ msgid "Trebisov" msgstr "" #: contrib/localflavor/sk/sk_districts.py:76 -#, fuzzy msgid "Trencin" -msgstr "Franska" +msgstr "" #: contrib/localflavor/sk/sk_districts.py:77 msgid "Trnava" @@ -3210,22 +3174,20 @@ msgid "Derbyshire" msgstr "" #: contrib/localflavor/uk/uk_regions.py:18 -#, fuzzy msgid "Devon" -msgstr "sju" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:19 msgid "Dorset" msgstr "" #: contrib/localflavor/uk/uk_regions.py:20 -#, fuzzy msgid "Durham" -msgstr "Jura" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:21 msgid "East Sussex" -msgstr "" +msgstr "Östsussex" #: contrib/localflavor/uk/uk_regions.py:22 msgid "Essex" @@ -3252,14 +3214,12 @@ msgid "Hertfordshire" msgstr "" #: contrib/localflavor/uk/uk_regions.py:28 -#, fuzzy msgid "Kent" -msgstr "Koreanska" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:29 -#, fuzzy msgid "Lancashire" -msgstr "Yamanashi" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:30 msgid "Leicestershire" @@ -3318,9 +3278,8 @@ msgid "Suffolk" msgstr "" #: contrib/localflavor/uk/uk_regions.py:44 -#, fuzzy msgid "Surrey" -msgstr "Aktuell:" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:45 msgid "Tyne and Wear" @@ -3359,10 +3318,13 @@ msgid "County Armagh" msgstr "" #: contrib/localflavor/uk/uk_regions.py:57 -#: contrib/localflavor/uk/uk_regions.py:58 msgid "County Down" msgstr "" +#: contrib/localflavor/uk/uk_regions.py:58 +msgid "County Fermanagh" +msgstr "" + #: contrib/localflavor/uk/uk_regions.py:59 msgid "County Londonderry" msgstr "" @@ -3404,9 +3366,8 @@ msgid "West Glamorgan" msgstr "" #: contrib/localflavor/uk/uk_regions.py:75 -#, fuzzy msgid "Borders" -msgstr "Sortera:" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:76 msgid "Central Scotland" @@ -3417,23 +3378,20 @@ msgid "Dumfries and Galloway" msgstr "" #: contrib/localflavor/uk/uk_regions.py:78 -#, fuzzy msgid "Fife" -msgstr "Filter" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:79 -#, fuzzy msgid "Grampian" -msgstr "Tyska" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:80 msgid "Highland" msgstr "" #: contrib/localflavor/uk/uk_regions.py:81 -#, fuzzy msgid "Lothian" -msgstr "Lettiska" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:82 msgid "Orkney Islands" @@ -3456,23 +3414,20 @@ msgid "Western Isles" msgstr "" #: contrib/localflavor/uk/uk_regions.py:90 -#, fuzzy msgid "England" -msgstr "och" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:91 msgid "Northern Ireland" msgstr "" #: contrib/localflavor/uk/uk_regions.py:92 -#, fuzzy msgid "Scotland" -msgstr "Saarland" +msgstr "" #: contrib/localflavor/uk/uk_regions.py:93 -#, fuzzy msgid "Wales" -msgstr "Walesiska" +msgstr "" #: contrib/localflavor/us/forms.py:16 msgid "Enter a zip code in the format XXXXX or XXXXX-XXXX." @@ -3483,29 +3438,24 @@ msgid "Enter a valid U.S. Social Security number in XXX-XX-XXXX format." msgstr "Fyll i ett giltigt amerikanskt personnummer i formatet XXX-XX-XXXX." #: contrib/localflavor/za/forms.py:20 -#, fuzzy msgid "Enter a valid South African ID number" -msgstr "Fyll i ett giltigt VAT-nummer." +msgstr "Fyll i ett giltigt Sydafrikanskt ID-nummer." #: contrib/localflavor/za/forms.py:54 -#, fuzzy msgid "Enter a valid South African postal code" -msgstr "Fyll i ett giltigt postnummer." +msgstr "Fyll i ett giltigt Afrikanskt postnummer." #: contrib/localflavor/za/za_provinces.py:4 -#, fuzzy msgid "Eastern Cape" -msgstr "Användarnamn" +msgstr "" #: contrib/localflavor/za/za_provinces.py:5 -#, fuzzy msgid "Free State" -msgstr "poängen tillsatt den" +msgstr "" #: contrib/localflavor/za/za_provinces.py:6 -#, fuzzy msgid "Gauteng" -msgstr "aug" +msgstr "" #: contrib/localflavor/za/za_provinces.py:7 msgid "KwaZulu-Natal" @@ -3524,14 +3474,12 @@ msgid "Northern Cape" msgstr "" #: contrib/localflavor/za/za_provinces.py:11 -#, fuzzy msgid "North West" -msgstr "Nordrhein-Westfalen" +msgstr "" #: contrib/localflavor/za/za_provinces.py:12 -#, fuzzy msgid "Western Cape" -msgstr "Användarnamn" +msgstr "" #: contrib/redirects/models.py:7 msgid "redirect from" @@ -3542,7 +3490,7 @@ msgid "" "This should be an absolute path, excluding the domain name. Example: '/" "events/search/'." msgstr "" -"Det här bör vara en absolut sökväg utan domännamnet. Exempel: '/handelser/" +"Detta bör vara en absolut sökväg utan domännamnet. Exempel: '/handelser/" "sok/'." #: contrib/redirects/models.py:9 @@ -3565,23 +3513,23 @@ msgstr "omdirigera" msgid "redirects" msgstr "omdirigeringar" -#: contrib/sessions/models.py:46 +#: contrib/sessions/models.py:41 msgid "session key" msgstr "sessionsnyckel" -#: contrib/sessions/models.py:47 +#: contrib/sessions/models.py:42 msgid "session data" msgstr "sessionsdata" -#: contrib/sessions/models.py:48 +#: contrib/sessions/models.py:43 msgid "expire date" msgstr "utgångsdatum" -#: contrib/sessions/models.py:53 +#: contrib/sessions/models.py:48 msgid "session" msgstr "session" -#: contrib/sessions/models.py:54 +#: contrib/sessions/models.py:49 msgid "sessions" msgstr "sessioner" @@ -3604,20 +3552,20 @@ msgstr "webbplatser" #: core/validators.py:72 msgid "This value must contain only letters, numbers and underscores." msgstr "" -"Det här värdet får endast innehålla bokstäver, siffror och understreck." +"Detta värde får endast innehålla bokstäver, siffror och understreck." #: core/validators.py:76 msgid "" "This value must contain only letters, numbers, underscores, dashes or " "slashes." msgstr "" -"Det här värdet får endast innehålla bokstäver, siffror, understreck, " +"Detta värde får endast innehålla bokstäver, siffror, understreck, " "bindestreck eller snedstreck." #: core/validators.py:80 msgid "This value must contain only letters, numbers, underscores or hyphens." msgstr "" -"Det här värdet får endast innehålla bokstäver, siffror, understreck eller " +"Detta värde får endast innehålla bokstäver, siffror, understreck eller " "bindestreck." #: core/validators.py:84 @@ -3650,7 +3598,7 @@ msgstr "Icke-numeriska tecken är inte tillåtna här." #: core/validators.py:123 msgid "This value can't be comprised solely of digits." -msgstr "Det här värdet kan inte enbart bestå av siffror." +msgstr "Detta värde kan inte enbart bestå av siffror." #: core/validators.py:128 newforms/fields.py:151 msgid "Enter a whole number." @@ -3669,7 +3617,7 @@ msgstr "Årtal måste vara 1900 eller senare." msgid "Invalid date: %s" msgstr "Ogiltigt datum: %s" -#: core/validators.py:156 db/models/fields/__init__.py:509 +#: core/validators.py:156 db/models/fields/__init__.py:522 msgid "Enter a valid date in YYYY-MM-DD format." msgstr "Fyll i ett giltigt datum med formatet ÅÅÅÅ-MM-DD." @@ -3677,7 +3625,7 @@ msgstr "Fyll i ett giltigt datum med formatet ÅÅÅÅ-MM-DD." msgid "Enter a valid time in HH:MM format." msgstr "Fyll i ett giltigt klockslag med formatet TT:MM." -#: core/validators.py:165 db/models/fields/__init__.py:583 +#: core/validators.py:165 db/models/fields/__init__.py:599 msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." msgstr "Fyll i en giltig tidpunkt med formatet ÅÅÅÅ-MM-DD TT:MM." @@ -3757,7 +3705,7 @@ msgstr[1] "Akta din tunga! Orden %s är inte tillåtna här." #: core/validators.py:288 #, python-format msgid "This field must match the '%s' field." -msgstr "Det här fältet måste matcha fältet '%s'." +msgstr "Detta fält måste matcha fältet '%s'." #: core/validators.py:307 msgid "Please enter something for at least one field." @@ -3770,12 +3718,12 @@ msgstr "Fyll antingen i båda fälten eller lämna båda tomma." #: core/validators.py:335 #, python-format msgid "This field must be given if %(field)s is %(value)s" -msgstr "Det är fältet måste anges om %(field)s är %(value)s" +msgstr "Detta fält måste anges om %(field)s är %(value)s" #: core/validators.py:348 #, python-format msgid "This field must be given if %(field)s is not %(value)s" -msgstr "Det här fältet måste anges om %(field)s inte är %(value)s" +msgstr "Detta fält måste anges om %(field)s inte är %(value)s" #: core/validators.py:367 msgid "Duplicate values are not allowed." @@ -3784,22 +3732,22 @@ msgstr "Dubbletter är inte tillåtna." #: core/validators.py:382 #, python-format msgid "This value must be between %(lower)s and %(upper)s." -msgstr "Det här värdet måste vara mellan %(lower)s och %(upper)s." +msgstr "Detta värde måste vara mellan %(lower)s och %(upper)s." #: core/validators.py:384 #, python-format msgid "This value must be at least %s." -msgstr "Det här värdet måste vara minst %s." +msgstr "Detta värde måste vara minst %s." #: core/validators.py:386 #, python-format msgid "This value must be no more than %s." -msgstr "Det här värdet får inte vara mer än %s." +msgstr "Detta värde får inte vara mer än %s." #: core/validators.py:427 #, python-format msgid "This value must be a power of %s." -msgstr "Det här värdet måste vara en potens av %s." +msgstr "Detta värde måste vara en potens av %s." #: core/validators.py:437 msgid "Please enter a valid decimal number." @@ -3848,11 +3796,11 @@ msgstr "Se till att filen du laddade upp är som mest %s byte stor." #: core/validators.py:485 msgid "The format for this field is wrong." -msgstr "Formatet för det här fältet är fel." +msgstr "Formatet för detta fält är fel." #: core/validators.py:500 msgid "This field is invalid." -msgstr "Det här fältet är ogiltigt." +msgstr "Detta fält är ogiltigt." #: core/validators.py:536 #, python-format @@ -3929,54 +3877,54 @@ msgstr "%(object)s med typen %(type)s finns redan för %(field)s." #: db/models/fields/__init__.py:52 #, python-format msgid "%(optname)s with this %(fieldname)s already exists." -msgstr "%(optname)s med det här %(fieldname)s finns redan." +msgstr "%(optname)s med detta %(fieldname)s finns redan." -#: db/models/fields/__init__.py:161 db/models/fields/__init__.py:318 -#: db/models/fields/__init__.py:735 db/models/fields/__init__.py:746 +#: db/models/fields/__init__.py:161 db/models/fields/__init__.py:322 +#: db/models/fields/__init__.py:754 db/models/fields/__init__.py:765 #: newforms/fields.py:45 oldforms/__init__.py:374 msgid "This field is required." -msgstr "Det här fältet är obligatoriskt." +msgstr "Detta fält måste fyllas i." -#: db/models/fields/__init__.py:418 +#: db/models/fields/__init__.py:422 msgid "This value must be an integer." -msgstr "Det här värdet måste vara ett heltal." +msgstr "Detta värde måste vara ett heltal." -#: db/models/fields/__init__.py:454 +#: db/models/fields/__init__.py:461 msgid "This value must be either True or False." -msgstr "Det här värdet måste vara antingen True eller False." +msgstr "Detta värde måste vara antingen True eller False." -#: db/models/fields/__init__.py:475 +#: db/models/fields/__init__.py:485 msgid "This field cannot be null." -msgstr "Det här fältet får inte vara tomt." +msgstr "Detta fält får inte vara null." -#: db/models/fields/__init__.py:644 +#: db/models/fields/__init__.py:663 msgid "This value must be a decimal number." -msgstr "Det här värdet måste vara ett decimaltal." +msgstr "Detta värde måste vara ett decimaltal." -#: db/models/fields/__init__.py:755 +#: db/models/fields/__init__.py:774 msgid "Enter a valid filename." msgstr "Fyll i ett giltigt filnamn." -#: db/models/fields/__init__.py:908 +#: db/models/fields/__init__.py:945 msgid "This value must be either None, True or False." -msgstr "Det här värdet måste vara antingen None, True eller False." +msgstr "Detta värde måste vara antingen None, True eller False." -#: db/models/fields/related.py:55 +#: db/models/fields/related.py:93 #, python-format msgid "Please enter a valid %s." msgstr "Var god fyll i giltig %s." -#: db/models/fields/related.py:658 +#: db/models/fields/related.py:694 msgid "Separate multiple IDs with commas." msgstr "Separera flera ID-nummer med kommatecken." -#: db/models/fields/related.py:660 +#: db/models/fields/related.py:696 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Håll ner \"Control\" eller \"Command\" på en Mac för att välja fler än en." -#: db/models/fields/related.py:707 +#: db/models/fields/related.py:743 #, python-format msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." msgid_plural "" @@ -4059,7 +4007,7 @@ msgstr "Fyll i en giltig URL." msgid "This URL appears to be a broken link." msgstr "Denna URL verkar vara en trasig länk." -#: newforms/fields.py:559 newforms/models.py:317 +#: newforms/fields.py:559 newforms/models.py:300 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" "Välj ett giltigt alternativ. Det valet finns inte bland tillgängliga " @@ -4072,7 +4020,7 @@ msgstr "" "Välj ett giltigt alternativ. %(value)s finns inte bland tillgängliga " "alternativ." -#: newforms/fields.py:599 newforms/fields.py:661 newforms/models.py:377 +#: newforms/fields.py:599 newforms/fields.py:661 newforms/models.py:360 msgid "Enter a list of values." msgstr "Fyll i en lista med värden." @@ -4080,7 +4028,7 @@ msgstr "Fyll i en lista med värden." msgid "Enter a valid IPv4 address." msgstr "Fyll i en giltig IPv4 adress." -#: newforms/models.py:378 +#: newforms/models.py:361 #, python-format msgid "Select a valid choice. %s is not one of the available choices." msgstr "" @@ -4114,28 +4062,28 @@ msgstr "Fyll i ett positivt tal." msgid "Enter a whole number between 0 and 32,767." msgstr "Fyll i ett heltal mellan 0 och 32767." -#: template/defaultfilters.py:691 +#: template/defaultfilters.py:695 msgid "yes,no,maybe" msgstr "ja,nej,kanske" -#: template/defaultfilters.py:722 +#: template/defaultfilters.py:726 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "%(size)d byte" msgstr[1] "%(size)d byte" -#: template/defaultfilters.py:724 +#: template/defaultfilters.py:728 #, python-format msgid "%.1f KB" msgstr "%.1f KB" -#: template/defaultfilters.py:726 +#: template/defaultfilters.py:730 #, python-format msgid "%.1f MB" msgstr "%.1f MB" -#: template/defaultfilters.py:727 +#: template/defaultfilters.py:731 #, python-format msgid "%.1f GB" msgstr "%.1f GB" @@ -4398,23 +4346,23 @@ msgstr "%(number)d %(type)s" msgid ", %(number)d %(type)s" msgstr ", %(number)d %(type)s" -#: utils/translation/trans_real.py:399 +#: utils/translation/trans_real.py:403 msgid "DATE_FORMAT" msgstr "Y-m-d" -#: utils/translation/trans_real.py:400 +#: utils/translation/trans_real.py:404 msgid "DATETIME_FORMAT" msgstr "Y-m-d H:i" -#: utils/translation/trans_real.py:401 +#: utils/translation/trans_real.py:405 msgid "TIME_FORMAT" msgstr "H:i" -#: utils/translation/trans_real.py:417 +#: utils/translation/trans_real.py:421 msgid "YEAR_MONTH_FORMAT" msgstr "F Y" -#: utils/translation/trans_real.py:418 +#: utils/translation/trans_real.py:422 msgid "MONTH_DAY_FORMAT" msgstr "j F" @@ -4432,3 +4380,6 @@ msgstr "%(verbose_name)s uppdaterades." #, python-format msgid "The %(verbose_name)s was deleted." msgstr "%(verbose_name)s togs bort." + +#~ msgid "Gaeilge" +#~ msgstr "Gaeliska" diff --git a/django/conf/locale/sv/LC_MESSAGES/djangojs.mo b/django/conf/locale/sv/LC_MESSAGES/djangojs.mo index 39c6017803..159f7adcb3 100644 Binary files a/django/conf/locale/sv/LC_MESSAGES/djangojs.mo and b/django/conf/locale/sv/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/sv/LC_MESSAGES/djangojs.po b/django/conf/locale/sv/LC_MESSAGES/djangojs.po index b27f827176..9576e22cda 100644 --- a/django/conf/locale/sv/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/sv/LC_MESSAGES/djangojs.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: djangojs\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-02-01 15:31+0100\n" "PO-Revision-Date: 2008-02-01 15:32+0100\n" diff --git a/django/conf/locale/ta/LC_MESSAGES/django.mo b/django/conf/locale/ta/LC_MESSAGES/django.mo index c1d3cf26f5..ea0fab5fa2 100644 Binary files a/django/conf/locale/ta/LC_MESSAGES/django.mo and b/django/conf/locale/ta/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ta/LC_MESSAGES/django.po b/django/conf/locale/ta/LC_MESSAGES/django.po index e3c539a8a1..68332551d1 100644 --- a/django/conf/locale/ta/LC_MESSAGES/django.po +++ b/django/conf/locale/ta/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django-new\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-25 15:43+0200\n" "PO-Revision-Date: 2007-03-15 16:48+0530\n" diff --git a/django/conf/locale/ta/LC_MESSAGES/djangojs.mo b/django/conf/locale/ta/LC_MESSAGES/djangojs.mo index 2565a6dda0..b78b610dc2 100644 Binary files a/django/conf/locale/ta/LC_MESSAGES/djangojs.mo and b/django/conf/locale/ta/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/ta/LC_MESSAGES/djangojs.po b/django/conf/locale/ta/LC_MESSAGES/djangojs.po index 03fbece314..f60e945adf 100644 --- a/django/conf/locale/ta/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/ta/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # PONNUSAMY.A , 2007. msgid "" msgstr "" -"Project-Id-Version: djangojs\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-12-09 11:51+0100\n" "PO-Revision-Date: 2007-03-14 16:40+0530\n" diff --git a/django/conf/locale/te/LC_MESSAGES/django.mo b/django/conf/locale/te/LC_MESSAGES/django.mo index e86df1c91c..1541b23fb3 100644 Binary files a/django/conf/locale/te/LC_MESSAGES/django.mo and b/django/conf/locale/te/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/te/LC_MESSAGES/django.po b/django/conf/locale/te/LC_MESSAGES/django.po index e0c600ba3e..f0bb7a652d 100644 --- a/django/conf/locale/te/LC_MESSAGES/django.po +++ b/django/conf/locale/te/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-25 15:43+0200\n" "PO-Revision-Date: 2007-05-19 12:44+0530\n" diff --git a/django/conf/locale/te/LC_MESSAGES/djangojs.mo b/django/conf/locale/te/LC_MESSAGES/djangojs.mo index c7c56427cb..b8df70da0e 100644 Binary files a/django/conf/locale/te/LC_MESSAGES/djangojs.mo and b/django/conf/locale/te/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/te/LC_MESSAGES/djangojs.po b/django/conf/locale/te/LC_MESSAGES/djangojs.po index 7f392fde25..16f5f9f990 100644 --- a/django/conf/locale/te/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/te/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # pavithran , 2007. msgid "" msgstr "" -"Project-Id-Version: djangojs\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-12-09 11:51+0100\n" "PO-Revision-Date: 2007-03-06 16:08+0530\n" diff --git a/django/conf/locale/tr/LC_MESSAGES/django.mo b/django/conf/locale/tr/LC_MESSAGES/django.mo index b6bff7439e..2d409001f4 100644 Binary files a/django/conf/locale/tr/LC_MESSAGES/django.mo and b/django/conf/locale/tr/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/tr/LC_MESSAGES/django.po b/django/conf/locale/tr/LC_MESSAGES/django.po index cbd21056e5..dd2c592cfb 100644 --- a/django/conf/locale/tr/LC_MESSAGES/django.po +++ b/django/conf/locale/tr/LC_MESSAGES/django.po @@ -3,7 +3,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-03-14 01:38+0200\n" "PO-Revision-Date: 2007-12-30 12:15+0200\n" diff --git a/django/conf/locale/tr/LC_MESSAGES/djangojs.mo b/django/conf/locale/tr/LC_MESSAGES/djangojs.mo index 9d5b8e2f51..1748dfa8d5 100644 Binary files a/django/conf/locale/tr/LC_MESSAGES/djangojs.mo and b/django/conf/locale/tr/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/tr/LC_MESSAGES/djangojs.po b/django/conf/locale/tr/LC_MESSAGES/djangojs.po index 2ce42ff1b6..cae1933fc3 100644 --- a/django/conf/locale/tr/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/tr/LC_MESSAGES/djangojs.po @@ -2,7 +2,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django 0.95\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-09-30 01:31+0300\n" "PO-Revision-Date: 2006-09-30 01:31+0300\n" diff --git a/django/conf/locale/uk/LC_MESSAGES/django.mo b/django/conf/locale/uk/LC_MESSAGES/django.mo index 2c7a7cd35f..b6b496218b 100644 Binary files a/django/conf/locale/uk/LC_MESSAGES/django.mo and b/django/conf/locale/uk/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/uk/LC_MESSAGES/django.po b/django/conf/locale/uk/LC_MESSAGES/django.po index 3974a86c5e..3b24145b94 100644 --- a/django/conf/locale/uk/LC_MESSAGES/django.po +++ b/django/conf/locale/uk/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-16 10:13+0200\n" "PO-Revision-Date: 2006-03-20 21:18+0300\n" diff --git a/django/conf/locale/uk/LC_MESSAGES/djangojs.mo b/django/conf/locale/uk/LC_MESSAGES/djangojs.mo index 1db40df910..fae1fdc90e 100644 Binary files a/django/conf/locale/uk/LC_MESSAGES/djangojs.mo and b/django/conf/locale/uk/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/uk/LC_MESSAGES/djangojs.po b/django/conf/locale/uk/LC_MESSAGES/djangojs.po index 4084313848..120d08d70d 100644 --- a/django/conf/locale/uk/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/uk/LC_MESSAGES/djangojs.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-06-28 17:36+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo index df3bf3f6a0..df9d286ec6 100644 Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po index e9f296a1bf..c468330cc8 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django v1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-16 10:10+0200\n" "PO-Revision-Date: 2007-07-05 12:44+0800\n" diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo b/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo index f0127a55a0..6d1bcc18ee 100644 Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo and b/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po b/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po index 03abe3708c..46b3ed4b9d 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/djangojs.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: Django 0.95\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-03-21 18:43+0800\n" "PO-Revision-Date: 2006-09-25 08:35+0800\n" diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo index 9c31d51136..e3dfa52f2c 100644 Binary files a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo and b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.po b/django/conf/locale/zh_TW/LC_MESSAGES/django.po index 650ac5b912..1109545891 100644 --- a/django/conf/locale/zh_TW/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_TW/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ # msgid "" msgstr "" -"Project-Id-Version: django v1.0\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2006-05-16 10:13+0200\n" "PO-Revision-Date: 2007-04-05 01:32+1000\n" diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo b/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo index 1db40df910..fae1fdc90e 100644 Binary files a/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo and b/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.po b/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.po index 4084313848..120d08d70d 100644 --- a/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/zh_TW/LC_MESSAGES/djangojs.po @@ -6,7 +6,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-06-28 17:36+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" diff --git a/django/contrib/admin/templates/admin_doc/index.html b/django/contrib/admin/templates/admin_doc/index.html index 74f9f20916..242fc7339a 100644 --- a/django/contrib/admin/templates/admin_doc/index.html +++ b/django/contrib/admin/templates/admin_doc/index.html @@ -1,28 +1,28 @@ -{% extends "admin/base_site.html" %} -{% load i18n %} -{% block breadcrumbs %}
      Home › Documentation
      {% endblock %} -{% block userlinks %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} -{% block title %}Documentation{% endblock %} - -{% block content %} - -

      Documentation

      - -
      -

      Tags

      -

      List of all the template tags and their functions.

      - -

      Filters

      -

      Filters are actions which can be applied to variables in a template to alter the output.

      - -

      Models

      -

      Models are descriptions of all the objects in the system and their associated fields. Each model has a list of fields which can be accessed as template variables.

      - -

      Views

      -

      Each page on the public site is generated by a view. The view defines which template is used to generate the page and which objects are available to that template.

      - -

      Bookmarklets

      -

      Tools for your browser to quickly access admin functionality.

      -
      - -{% endblock %} +{% extends "admin/base_site.html" %} +{% load i18n %} +{% block breadcrumbs %}
      Home › Documentation
      {% endblock %} +{% block title %}Documentation{% endblock %} + +{% block content %} + +

      Documentation

      + +
      +

      Tags

      +

      List of all the template tags and their functions.

      + +

      Filters

      +

      Filters are actions which can be applied to variables in a template to alter the output.

      + +

      Models

      +

      Models are descriptions of all the objects in the system and their associated fields. Each model has a list of fields which can be accessed as template variables.

      + +

      Views

      +

      Each page on the public site is generated by a view. The view defines which template is used to generate the page and which objects are available to that template.

      + +

      Bookmarklets

      +

      Tools for your browser to quickly access admin functionality.

      +
      + +{% endblock %} + diff --git a/django/contrib/admin/templates/admin_doc/view_index.html b/django/contrib/admin/templates/admin_doc/view_index.html index 22c6dca379..4099005828 100644 --- a/django/contrib/admin/templates/admin_doc/view_index.html +++ b/django/contrib/admin/templates/admin_doc/view_index.html @@ -1,43 +1,43 @@ -{% extends "admin/base_site.html" %} -{% load i18n %} -{% block coltype %}colSM{% endblock %} -{% block breadcrumbs %}
      Home › Documentation › Views
      {% endblock %} -{% block userlinks %}{% trans 'Change password' %} / {% trans 'Log out' %}{% endblock %} -{% block title %}Views{% endblock %} - -{% block content %} - -

      View documentation

      - -{% regroup views|dictsort:"site_id" by site as views_by_site %} - -
      -
      -

      Jump to site

      - -
      -
      - -
      - -{% for site_views in views_by_site %} -
      -

      Views by URL on {{ site_views.grouper.name }}

      - -{% for view in site_views.list|dictsort:"url" %} -{% ifchanged %} -

      {{ view.url|escape }}

      -

      View function: {{ view.module }}.{{ view.name }}

      -

      {{ view.title }}

      -
      -{% endifchanged %} -{% endfor %} -
      -{% endfor %} -
      -{% endblock %} - +{% extends "admin/base_site.html" %} +{% load i18n %} +{% block coltype %}colSM{% endblock %} +{% block breadcrumbs %}
      Home › Documentation › Views
      {% endblock %} +{% block title %}Views{% endblock %} + +{% block content %} + +

      View documentation

      + +{% regroup views|dictsort:"site_id" by site as views_by_site %} + +
      +
      +

      Jump to site

      + +
      +
      + +
      + +{% for site_views in views_by_site %} +
      +

      Views by URL on {{ site_views.grouper.name }}

      + +{% for view in site_views.list|dictsort:"url" %} +{% ifchanged %} +

      {{ view.url|escape }}

      +

      View function: {{ view.module }}.{{ view.name }}

      +

      {{ view.title }}

      +
      +{% endifchanged %} +{% endfor %} +
      +{% endfor %} +
      +{% endblock %} + + diff --git a/django/contrib/formtools/preview.py b/django/contrib/formtools/preview.py index 66583dde95..db5d58e971 100644 --- a/django/contrib/formtools/preview.py +++ b/django/contrib/formtools/preview.py @@ -105,7 +105,7 @@ class FormPreview(object): Subclasses may want to take into account request-specific information such as the IP address. """ - data = [(bf.name, bf.data) for bf in form] + [settings.SECRET_KEY] + data = [(bf.name, bf.data or '') for bf in form] + [settings.SECRET_KEY] # Use HIGHEST_PROTOCOL because it's the most efficient. It requires # Python 2.3, but Django requires 2.3 anyway, so that's OK. pickled = pickle.dumps(data, pickle.HIGHEST_PROTOCOL) diff --git a/django/contrib/formtools/wizard.py b/django/contrib/formtools/wizard.py new file mode 100644 index 0000000000..a197c3e659 --- /dev/null +++ b/django/contrib/formtools/wizard.py @@ -0,0 +1,246 @@ +""" +FormWizard class -- implements a multi-page form, validating between each +step and storing the form's state as HTML hidden fields so that no state is +stored on the server side. +""" + +from django import newforms as forms +from django.conf import settings +from django.http import Http404 +from django.shortcuts import render_to_response +from django.template.context import RequestContext +import cPickle as pickle +import md5 + +class FormWizard(object): + # Dictionary of extra template context variables. + extra_context = {} + + # The HTML (and POST data) field name for the "step" variable. + step_field_name="wizard_step" + + # METHODS SUBCLASSES SHOULDN'T OVERRIDE ################################### + + def __init__(self, form_list, initial=None): + "form_list should be a list of Form classes (not instances)." + self.form_list = form_list[:] + self.initial = initial or {} + self.step = 0 # A zero-based counter keeping track of which step we're in. + + def __repr__(self): + return "step: %d\nform_list: %s\ninitial_data: %s" % (self.step, self.form_list, self.initial) + + def get_form(self, step, data=None): + "Helper method that returns the Form instance for the given step." + return self.form_list[step](data, prefix=self.prefix_for_step(step), initial=self.initial.get(step, None)) + + def num_steps(self): + "Helper method that returns the number of steps." + # You might think we should just set "self.form_list = len(form_list)" + # in __init__(), but this calculation needs to be dynamic, because some + # hook methods might alter self.form_list. + return len(self.form_list) + + def __call__(self, request, *args, **kwargs): + """ + Main method that does all the hard work, conforming to the Django view + interface. + """ + if 'extra_context' in kwargs: + self.extra_context.update(kwargs['extra_context']) + current_step = self.determine_step(request, *args, **kwargs) + self.parse_params(request, *args, **kwargs) + + # Sanity check. + if current_step >= self.num_steps(): + raise Http404('Step %s does not exist' % current_step) + + # For each previous step, verify the hash and process. + # TODO: Move "hash_%d" to a method to make it configurable. + for i in range(current_step): + form = self.get_form(i, request.POST) + if request.POST.get("hash_%d" % i, '') != self.security_hash(request, form): + return self.render_hash_failure(request, i) + self.process_step(request, form, i) + + # Process the current step. If it's valid, go to the next step or call + # done(), depending on whether any steps remain. + if request.method == 'POST': + form = self.get_form(current_step, request.POST) + else: + form = self.get_form(current_step) + if form.is_valid(): + self.process_step(request, form, current_step) + next_step = current_step + 1 + + # If this was the last step, validate all of the forms one more + # time, as a sanity check, and call done(). + num = self.num_steps() + if next_step == num: + final_form_list = [self.get_form(i, request.POST) for i in range(num)] + + # Validate all the forms. If any of them fail validation, that + # must mean the validator relied on some other input, such as + # an external Web site. + for i, f in enumerate(final_form_list): + if not f.is_valid(): + return self.render_revalidation_failure(request, i, f) + return self.done(request, final_form_list) + + # Otherwise, move along to the next step. + else: + form = self.get_form(next_step) + current_step = next_step + + return self.render(form, request, current_step) + + def render(self, form, request, step, context=None): + "Renders the given Form object, returning an HttpResponse." + old_data = request.POST + prev_fields = [] + if old_data: + hidden = forms.HiddenInput() + # Collect all data from previous steps and render it as HTML hidden fields. + for i in range(step): + old_form = self.get_form(i, old_data) + hash_name = 'hash_%s' % i + prev_fields.extend([bf.as_hidden() for bf in old_form]) + prev_fields.append(hidden.render(hash_name, old_data.get(hash_name, self.security_hash(request, old_form)))) + return self.render_template(request, form, ''.join(prev_fields), step, context) + + # METHODS SUBCLASSES MIGHT OVERRIDE IF APPROPRIATE ######################## + + def prefix_for_step(self, step): + "Given the step, returns a Form prefix to use." + return str(step) + + def render_hash_failure(self, request, step): + """ + Hook for rendering a template if a hash check failed. + + step is the step that failed. Any previous step is guaranteed to be + valid. + + This default implementation simply renders the form for the given step, + but subclasses may want to display an error message, etc. + """ + return self.render(self.get_form(step), request, step, context={'wizard_error': 'We apologize, but your form has expired. Please continue filling out the form from this page.'}) + + def render_revalidation_failure(self, request, step, form): + """ + Hook for rendering a template if final revalidation failed. + + It is highly unlikely that this point would ever be reached, but See + the comment in __call__() for an explanation. + """ + return self.render(form, request, step) + + def security_hash(self, request, form): + """ + Calculates the security hash for the given HttpRequest and Form instances. + + This creates a list of the form field names/values in a deterministic + order, pickles the result with the SECRET_KEY setting and takes an md5 + hash of that. + + Subclasses may want to take into account request-specific information, + such as the IP address. + """ + data = [(bf.name, bf.data or '') for bf in form] + [settings.SECRET_KEY] + # Use HIGHEST_PROTOCOL because it's the most efficient. It requires + # Python 2.3, but Django requires 2.3 anyway, so that's OK. + pickled = pickle.dumps(data, protocol=pickle.HIGHEST_PROTOCOL) + return md5.new(pickled).hexdigest() + + def determine_step(self, request, *args, **kwargs): + """ + Given the request object and whatever *args and **kwargs were passed to + __call__(), returns the current step (which is zero-based). + + Note that the result should not be trusted. It may even be a completely + invalid number. It's not the job of this method to validate it. + """ + if not request.POST: + return 0 + try: + step = int(request.POST.get(self.step_field_name, 0)) + except ValueError: + return 0 + return step + + def parse_params(self, request, *args, **kwargs): + """ + Hook for setting some state, given the request object and whatever + *args and **kwargs were passed to __call__(), sets some state. + + This is called at the beginning of __call__(). + """ + pass + + def get_template(self, step): + """ + Hook for specifying the name of the template to use for a given step. + + Note that this can return a tuple of template names if you'd like to + use the template system's select_template() hook. + """ + return 'forms/wizard.html' + + def render_template(self, request, form, previous_fields, step, context=None): + """ + Renders the template for the given step, returning an HttpResponse object. + + Override this method if you want to add a custom context, return a + different MIME type, etc. If you only need to override the template + name, use get_template() instead. + + The template will be rendered with the following context: + step_field -- The name of the hidden field containing the step. + step0 -- The current step (zero-based). + step -- The current step (one-based). + step_count -- The total number of steps. + form -- The Form instance for the current step (either empty + or with errors). + previous_fields -- A string representing every previous data field, + plus hashes for completed forms, all in the form of + hidden fields. Note that you'll need to run this + through the "safe" template filter, to prevent + auto-escaping, because it's raw HTML. + """ + context = context or {} + context.update(self.extra_context) + return render_to_response(self.get_template(self.step), dict(context, + step_field=self.step_field_name, + step0=step, + step=step + 1, + step_count=self.num_steps(), + form=form, + previous_fields=previous_fields + ), context_instance=RequestContext(request)) + + def process_step(self, request, form, step): + """ + Hook for modifying the FormWizard's internal state, given a fully + validated Form object. The Form is guaranteed to have clean, valid + data. + + This method should *not* modify any of that data. Rather, it might want + to set self.extra_context or dynamically alter self.form_list, based on + previously submitted forms. + + Note that this method is called every time a page is rendered for *all* + submitted steps. + """ + pass + + # METHODS SUBCLASSES MUST OVERRIDE ######################################## + + def done(self, request, form_list): + """ + Hook for doing something with the validated data. This is responsible + for the final processing. + + form_list is a list of Form instances, each containing clean, valid + data. + """ + raise NotImplementedError("Your %s class has not defined a done() method, which is required." % self.__class__.__name__) diff --git a/django/contrib/sessions/backends/file.py b/django/contrib/sessions/backends/file.py index cd3e3d9c75..d65c81c101 100644 --- a/django/contrib/sessions/backends/file.py +++ b/django/contrib/sessions/backends/file.py @@ -9,7 +9,9 @@ class SessionStore(SessionBase): Implements a file based session store. """ def __init__(self, session_key=None): - self.storage_path = getattr(settings, "SESSION_FILE_PATH", tempfile.gettempdir()) + self.storage_path = getattr(settings, "SESSION_FILE_PATH", None) + if not self.storage_path: + self.storage_path = tempfile.gettempdir() # Make sure the storage path is valid. if not os.path.isdir(self.storage_path): diff --git a/django/contrib/syndication/feeds.py b/django/contrib/syndication/feeds.py index 45b97d970a..85af79cc27 100644 --- a/django/contrib/syndication/feeds.py +++ b/django/contrib/syndication/feeds.py @@ -3,7 +3,8 @@ from django.template import Context, loader, Template, TemplateDoesNotExist from django.contrib.sites.models import Site, RequestSite from django.utils import feedgenerator from django.utils.encoding import smart_unicode, iri_to_uri -from django.conf import settings +from django.conf import settings +from django.template import RequestContext def add_domain(domain, url): if not (url.startswith('http://') or url.startswith('https://')): @@ -55,18 +56,23 @@ class Feed(object): return attr() return attr + def get_object(self, bits): + return None + def get_feed(self, url=None): """ Returns a feedgenerator.DefaultFeed object, fully populated, for this feed. Raises FeedDoesNotExist for invalid parameters. """ if url: - try: - obj = self.get_object(url.split('/')) - except (AttributeError, ObjectDoesNotExist): - raise FeedDoesNotExist + bits = url.split('/') else: - obj = None + bits = [] + + try: + obj = self.get_object(bits) + except ObjectDoesNotExist: + raise FeedDoesNotExist if Site._meta.installed: current_site = Site.objects.get_current() @@ -119,9 +125,9 @@ class Feed(object): else: author_email = author_link = None feed.add_item( - title = title_tmp.render(Context({'obj': item, 'site': current_site})), + title = title_tmp.render(RequestContext(self.request, {'obj': item, 'site': current_site})), link = link, - description = description_tmp.render(Context({'obj': item, 'site': current_site})), + description = description_tmp.render(RequestContext(self.request, {'obj': item, 'site': current_site})), unique_id = self.__get_dynamic_attr('item_guid', item, link), enclosure = enc, pubdate = self.__get_dynamic_attr('item_pubdate', item), diff --git a/django/core/mail.py b/django/core/mail.py index 72343cb4df..bf48dcb882 100644 --- a/django/core/mail.py +++ b/django/core/mail.py @@ -2,20 +2,21 @@ Tools for sending email. """ -from django.conf import settings -from django.utils.encoding import smart_str, force_unicode -from email import Charset, Encoders -from email.MIMEText import MIMEText -from email.MIMEMultipart import MIMEMultipart -from email.MIMEBase import MIMEBase -from email.Header import Header -from email.Utils import formatdate, parseaddr, formataddr import mimetypes import os import smtplib import socket import time import random +from email import Charset, Encoders +from email.MIMEText import MIMEText +from email.MIMEMultipart import MIMEMultipart +from email.MIMEBase import MIMEBase +from email.Header import Header +from email.Utils import formatdate, parseaddr, formataddr + +from django.conf import settings +from django.utils.encoding import smart_str, force_unicode # Don't BASE64-encode UTF-8 messages so that we avoid unwanted attention from # some spam filters. @@ -38,8 +39,9 @@ class CachedDnsName(object): DNS_NAME = CachedDnsName() -# Copied from Python standard library and modified to used the cached hostname -# for performance. +# Copied from Python standard library, with the following modifications: +# * Used cached hostname for performance. +# * Added try/except to support lack of getpid() in Jython (#5496). def make_msgid(idstring=None): """Returns a string suitable for RFC 2822 compliant Message-ID, e.g: @@ -53,7 +55,7 @@ def make_msgid(idstring=None): try: pid = os.getpid() except AttributeError: - # Not getpid() in Jython, for example. + # No getpid() in Jython, for example. pid = 1 randint = random.randrange(100000) if idstring is None: @@ -68,7 +70,7 @@ class BadHeaderError(ValueError): pass def forbid_multi_line_headers(name, val): - "Forbids multi-line headers, to prevent header injection." + """Forbids multi-line headers, to prevent header injection.""" if '\n' in val or '\r' in val: raise BadHeaderError("Header values can't contain newlines (got %r for header %r)" % (val, name)) try: @@ -101,7 +103,7 @@ class SMTPConnection(object): """ def __init__(self, host=None, port=None, username=None, password=None, - use_tls=None, fail_silently=False): + use_tls=None, fail_silently=False): self.host = host or settings.EMAIL_HOST self.port = port or settings.EMAIL_PORT self.username = username or settings.EMAIL_HOST_USER @@ -112,14 +114,17 @@ class SMTPConnection(object): def open(self): """ - Ensure we have a connection to the email server. Returns whether or not - a new connection was required. + Ensures we have a connection to the email server. Returns whether or + not a new connection was required (True or False). """ if self.connection: # Nothing to do if the connection is already open. return False try: - self.connection = smtplib.SMTP(self.host, self.port) + # If local_hostname is not specified, socket.getfqdn() gets used. + # For performance, we use the cached FQDN for local_hostname. + self.connection = smtplib.SMTP(self.host, self.port, + local_hostname=DNS_NAME.get_fqdn()) if self.use_tls: self.connection.ehlo() self.connection.starttls() @@ -132,7 +137,7 @@ class SMTPConnection(object): raise def close(self): - """Close the connection to the email server.""" + """Closes the connection to the email server.""" try: try: self.connection.quit() @@ -149,7 +154,7 @@ class SMTPConnection(object): def send_messages(self, email_messages): """ - Send one or more EmailMessage objects and return the number of email + Sends one or more EmailMessage objects and returns the number of email messages sent. """ if not email_messages: @@ -192,7 +197,7 @@ class EmailMessage(object): def __init__(self, subject='', body='', from_email=None, to=None, bcc=None, connection=None, attachments=None, headers=None): """ - Initialise a single email message (which can be sent to multiple + Initialize a single email message (which can be sent to multiple recipients). All strings used to create the message can be unicode strings (or UTF-8 @@ -221,7 +226,8 @@ class EmailMessage(object): def message(self): encoding = self.encoding or settings.DEFAULT_CHARSET - msg = SafeMIMEText(smart_str(self.body, settings.DEFAULT_CHARSET), self.content_subtype, encoding) + msg = SafeMIMEText(smart_str(self.body, settings.DEFAULT_CHARSET), + self.content_subtype, encoding) if self.attachments: body_msg = msg msg = SafeMIMEMultipart(_subtype=self.multipart_subtype) @@ -237,8 +243,6 @@ class EmailMessage(object): msg['To'] = ', '.join(self.to) msg['Date'] = formatdate() msg['Message-ID'] = make_msgid() - if self.bcc: - msg['Bcc'] = ', '.join(self.bcc) for name, value in self.extra_headers.items(): msg[name] = value return msg @@ -251,7 +255,7 @@ class EmailMessage(object): return self.to + self.bcc def send(self, fail_silently=False): - """Send the email message.""" + """Sends the email message.""" return self.get_connection(fail_silently).send_messages([self]) def attach(self, filename=None, content=None, mimetype=None): @@ -278,7 +282,7 @@ class EmailMessage(object): def _create_attachment(self, filename, content, mimetype=None): """ - Convert the filename, content, mimetype triple into a MIME attachment + Converts the filename, content, mimetype triple into a MIME attachment object. """ if mimetype is None: @@ -295,7 +299,8 @@ class EmailMessage(object): attachment.set_payload(content) Encoders.encode_base64(attachment) if filename: - attachment.add_header('Content-Disposition', 'attachment', filename=filename) + attachment.add_header('Content-Disposition', 'attachment', + filename=filename) return attachment class EmailMultiAlternatives(EmailMessage): @@ -310,7 +315,8 @@ class EmailMultiAlternatives(EmailMessage): """Attach an alternative content representation.""" self.attach(content=content, mimetype=mimetype) -def send_mail(subject, message, from_email, recipient_list, fail_silently=False, auth_user=None, auth_password=None): +def send_mail(subject, message, from_email, recipient_list, + fail_silently=False, auth_user=None, auth_password=None): """ Easy wrapper for sending a single message to a recipient list. All members of the recipient list will see the other recipients in the 'To' field. @@ -322,10 +328,12 @@ def send_mail(subject, message, from_email, recipient_list, fail_silently=False, functionality should use the EmailMessage class directly. """ connection = SMTPConnection(username=auth_user, password=auth_password, - fail_silently=fail_silently) - return EmailMessage(subject, message, from_email, recipient_list, connection=connection).send() + fail_silently=fail_silently) + return EmailMessage(subject, message, from_email, recipient_list, + connection=connection).send() -def send_mass_mail(datatuple, fail_silently=False, auth_user=None, auth_password=None): +def send_mass_mail(datatuple, fail_silently=False, auth_user=None, + auth_password=None): """ Given a datatuple of (subject, message, from_email, recipient_list), sends each message to each recipient list. Returns the number of e-mails sent. @@ -339,19 +347,19 @@ def send_mass_mail(datatuple, fail_silently=False, auth_user=None, auth_password functionality should use the EmailMessage class directly. """ connection = SMTPConnection(username=auth_user, password=auth_password, - fail_silently=fail_silently) - messages = [EmailMessage(subject, message, sender, recipient) for subject, message, sender, recipient in datatuple] + fail_silently=fail_silently) + messages = [EmailMessage(subject, message, sender, recipient) + for subject, message, sender, recipient in datatuple] return connection.send_messages(messages) def mail_admins(subject, message, fail_silently=False): - "Sends a message to the admins, as defined by the ADMINS setting." + """Sends a message to the admins, as defined by the ADMINS setting.""" EmailMessage(settings.EMAIL_SUBJECT_PREFIX + subject, message, - settings.SERVER_EMAIL, [a[1] for a in - settings.ADMINS]).send(fail_silently=fail_silently) + settings.SERVER_EMAIL, [a[1] for a in settings.ADMINS] + ).send(fail_silently=fail_silently) def mail_managers(subject, message, fail_silently=False): - "Sends a message to the managers, as defined by the MANAGERS setting." + """Sends a message to the managers, as defined by the MANAGERS setting.""" EmailMessage(settings.EMAIL_SUBJECT_PREFIX + subject, message, - settings.SERVER_EMAIL, [a[1] for a in - settings.MANAGERS]).send(fail_silently=fail_silently) - + settings.SERVER_EMAIL, [a[1] for a in settings.MANAGERS] + ).send(fail_silently=fail_silently) diff --git a/django/core/management/__init__.py b/django/core/management/__init__.py index d78e2eda0b..819b19a366 100644 --- a/django/core/management/__init__.py +++ b/django/core/management/__init__.py @@ -243,7 +243,7 @@ def setup_environ(settings_mod): # way. For example, if this file (manage.py) lives in a directory # "myproject", this code would add "/path/to/myproject" to sys.path. project_directory, settings_filename = os.path.split(settings_mod.__file__) - if not project_directory: + if project_directory == os.curdir or not project_directory: project_directory = os.getcwd() project_name = os.path.basename(project_directory) settings_name = os.path.splitext(settings_filename)[0] diff --git a/django/core/management/commands/startproject.py b/django/core/management/commands/startproject.py index ab4f409f15..867d4fd3da 100644 --- a/django/core/management/commands/startproject.py +++ b/django/core/management/commands/startproject.py @@ -20,8 +20,13 @@ class Command(LabelCommand): # the parent directory. directory = os.getcwd() - if project_name in INVALID_PROJECT_NAMES: - raise CommandError("%r conflicts with the name of an existing Python module and cannot be used as a project name. Please try another name." % project_name) + try: + proj_name = __import__(project_name) + if proj_name: + raise CommandError("%r conflicts with the name of an existing Python module and cannot be used as a project name. Please try another name." % project_name) + except ImportError: + if project_name in INVALID_PROJECT_NAMES: + raise CommandError("%r contains an invalid project name. Please try another name." % project_name) copy_helper(self.style, 'project', project_name, directory) diff --git a/django/core/paginator.py b/django/core/paginator.py index 71a5479fd5..dabd20dfc0 100644 --- a/django/core/paginator.py +++ b/django/core/paginator.py @@ -1,46 +1,149 @@ class InvalidPage(Exception): pass -class ObjectPaginator(object): - """ - This class makes pagination easy. Feed it a QuerySet or list, plus the number - of objects you want on each page. Then read the hits and pages properties to - see how many pages it involves. Call get_page with a page number (starting - at 0) to get back a list of objects for that page. +class Paginator(object): + def __init__(self, object_list, per_page, orphans=0, allow_empty_first_page=True): + self.object_list = object_list + self.per_page = per_page + self.orphans = orphans + self.allow_empty_first_page = allow_empty_first_page + self._num_pages = self._count = None - Finally, check if a page number has a next/prev page using - has_next_page(page_number) and has_previous_page(page_number). - - Use orphans to avoid small final pages. For example: - 13 records, num_per_page=10, orphans=2 --> pages==2, len(self.get_page(0))==10 - 12 records, num_per_page=10, orphans=2 --> pages==1, len(self.get_page(0))==12 + def validate_number(self, number): + "Validates the given 1-based page number." + try: + number = int(number) + except ValueError: + raise InvalidPage('That page number is not an integer') + if number < 1: + raise InvalidPage('That page number is less than 1') + if number > self.num_pages: + if number == 1 and self.allow_empty_first_page: + pass + else: + raise InvalidPage('That page contains no results') + return number + + def page(self, number): + "Returns a Page object for the given 1-based page number." + number = self.validate_number(number) + bottom = (number - 1) * self.per_page + top = bottom + self.per_page + if top + self.orphans >= self.count: + top = self.count + return Page(self.object_list[bottom:top], number, self) + + def _get_count(self): + "Returns the total number of objects, across all pages." + if self._count is None: + self._count = len(self.object_list) + return self._count + count = property(_get_count) + + def _get_num_pages(self): + "Returns the total number of pages." + if self._num_pages is None: + hits = self.count - 1 - self.orphans + if hits < 1: + hits = 0 + if hits == 0 and not self.allow_empty_first_page: + self._num_pages = 0 + else: + self._num_pages = hits // self.per_page + 1 + return self._num_pages + num_pages = property(_get_num_pages) + + def _get_page_range(self): + """ + Returns a 1-based range of pages for iterating through within + a template for loop. + """ + return range(1, self.num_pages + 1) + page_range = property(_get_page_range) + +class QuerySetPaginator(Paginator): + """ + Like Paginator, but works on QuerySets. + """ + def _get_count(self): + if self._count is None: + self._count = self.object_list.count() + return self._count + count = property(_get_count) + +class Page(object): + def __init__(self, object_list, number, paginator): + self.object_list = object_list + self.number = number + self.paginator = paginator + + def __repr__(self): + return '' % (self.number, self.paginator.num_pages) + + def has_next(self): + return self.number < self.paginator.num_pages + + def has_previous(self): + return self.number > 1 + + def has_other_pages(self): + return self.has_previous() or self.has_next() + + def next_page_number(self): + return self.number + 1 + + def previous_page_number(self): + return self.number - 1 + + def start_index(self): + """ + Returns the 1-based index of the first object on this page, + relative to total objects in the paginator. + """ + return (self.paginator.per_page * (self.number - 1)) + 1 + + def end_index(self): + """ + Returns the 1-based index of the last object on this page, + relative to total objects found (hits). + """ + if self.number == self.paginator.num_pages: + return self.paginator.count + return self.number * self.paginator.per_page + +class ObjectPaginator(Paginator): + """ + Legacy ObjectPaginator class, for backwards compatibility. + + Note that each method on this class that takes page_number expects a + zero-based page number, whereas the new API (Paginator/Page) uses one-based + page numbers. """ def __init__(self, query_set, num_per_page, orphans=0): + Paginator.__init__(self, query_set, num_per_page, orphans) + import warnings + warnings.warn("The ObjectPaginator is deprecated. Use django.core.paginator.Paginator instead.", DeprecationWarning) + + # Keep these attributes around for backwards compatibility. self.query_set = query_set self.num_per_page = num_per_page - self.orphans = orphans self._hits = self._pages = None - self._page_range = None def validate_page_number(self, page_number): try: - page_number = int(page_number) + page_number = int(page_number) + 1 except ValueError: raise InvalidPage - if page_number < 0 or page_number > self.pages - 1: - raise InvalidPage - return page_number + return self.validate_number(page_number) def get_page(self, page_number): - page_number = self.validate_page_number(page_number) - bottom = page_number * self.num_per_page - top = bottom + self.num_per_page - if top + self.orphans >= self.hits: - top = self.hits - return self.query_set[bottom:top] + try: + page_number = int(page_number) + 1 + except ValueError: + raise InvalidPage + return self.page(page_number).object_list def has_next_page(self, page_number): - "Does page $page_number have a 'next' page?" return page_number < self.pages - 1 def has_previous_page(self, page_number): @@ -52,7 +155,7 @@ class ObjectPaginator(object): relative to total objects found (hits). """ page_number = self.validate_page_number(page_number) - return (self.num_per_page * page_number) + 1 + return (self.num_per_page * (page_number - 1)) + 1 def last_on_page(self, page_number): """ @@ -60,40 +163,23 @@ class ObjectPaginator(object): relative to total objects found (hits). """ page_number = self.validate_page_number(page_number) - page_number += 1 # 1-base - if page_number == self.pages: - return self.hits + if page_number == self.num_pages: + return self.count return page_number * self.num_per_page - def _get_hits(self): - if self._hits is None: - # Try .count() or fall back to len(). + def _get_count(self): + # The old API allowed for self.object_list to be either a QuerySet or a + # list. Here, we handle both. + if self._count is None: try: - self._hits = int(self.query_set.count()) - except (AttributeError, TypeError, ValueError): - # AttributeError if query_set has no object count. - # TypeError if query_set.count() required arguments. - # ValueError if int() fails. - self._hits = len(self.query_set) - return self._hits + self._count = self.object_list.count() + except AttributeError: + self._count = len(self.object_list) + return self._count + count = property(_get_count) - def _get_pages(self): - if self._pages is None: - hits = (self.hits - 1 - self.orphans) - if hits < 1: - hits = 0 - self._pages = hits // self.num_per_page + 1 - return self._pages - - def _get_page_range(self): - """ - Returns a 1-based range of pages for iterating through within - a template for loop. - """ - if self._page_range is None: - self._page_range = range(1, self.pages + 1) - return self._page_range + # The old API called it "hits" instead of "count". + hits = count - hits = property(_get_hits) - pages = property(_get_pages) - page_range = property(_get_page_range) + # The old API called it "pages" instead of "num_pages". + pages = Paginator.num_pages diff --git a/django/core/serializers/base.py b/django/core/serializers/base.py index 3c7dcfa02e..2c92e2afad 100644 --- a/django/core/serializers/base.py +++ b/django/core/serializers/base.py @@ -22,10 +22,10 @@ class Serializer(object): Abstract serializer base class. """ - # Indicates if the implemented serializer is only available for + # Indicates if the implemented serializer is only available for # internal Django use. internal_use_only = False - + def serialize(self, queryset, **options): """ Serialize a queryset. @@ -60,8 +60,6 @@ class Serializer(object): """ if isinstance(field, models.DateTimeField): value = getattr(obj, field.name).strftime("%Y-%m-%d %H:%M:%S") - elif isinstance(field, models.FileField): - value = getattr(obj, "get_%s_url" % field.name, lambda: None)() else: value = field.flatten_data(follow=None, obj=obj).get(field.name, "") return smart_unicode(value) @@ -162,9 +160,9 @@ class DeserializedObject(object): return "" % smart_str(self.object) def save(self, save_m2m=True): - # Call save on the Model baseclass directly. This bypasses any + # Call save on the Model baseclass directly. This bypasses any # model-defined save. The save is also forced to be raw. - # This ensures that the data that is deserialized is literally + # This ensures that the data that is deserialized is literally # what came from the file, not post-processed by pre_save/save # methods. models.Model.save(self.object, raw=True) diff --git a/django/core/servers/fastcgi.py b/django/core/servers/fastcgi.py index de04a5af62..d7145e15ec 100644 --- a/django/core/servers/fastcgi.py +++ b/django/core/servers/fastcgi.py @@ -37,7 +37,9 @@ Optional Fcgi settings: (setting=value) maxchildren=NUMBER hard limit number of processes / threads daemonize=BOOL whether to detach from terminal. pidfile=FILE write the spawned process-id to this file. - workdir=DIRECTORY change to this directory when daemonizing + workdir=DIRECTORY change to this directory when daemonizing. + outlog=FILE write stdout to this file. + errlog=FILE write stderr to this file. Examples: Run a "standard" fastcgi process on a file-descriptor @@ -69,6 +71,8 @@ FASTCGI_OPTIONS = { 'minspare': 2, 'maxchildren': 50, 'maxrequests': 0, + 'outlog': None, + 'errlog': None, } def fastcgi_help(message=None): @@ -150,9 +154,15 @@ def runfastcgi(argset=[], **kwargs): else: return fastcgi_help("ERROR: Invalid option for daemonize parameter.") + daemon_kwargs = {} + if options['outlog']: + daemon_kwargs['out_log'] = options['outlog'] + if options['errlog']: + daemon_kwargs['err_log'] = options['errlog'] + if daemonize: from django.utils.daemonize import become_daemon - become_daemon(our_home_dir=options["workdir"]) + become_daemon(our_home_dir=options["workdir"], **daemon_kwargs) if options["pidfile"]: fp = open(options["pidfile"], "w") diff --git a/django/core/validators.py b/django/core/validators.py index 874edaefdd..e728dbc0ed 100644 --- a/django/core/validators.py +++ b/django/core/validators.py @@ -18,7 +18,7 @@ except ImportError: from django.conf import settings from django.utils.translation import ugettext as _, ugettext_lazy, ungettext from django.utils.functional import Promise, lazy -from django.utils.encoding import force_unicode +from django.utils.encoding import force_unicode, smart_str _datere = r'\d{4}-\d{1,2}-\d{1,2}' _timere = r'(?:[01]?[0-9]|2[0-3]):[0-5][0-9](?::[0-5][0-9])?' @@ -451,7 +451,7 @@ class IsValidDecimal(object): "Please enter a valid decimal number with at most %s decimal places.", self.decimal_places) % self.decimal_places def isValidFloat(field_data, all_data): - data = str(field_data) + data = smart_str(field_data) try: float(data) except ValueError: diff --git a/django/db/backends/postgresql/base.py b/django/db/backends/postgresql/base.py index c8b87c2dd1..1dfe34aceb 100644 --- a/django/db/backends/postgresql/base.py +++ b/django/db/backends/postgresql/base.py @@ -56,6 +56,9 @@ class UnicodeCursorWrapper(object): else: return getattr(self.cursor, attr) + def __iter__(self): + return iter(self.cursor) + class DatabaseFeatures(BaseDatabaseFeatures): pass # This backend uses all the defaults. diff --git a/django/db/backends/util.py b/django/db/backends/util.py index ca4e90d6c2..367072879e 100644 --- a/django/db/backends/util.py +++ b/django/db/backends/util.py @@ -41,6 +41,9 @@ class CursorDebugWrapper(object): else: return getattr(self.cursor, attr) + def __iter__(self): + return iter(self.cursor) + ############################################### # Converters from database (string) to Python # ############################################### diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py index e96ba8e48f..d44e9e6ddd 100644 --- a/django/db/models/fields/__init__.py +++ b/django/db/models/fields/__init__.py @@ -228,9 +228,14 @@ class Field(object): raise ValueError("The __year lookup type requires an integer argument") if settings.DATABASE_ENGINE == 'sqlite3': first = '%s-01-01' + second = '%s-12-31 23:59:59.999999' + elif settings.DATABASE_ENGINE == 'oracle' and self.get_internal_type() == 'DateField': + first = '%s-01-01' + second = '%s-12-31' else: first = '%s-01-01 00:00:00' - return [first % value, '%s-12-31 23:59:59.999999' % value] + second = '%s-12-31 23:59:59.999999' + return [first % value, second % value] raise TypeError("Field has invalid lookup: %s" % lookup_type) def has_default(self): @@ -835,6 +840,16 @@ class FilePathField(Field): self.path, self.match, self.recursive = path, match, recursive kwargs['max_length'] = kwargs.get('max_length', 100) Field.__init__(self, verbose_name, name, **kwargs) + + def formfield(self, **kwargs): + defaults = { + 'path': self.path, + 'match': self.match, + 'recursive': self.recursive, + 'form_class': forms.FilePathField, + } + defaults.update(kwargs) + return super(FilePathField, self).formfield(**defaults) def get_manipulator_field_objs(self): return [curry(oldforms.FilePathField, path=self.path, match=self.match, recursive=self.recursive)] diff --git a/django/db/models/fields/related.py b/django/db/models/fields/related.py index d02e8b424d..f00b24da93 100644 --- a/django/db/models/fields/related.py +++ b/django/db/models/fields/related.py @@ -543,6 +543,13 @@ class ForeignKey(RelatedField, Field): params['choices'] = self.get_choices_default() return field_objs, params + def get_default(self): + "Here we check if the default value is an object and return the to_field if so." + field_default = super(ForeignKey, self).get_default() + if isinstance(field_default, self.rel.to): + return getattr(field_default, self.rel.get_related_field().attname) + return field_default + def get_manipulator_field_objs(self): rel_field = self.rel.get_related_field() return [oldforms.IntegerField] diff --git a/django/db/models/query.py b/django/db/models/query.py index 0bc36f425a..a3d00c2ead 100644 --- a/django/db/models/query.py +++ b/django/db/models/query.py @@ -1,5 +1,5 @@ from django.conf import settings -from django.db import connection, transaction +from django.db import connection, transaction, IntegrityError from django.db.models.fields import DateField, FieldDoesNotExist from django.db.models import signals, loading from django.dispatch import dispatcher @@ -285,11 +285,14 @@ class _QuerySet(object): try: return self.get(**kwargs), False except self.model.DoesNotExist: - params = dict([(k, v) for k, v in kwargs.items() if '__' not in k]) - params.update(defaults) - obj = self.model(**params) - obj.save() - return obj, True + try: + params = dict([(k, v) for k, v in kwargs.items() if '__' not in k]) + params.update(defaults) + obj = self.model(**params) + obj.save() + return obj, True + except IntegrityError, e: + return self.get(**kwargs), False def latest(self, field_name=None): """ diff --git a/django/http/__init__.py b/django/http/__init__.py index 5df734cceb..7faa3c875e 100644 --- a/django/http/__init__.py +++ b/django/http/__init__.py @@ -1,5 +1,5 @@ import os -from Cookie import SimpleCookie +from Cookie import SimpleCookie, CookieError from pprint import pformat from urllib import urlencode from urlparse import urljoin @@ -82,6 +82,9 @@ class HttpRequest(object): def is_secure(self): return os.environ.get("HTTPS") == "on" + def is_ajax(self): + return self.META.get('HTTP_X_REQUESTED_WITH') == 'XMLHttpRequest' + def _set_encoding(self, val): """ Sets the encoding used for GET/POST accesses. If the GET or POST @@ -239,8 +242,13 @@ class QueryDict(MultiValueDict): def parse_cookie(cookie): if cookie == '': return {} - c = SimpleCookie() - c.load(cookie) + try: + c = SimpleCookie() + c.load(cookie) + except CookieError: + # Invalid cookie + return {} + cookiedict = {} for key in c.keys(): cookiedict[key] = c.get(key).value diff --git a/django/newforms/extras/widgets.py b/django/newforms/extras/widgets.py index 0097ba3f54..e3ef1d7f69 100644 --- a/django/newforms/extras/widgets.py +++ b/django/newforms/extras/widgets.py @@ -3,6 +3,7 @@ Extra HTML Widget classes """ import datetime +import re from django.newforms.widgets import Widget, Select from django.utils.dates import MONTHS @@ -10,6 +11,8 @@ from django.utils.safestring import mark_safe __all__ = ('SelectDateWidget',) +RE_DATE = re.compile(r'(\d{4})-(\d\d?)-(\d\d?)$') + class SelectDateWidget(Widget): """ A Widget that splits date input into three `` fields, and the data isn't processed server-side +until the final form is submitted. + +You might want to use this if you have a lengthy form that would be too +unwieldy for display on a single page. The first page might ask the user for +core information, the second page might ask for less important information, +etc. + +The term "wizard," in this context, is `explained on Wikipedia`_. + +.. _explained on Wikipedia: http://en.wikipedia.org/wiki/Wizard_%28software%29 +.. _forms: ../newforms/ + +How it works +============ + +Here's the basic workflow for how a user would use a wizard: + + 1. The user visits the first page of the wizard, fills in the form and + submits it. + 2. The server validates the data. If it's invalid, the form is displayed + again, with error messages. If it's valid, the server calculates a + secure hash of the data and presents the user with the next form, + saving the validated data and hash in ```` fields. + 3. Step 1 and 2 repeat, for every subsequent form in the wizard. + 4. Once the user has submitted all the forms and all the data has been + validated, the wizard processes the data -- saving it to the database, + sending an e-mail, or whatever the application needs to do. + +Usage +===== + +This application handles as much machinery for you as possible. Generally, you +just have to do these things: + + 1. Define a number of ``django.newforms`` ``Form`` classes -- one per wizard + page. + 2. Create a ``FormWizard`` class that specifies what to do once all of your + forms have been submitted and validated. This also lets you override some + of the wizard's behavior. + 3. Create some templates that render the forms. You can define a single, + generic template to handle every one of the forms, or you can define a + specific template for each form. + 4. Point your URLconf at your ``FormWizard`` class. + +Defining ``Form`` classes +========================= + +The first step in creating a form wizard is to create the ``Form`` classes. +These should be standard ``django.newforms`` ``Form`` classes, covered in the +`newforms documentation`_. + +These classes can live anywhere in your codebase, but convention is to put them +in a file called ``forms.py`` in your application. + +For example, let's write a "contact form" wizard, where the first page's form +collects the sender's e-mail address and subject, and the second page collects +the message itself. Here's what the ``forms.py`` might look like:: + + from django import newforms as forms + + class ContactForm1(forms.Form): + subject = forms.CharField(max_length=100) + sender = forms.EmailField() + + class ContactForm2(forms.Form): + message = forms.CharField(widget=forms.Textarea) + +**Important limitation:** Because the wizard uses HTML hidden fields to store +data between pages, you may not include a ``FileField`` in any form except the +last one. + +.. _newforms documentation: ../newforms/ + +Creating a ``FormWizard`` class +=============================== + +The next step is to create a ``FormWizard`` class, which should be a subclass +of ``django.contrib.formtools.wizard.FormWizard``. + +As your ``Form`` classes, this ``FormWizard`` class can live anywhere in your +codebase, but convention is to put it in ``forms.py``. + +The only requirement on this subclass is that it implement a ``done()`` method, +which specifies what should happen when the data for *every* form is submitted +and validated. This method is passed two arguments: + + * ``request`` -- an HttpRequest_ object + * ``form_list`` -- a list of ``django.newforms`` ``Form`` classes + +In this simplistic example, rather than perform any database operation, the +method simply renders a template of the validated data:: + + from django.shortcuts import render_to_response + from django.contrib.formtools.wizard import FormWizard + + class ContactWizard(FormWizard): + def done(self, request, form_list): + return render_to_response('done.html', { + 'form_data': [form.cleaned_data for form in form_list], + }) + +Note that this method will be called via ``POST``, so it really ought to be a +good Web citizen and redirect after processing the data. Here's another +example:: + + from django.http import HttpResponseRedirect + from django.contrib.formtools.wizard import FormWizard + + class ContactWizard(FormWizard): + def done(self, request, form_list): + do_something_with_the_form_data(form_list) + return HttpResponseRedirect('/page-to-redirect-to-when-done/') + +See the section "Advanced ``FormWizard`` methods" below to learn about more +``FormWizard`` hooks. + +.. _HttpRequest: request_response/#httprequest-objects + +Creating templates for the forms +================================ + +Next, you'll need to create a template that renders the wizard's forms. By +default, every form uses a template called ``forms/wizard.html``. (You can +change this template name by overriding ``FormWizard.get_template()``, which is +documented below. This hook also allows you to use a different template for +each form.) + +This template expects the following context: + + * ``step_field`` -- The name of the hidden field containing the step. + * ``step0`` -- The current step (zero-based). + * ``step`` -- The current step (one-based). + * ``step_count`` -- The total number of steps. + * ``form`` -- The ``Form`` instance for the current step (either empty or + with errors). + * ``previous_fields`` -- A string representing every previous data field, + plus hashes for completed forms, all in the form of hidden fields. Note + that you'll need to run this through the ``safe`` template filter, to + prevent auto-escaping, because it's raw HTML. + +It will also be passed any objects in ``extra_context``, which is a dictionary +you can specify that contains extra values to add to the context. You can +specify it in two ways: + + * Set the ``extra_context`` attribute on your ``FormWizard`` subclass to a + dictionary. + + * Pass ``extra_context`` as extra parameters in the URLconf. + +Here's a full example template:: + + {% extends "base.html" %} + + {% block content %} +

      Step {{ step }} of {{ step_count }}

      +
      + + {{ form }} +
      + + {{ previous_fields|safe }} + +
      + {% endblock %} + +Note that ``previous_fields``, ``step_field`` and ``step0`` are all required +for the wizard to work properly. + +Hooking the wizard into a URLconf +================================= + +Finally, give your new ``FormWizard`` object a URL in ``urls.py``. The wizard +takes a list of your form objects as arguments:: + + from django.conf.urls.defaults import * + from mysite.testapp.forms import ContactForm1, ContactForm2, ContactWizard + + urlpatterns = patterns('', + (r'^contact/$', ContactWizard([ContactForm1, ContactForm2])), + ) + +Advanced ``FormWizard`` methods +=============================== + +Aside from the ``done()`` method, ``FormWizard`` offers a few advanced method +hooks that let you customize how your wizard works. + +Some of these methods take an argument ``step``, which is a zero-based counter +representing the current step of the wizard. (E.g., the first form is ``0`` and +the second form is ``1``.) + +``prefix_for_step`` +~~~~~~~~~~~~~~~~~~~ + +Given the step, returns a ``Form`` prefix to use. By default, this simply uses +the step itself. For more, see the `form prefix documentation`_. + +Default implementation:: + + def prefix_for_step(self, step): + return str(step) + +.. _form prefix documentation: ../newforms/#prefixes-for-forms + +``render_hash_failure`` +~~~~~~~~~~~~~~~~~~~~~~~ + +Renders a template if the hash check fails. It's rare that you'd need to +override this. + +Default implementation:: + + def render_hash_failure(self, request, step): + return self.render(self.get_form(step), request, step, + context={'wizard_error': 'We apologize, but your form has expired. Please continue filling out the form from this page.'}) + +``security_hash`` +~~~~~~~~~~~~~~~~~ + +Calculates the security hash for the given request object and ``Form`` instance. + +By default, this uses an MD5 hash of the form data and your +`SECRET_KEY setting`_. It's rare that somebody would need to override this. + +Example:: + + def security_hash(self, request, form): + return my_hash_function(request, form) + +.. _SECRET_KEY setting: ../settings/#secret-key + +``parse_params`` +~~~~~~~~~~~~~~~~ + +A hook for saving state from the request object and ``args`` / ``kwargs`` that +were captured from the URL by your URLconf. + +By default, this does nothing. + +Example:: + + def parse_params(self, request, *args, **kwargs): + self.my_state = args[0] + +``get_template`` +~~~~~~~~~~~~~~~~ + +Returns the name of the template that should be used for the given step. + +By default, this returns ``'forms/wizard.html'``, regardless of step. + +Example:: + + def get_template(self, step): + return 'myapp/wizard_%s.html' % step + +If ``get_template`` returns a list of strings, then the wizard will use the +template system's ``select_template()`` function, `explained in the template docs`_. +This means the system will use the first template that exists on the filesystem. +For example:: + + def get_template(self, step): + return ['myapp/wizard_%s.html' % step, 'myapp/wizard.html'] + +.. _explained in the template docs: ../templates_python/#the-python-api + +``render_template`` +~~~~~~~~~~~~~~~~~~~ + +Renders the template for the given step, returning an ``HttpResponse`` object. + +Override this method if you want to add a custom context, return a different +MIME type, etc. If you only need to override the template name, use +``get_template()`` instead. + +The template will be rendered with the context documented in the +"Creating templates for the forms" section above. + +``process_step`` +~~~~~~~~~~~~~~~~ + +Hook for modifying the wizard's internal state, given a fully validated ``Form`` +object. The Form is guaranteed to have clean, valid data. + +This method should *not* modify any of that data. Rather, it might want to set +``self.extra_context`` or dynamically alter ``self.form_list``, based on +previously submitted forms. + +Note that this method is called every time a page is rendered for *all* +submitted steps. + +The function signature:: + + def process_step(self, request, form, step): + # ... diff --git a/docs/generic_views.txt b/docs/generic_views.txt index 17187894c0..b7beb0b4be 100644 --- a/docs/generic_views.txt +++ b/docs/generic_views.txt @@ -751,6 +751,19 @@ In addition to ``extra_context``, the template's context will be: If the results are paginated, the context will contain these extra variables: + * **New in Django development version:** ``paginator``: An instance of + ``django.core.paginator.Paginator``. + + * **New in Django development version:** ``page_obj``: An instance of + ``django.core.paginator.Page``. + +In older versions of Django, before ``paginator`` and ``page_obj`` were added +to this template's context, the template included several other variables +related to pagination. Note that you should *NOT* use these variables anymore; +use ``paginator`` and ``page_obj`` instead, because they let you do everything +these old variables let you do (and more!). But for legacy installations, +here's a list of those old template variables: + * ``results_per_page``: The number of objects per page. (Same as the ``paginate_by`` parameter.) @@ -777,8 +790,8 @@ If the results are paginated, the context will contain these extra variables: * ``hits``: The total number of objects across *all* pages, not just this page. - * **New in Django development version:** ``page_range``: A list of the - page numbers that are available. This is 1-based. + * ``page_range``: A list of the page numbers that are available. This is + 1-based. Notes on pagination ~~~~~~~~~~~~~~~~~~~ diff --git a/docs/i18n.txt b/docs/i18n.txt index bb6cf74ded..8da19cd242 100644 --- a/docs/i18n.txt +++ b/docs/i18n.txt @@ -547,7 +547,7 @@ following this algorithm: * First, it looks for a ``django_language`` key in the the current user's `session`_. - * Failing that, it looks for a cookie that is named according to your ``LANGUAGE_COOKIE_NAME`` setting (the default name is: ``django_language``). + * Failing that, it looks for a cookie that is named according to your ``LANGUAGE_COOKIE_NAME`` setting. (The default name is ``django_language``, and this setting is new in the Django development version. In Django version 0.96 and before, the cookie's name is hard-coded to ``django_language``.) * Failing that, it looks at the ``Accept-Language`` HTTP header. This header is sent by your browser and tells the server which language(s) you prefer, in order by priority. Django tries each language in the header @@ -719,8 +719,9 @@ Activate this view by adding the following line to your URLconf:: The view expects to be called via the ``POST`` method, with a ``language`` parameter set in request. If session support is enabled, the view saves the language choice in the user's session. Otherwise, it saves the -language choice in a cookie that is by default named ``django_language`` -(the name can be changed through the ``LANGUAGE_COOKIE_NAME`` setting). +language choice in a cookie that is by default named ``django_language``. +(The name can be changed through the ``LANGUAGE_COOKIE_NAME`` setting if you're +using the Django development version.) After setting the language choice, Django redirects the user, following this algorithm: diff --git a/docs/install.txt b/docs/install.txt index 542036e2af..341c4280e8 100644 --- a/docs/install.txt +++ b/docs/install.txt @@ -167,6 +167,20 @@ These commands will install Django in your Python installation's Installing the development version ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.. admonition:: Tracking Django development + + If you decide to use the latest development version of Django, + you'll want to pay close attention to `the development timeline`_, + and you'll want to keep an eye on `the list of + backwards-incompatible changes`_; this will help you stay on top + of any new features you might want to use, as well as any changes + you'll need to make to your code when updating your copy of Django + (for stable releases, any necessary changes are documented in the + release notes). + +.. _the development timeline: http://code.djangoproject.com/timeline +.. _the list of backwards-incompatible changes: http://code.djangoproject.com/wiki/BackwardsIncompatibleChanges + If you'd like to be able to update your Django code occasionally with the latest bug fixes and improvements, follow these instructions: diff --git a/docs/model-api.txt b/docs/model-api.txt index 66fa63e3c6..f73c5aadf7 100644 --- a/docs/model-api.txt +++ b/docs/model-api.txt @@ -626,7 +626,8 @@ option is ignored. ``default`` ~~~~~~~~~~~ -The default value for the field. +The default value for the field. This can be a value or a callable object. If +callable it will be called every time a new object is created. ``editable`` ~~~~~~~~~~~~ @@ -788,10 +789,10 @@ Note, however, that this only refers to models in the same models.py file -- you cannot use a string to reference a model defined in another application or imported from elsewhere. -**New in Django development version:** to refer to models defined in another -application, you must instead explicitially specify the application label. That -is, if the ``Manufacturer`` model above is defined in another application called -``production``, you'd need to use:: +**New in Django development version:** To refer to models defined in another +application, you must instead explicitly specify the application label. For +example, if the ``Manufacturer`` model above is defined in another application +called ``production``, you'd need to use:: class Car(models.Model): manufacturer = models.ForeignKey('production.Manufacturer') @@ -1022,6 +1023,8 @@ See the `One-to-one relationship model example`_ for a full example. Custom field types ------------------ +**New in Django development version** + If one of the existing model fields cannot be used to fit your purposes, or if you wish to take advantage of some less common database column types, you can create your own field class. Full coverage of creating your own fields is @@ -1786,14 +1789,15 @@ For example:: This example allows you to request ``Person.men.all()``, ``Person.women.all()``, and ``Person.people.all()``, yielding predictable results. -If you use custom ``Manager`` objects, take note that the first ``Manager`` -Django encounters (in order by which they're defined in the model) has a -special status. Django interprets the first ``Manager`` defined in a class as -the "default" ``Manager``. Certain operations -- such as Django's admin site -- -use the default ``Manager`` to obtain lists of objects, so it's generally a -good idea for the first ``Manager`` to be relatively unfiltered. In the last -example, the ``people`` ``Manager`` is defined first -- so it's the default -``Manager``. +If you use custom ``Manager`` objects, take note that the first +``Manager`` Django encounters (in the order in which they're defined +in the model) has a special status. Django interprets this first +``Manager`` defined in a class as the "default" ``Manager``, and +several parts of Django (though not the admin application) will use +that ``Manager`` exclusively for that model. As a result, it's often a +good idea to be careful in your choice of default manager, in order to +avoid a situation where overriding of ``get_query_set()`` results in +an inability to retrieve objects you'd like to work with. Model methods ============= diff --git a/docs/modelforms.txt b/docs/modelforms.txt index 47eaa9a769..05f9b1b3d4 100644 --- a/docs/modelforms.txt +++ b/docs/modelforms.txt @@ -231,6 +231,16 @@ For example:: # Create and save the new author instance. There's no need to do anything else. >>> new_author = f.save() +Other than the ``save()`` and ``save_m2m()`` methods, a ``ModelForm`` +works exactly the same way as any other ``newforms`` form. For +example, the ``is_valid()`` method is used to check for validity, the +``is_multipart()`` method is used to determine whether a form requires +multipart file upload (and hence whether ``request.FILES`` must be +passed to the form), etc.; see `the standard newforms documentation`_ +for more information. + +.. _the standard newforms documentation: ../newforms/ + Using a subset of fields on the form ------------------------------------ diff --git a/docs/newforms.txt b/docs/newforms.txt index 229f704ca7..4f59400949 100644 --- a/docs/newforms.txt +++ b/docs/newforms.txt @@ -1336,13 +1336,14 @@ given length. An ``UploadedFile`` object has two attributes: - ====================== ===================================================== - Argument Description - ====================== ===================================================== + ====================== ==================================================== + Attribute Description + ====================== ==================================================== ``filename`` The name of the file, provided by the uploading client. + ``content`` The array of bytes comprising the file content. - ====================== ===================================================== + ====================== ==================================================== The string representation of an ``UploadedFile`` is the same as the filename attribute. @@ -1352,6 +1353,38 @@ When you use a ``FileField`` on a form, you must also remember to .. _`bind the file data to the form`: `Binding uploaded files to a form`_ +``FilePathField`` +~~~~~~~~~~~~~~~~~ + +**New in Django development version** + + * Default widget: ``Select`` + * Empty value: ``None`` + * Normalizes to: A unicode object + * Validates that the selected choice exists in the list of choices. + * Error message keys: ``required``, ``invalid_choice`` + +The field allows choosing from files inside a certain directory. It takes three +extra arguments: + + ============== ========== =============================================== + Argument Required? Description + ============== ========== =============================================== + ``path`` Yes The absolute path to the directory whose + contents you want listed. This directory must + exist. + + ``recursive`` No If ``False`` (the default) only the direct + contents of ``path`` will be offered as choices. + If ``True``, the directory will be descended + into recursively and all descendants will be + listed as choices. + + ``match`` No A regular expression pattern; only files with + names matching this expression will be allowed + as choices. + ============== ========== =============================================== + ``ImageField`` ~~~~~~~~~~~~~~ @@ -1502,6 +1535,41 @@ the bottom of this document, for examples of their use. ``SplitDateTimeField`` ~~~~~~~~~~~~~~~~~~~~~~ +Fields which handle relationships +--------------------------------- + +For representing relationships between models, two fields are +provided which can derive their choices from a ``QuerySet``, and which +place one or more model objects into the ``cleaned_data`` dictionary +of forms in which they're used. Both of these fields have an +additional required argument: + +``queryset`` + A ``QuerySet`` of model objects from which the choices for the + field will be derived, and which will be used to validate the + user's selection. + +``ModelChoiceField`` +~~~~~~~~~~~~~~~~~~~~ + +Allows the selection of a single model object, suitable for representing a +foreign key. The method receives an object as an argument and must return a +string to represent it. + +The labels for the choice field call the ``__unicode__`` method of the model to +generate string representations. To provide custom labels, subclass ``ModelChoiceField`` and override ``label_for_model``:: + + class MyModelChoiceField(ModelChoiceField): + def label_from_instance(self, obj): + return "My Object #%i" % obj.id + +``ModelMultipleChoiceField`` +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Allows the selection of one or more model objects, suitable for representing a +many-to-many relation. As with ``ModelChoiceField``, you can use +``label_from_instance`` to customize the object labels. + Creating custom fields ---------------------- @@ -1572,9 +1640,9 @@ The three types of cleaning methods are: These methods are run in the order given above, one field at a time. That is, for each field in the form (in the order they are declared in the form -definition), the ``Field.clean()`` method (or it's override) is run, then +definition), the ``Field.clean()`` method (or its override) is run, then ``clean_()``. Finally, once those two methods are run for every -field, the ``Form.clean()`` method, or it's override, is executed. +field, the ``Form.clean()`` method, or its override, is executed. As mentioned above, any of these methods can raise a ``ValidationError``. For any field, if the ``Field.clean()`` method raises a ``ValidationError``, any @@ -1696,7 +1764,7 @@ For example, take the following simple form:: comment = forms.CharField() This form will include three default TextInput widgets, with default rendering - -no CSS class, no extra attributes. This means that the inputs boxes provided for +no CSS class, no extra attributes. This means that the input boxes provided for each widget will be rendered exactly the same:: >>> f = CommentForm(auto_id=False) diff --git a/docs/pagination.txt b/docs/pagination.txt new file mode 100644 index 0000000000..486c92264b --- /dev/null +++ b/docs/pagination.txt @@ -0,0 +1,133 @@ +========== +Pagination +========== + +**New in Django development version** + +Django provides a few classes that help you manage paginated data -- that is, +data that's split across several pages, with "Previous/Next" links. These +classes live in the module ``django/core/paginator.py``. + +Example +======= + +Give ``Paginator`` a list of objects, plus the number of items you'd like to +have on each page, and it gives you methods for accessing the items for each +page:: + + >>> from django.core.paginator import Paginator + >>> objects = ['john', 'paul', 'george', 'ringo'] + >>> p = Paginator(objects, 2) + + >>> p.count + 4 + >>> p.num_pages + 2 + >>> p.page_range + [1, 2] + + >>> page1 = p.page(1) + >>> page1 + + >>> page1.object_list + ['john', 'paul'] + + >>> page2 = p.page(2) + >>> page2.object_list + ['george', 'ringo'] + >>> page2.has_next() + False + >>> page2.has_previous() + True + >>> page2.has_other_pages() + True + >>> page2.next_page_number() + 3 + >>> page2.previous_page_number() + 1 + >>> page2.start_index() # The 1-based index of the first item on this page + 3 + >>> page2.end_index() # The 1-based index of the last item on this page + 4 + + >>> p.page(0) + Traceback (most recent call last): + ... + InvalidPage + >>> p.page(3) + Traceback (most recent call last): + ... + InvalidPage + +``Paginator`` objects +===================== + +Methods +------- + +``page(number)`` -- Returns a ``Page`` object with the given 1-based index. +Raises ``InvalidPage`` if the given page number doesn't exist. + +Attributes +---------- + +``count`` -- The total number of objects, across all pages. + +``num_pages`` -- The total number of pages. + +``page_range`` -- A 1-based range of page numbers, e.g., ``[1, 2, 3, 4]``. + +``Page`` objects +================ + +Methods +------- + +``has_next()`` -- Returns ``True`` if there's a next page. + +``has_previous()`` -- Returns ``True`` if there's a previous page. + +``has_other_pages()`` -- Returns ``True`` if there's a next *or* previous page. + +``next_page_number()`` -- Returns the next page number. Note that this is +"dumb" and will return the next page number regardless of whether a subsequent +page exists. + +``previous_page_number()`` -- Returns the previous page number. Note that this +is "dumb" and will return the previous page number regardless of whether a +previous page exists. + +``start_index()`` -- Returns the 1-based index of the first object on the page, +relative to all of the objects in the paginator's list. For example, when +paginating a list of 5 objects with 2 objects per page, the second page's +``start_index()`` would return ``3``. + +``end_index()`` -- Returns the 1-based index of the last object on the page, +relative to all of the objects in the paginator's list. For example, when +paginating a list of 5 objects with 2 objects per page, the second page's +``end_index()`` would return ``4``. + +Attributes +---------- + +``object_list`` -- The list of objects on this page. + +``number`` -- The 1-based page number for this page. + +``paginator`` -- The associated ``Paginator`` object. + +``QuerySetPaginator`` objects +============================= + +Use ``QuerySetPaginator`` instead of ``Paginator`` if you're paginating across +a ``QuerySet`` from Django's database API. This is slightly more efficient, and +there are no API differences between the two classes. + +The legacy ``ObjectPaginator`` class +==================================== + +The ``Paginator`` and ``Page`` classes are new in the Django development +version, as of revision 7306. In previous versions, Django provided an +``ObjectPaginator`` class that offered similar functionality but wasn't as +convenient. This class still exists, for backwards compatibility, but Django +now issues a ``DeprecationWarning`` if you try to use it. diff --git a/docs/request_response.txt b/docs/request_response.txt index e50cfc5ea3..0e0f046a2d 100644 --- a/docs/request_response.txt +++ b/docs/request_response.txt @@ -141,6 +141,16 @@ All attributes except ``session`` should be considered read-only. The raw HTTP POST data. This is only useful for advanced processing. Use ``POST`` instead. +``urlconf`` + Not defined by Django itself, but will be read if other code + (e.g., a custom middleware class) sets it; when present, this will + be used as the root URLConf for the current request, overriding + the ``ROOT_URLCONF`` setting. See `How Django processes a + request`_ for details. + +.. _How Django processes a request: ../url_dispatch/#how-django-processes-a-request + + Methods ------- @@ -189,6 +199,23 @@ Methods Returns ``True`` if the request is secure; that is, if it was made with HTTPS. +``is_ajax()`` + **New in Django development version** + + Returns ``True`` if the request was made via an XMLHttpRequest by checking + the ``HTTP_X_REQUESTED_WITH`` header for the string *'XMLHttpRequest'*. The + following major Javascript libraries all send this header: + + * jQuery + * Dojo + * MochiKit + * MooTools + * Prototype + * YUI + + If you write your own XMLHttpRequest call (on the browser side), you will + have to set this header manually to use this method. + QueryDict objects ----------------- diff --git a/docs/sessions.txt b/docs/sessions.txt index 6355524d2e..d8bac5b8d4 100644 --- a/docs/sessions.txt +++ b/docs/sessions.txt @@ -48,10 +48,10 @@ Using file-based sessions To use file-based sessions, set the ``SESSION_ENGINE`` setting to ``"django.contrib.sessions.backends.file"``. -You might also want to set the ``SESSION_FILE_PATH`` setting (which -defaults to ``/tmp``) to control where Django stores session files. Be -sure to check that your Web server has permissions to read and write to -this location. +You might also want to set the ``SESSION_FILE_PATH`` setting (which defaults +to output from ``tempfile.gettempdir()``, most likely ``/tmp``) to control +where Django stores session files. Be sure to check that your Web server has +permissions to read and write to this location. Using cache-based sessions -------------------------- diff --git a/docs/settings.txt b/docs/settings.txt index ace893f1b5..fb2e04f1ea 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -185,8 +185,11 @@ ADMIN_MEDIA_PREFIX Default: ``'/media/'`` -The URL prefix for admin media -- CSS, JavaScript and images. Make sure to use -a trailing slash. +The URL prefix for admin media -- CSS, JavaScript and images used by +the Django administrative interface. Make sure to use a trailing +slash, and to have this be different from the ``MEDIA_URL`` setting +(since the same URL cannot be mapped onto two different sets of +files). ADMINS ------ @@ -582,13 +585,14 @@ in standard language format. For example, U.S. English is ``"en-us"``. See the LANGUAGE_COOKIE_NAME -------------------- +**New in Django development version** + Default: ``'django_language'`` The name of the cookie to use for the language cookie. This can be whatever -you want (but should be different from SESSION_COOKIE_NAME). See the +you want (but should be different from ``SESSION_COOKIE_NAME``). See the `internationalization docs`_ for details. - LANGUAGES --------- @@ -753,7 +757,9 @@ ROOT_URLCONF Default: Not defined A string representing the full Python import path to your root URLconf. For example: -``"mydjangoapps.urls"``. See `How Django processes a request`_. +``"mydjangoapps.urls"``. Can be overridden on a per-request basis by +setting the attribute ``urlconf`` on the incoming ``HttpRequest`` +object. See `How Django processes a request`_ for details. .. _How Django processes a request: ../url_dispatch/#how-django-processes-a-request diff --git a/docs/syndication_feeds.txt b/docs/syndication_feeds.txt index ebd6af26f8..f86acfe54d 100644 --- a/docs/syndication_feeds.txt +++ b/docs/syndication_feeds.txt @@ -245,6 +245,13 @@ request to the URL ``/rss/beats/0613/``: subclass of ``ObjectDoesNotExist``. Raising ``ObjectDoesNotExist`` in ``get_object()`` tells Django to produce a 404 error for that request. + **New in Django development version:** The ``get_object()`` method also + has a chance to handle the ``/rss/beats/`` url. In this case, ``bits`` + will be an empty list. In our example, ``len(bits) != 1`` and an + ``ObjectDoesNotExist`` exception will be raised, so ``/rss/beats/`` will + generate a 404 page. But you can handle this case however you like. For + example you could generate a combined feed for all beats. + * To generate the feed's ````, ``<link>`` and ``<description>``, Django uses the ``title()``, ``link()`` and ``description()`` methods. In the previous example, they were simple string class attributes, but this diff --git a/docs/templates.txt b/docs/templates.txt index d473a6f06f..ea9f3fb6b2 100644 --- a/docs/templates.txt +++ b/docs/templates.txt @@ -429,8 +429,9 @@ all block tags. For example:: # base.html {% autoescape off %} - <h1>{% block title %}</h1> + <h1>{% block title %}{% endblock %}</h1> {% block content %} + {% endblock %} {% endautoescape %} @@ -438,10 +439,11 @@ all block tags. For example:: {% extends "base.html" %} {% block title %}This & that{% endblock %} - {% block content %}<b>Hello!</b>{% endblock %} + {% block content %}{{ greeting }}{% endblock %} Because auto-escaping is turned off in the base template, it will also be -turned off in the child template, resulting in the following rendered HTML:: +turned off in the child template, resulting in the following rendered +HTML when the ``greeting`` variable contains the string ``<b>Hello!</b>``:: <h1>This & that</h1> <b>Hello!</b> @@ -1222,14 +1224,20 @@ Built-in filter reference add ~~~ -Adds the arg to the value. +Adds the argument to the value. + +For example:: + + {{ value|add:"2" }} + +If ``value`` is ``4``, then the output will be ``6``. addslashes ~~~~~~~~~~ Adds slashes before quotes. Useful for escaping strings in CSV, for example. -**New in Django development version**: for escaping data in JavaScript strings, +**New in Django development version**: For escaping data in JavaScript strings, use the `escapejs`_ filter instead. capfirst @@ -1247,45 +1255,98 @@ cut Removes all values of arg from the given string. +For example:: + + {{ value|cut:" "}} + +If ``value`` is ``"String with spaces"``, the output will be ``"Stringwithspaces"``. + date ~~~~ Formats a date according to the given format (same as the `now`_ tag). +For example:: + + {{ value|date:"D d M Y" }} + +If ``value`` is a ``datetime`` object (e.g., the result of +``datetime.datetime.now()``), the output will be the string +``'Wed 09 Jan 2008'``. + default ~~~~~~~ -If value is unavailable, use given default. +If value evaluates to ``False``, use given default. Otherwise, use the value. + +For example:: + + {{ value|default:"nothing" }} + +If ``value`` is ``""`` (the empty string), the output will be ``nothing``. default_if_none ~~~~~~~~~~~~~~~ -If value is ``None``, use given default. +If (and only if) value is ``None``, use given default. Otherwise, use the +value. + +Note that if an empty string is given, the default value will *not* be used. +Use the ``default`` filter if you want to fallback for empty strings. + +For example:: + + {{ value|default_if_none:"nothing" }} + +If ``value`` is ``None``, the output will be the string ``"nothing"``. dictsort ~~~~~~~~ -Takes a list of dictionaries, returns that list sorted by the key given in +Takes a list of dictionaries and returns that list sorted by the key given in the argument. +For example:: + + {{ value|dictsort:"name" }} + +If ``value`` is:: + + [ + {'name': 'zed', 'age': 19}, + {'name': 'amy', 'age': 22}, + {'name': 'joe', 'age': 31}, + ] + +then the output would be:: + + [ + {'name': 'amy', 'age': 22}, + {'name': 'joe', 'age': 31}, + {'name': 'zed', 'age': 19}, + ] + dictsortreversed ~~~~~~~~~~~~~~~~ -Takes a list of dictionaries, returns that list sorted in reverse order by the -key given in the argument. +Takes a list of dictionaries and returns that list sorted in reverse order by +the key given in the argument. This works exactly the same as the above filter, +but the returned value will be in reverse order. divisibleby ~~~~~~~~~~~ -Returns true if the value is divisible by the argument. +Returns ``True`` if the value is divisible by the argument. + +For example:: + + {{ value|divisibleby:"3" }} + +If ``value`` is ``21``, the output would be ``True``. escape ~~~~~~ -**New in Django development version:** The behaviour of this filter has -changed slightly in the development version (the affects are only applied -once, after all other filters). - Escapes a string's HTML. Specifically, it makes these replacements: * ``<`` is converted to ``<`` @@ -1304,6 +1365,10 @@ applied to the result will only result in one round of escaping being done. So it is safe to use this function even in auto-escaping environments. If you want multiple escaping passes to be applied, use the ``force_escape`` filter. +**New in Django development version:** Due to auto-escaping, the behavior of +this filter has changed slightly. The replacements are only made once, after +all other filters are applied -- including filters before and after it. + escapejs ~~~~~~~~ @@ -1319,16 +1384,38 @@ filesizeformat Format the value like a 'human-readable' file size (i.e. ``'13 KB'``, ``'4.1 MB'``, ``'102 bytes'``, etc). +For example:: + + {{ value|filesizeformat }} + +If ``value`` is 123456789, the output would be ``117.7 MB``. + first ~~~~~ Returns the first item in a list. +For example:: + + {{ value|first }} + +If ``value`` is the list ``['a', 'b', 'c']``, the output will be ``'a'``. + fix_ampersands ~~~~~~~~~~~~~~ Replaces ampersands with ``&`` entities. +For example:: + + {{ value|fix_ampersands }} + +If ``value`` is ``Tom & Jerry``, the output will be ``Tom & Jerry``. + +**New in Django development version**: This filter generally is no longer +useful, because ampersands are automatically escaped in templates. See escape_ +for more on how auto-escaping works. + floatformat ~~~~~~~~~~~ @@ -1383,10 +1470,16 @@ filter. get_digit ~~~~~~~~~ -Given a whole number, returns the requested digit of it, where 1 is the -right-most digit, 2 is the second-right-most digit, etc. Returns the original -value for invalid input (if input or argument is not an integer, or if argument -is less than 1). Otherwise, output is always an integer. +Given a whole number, returns the requested digit, where 1 is the right-most +digit, 2 is the second-right-most digit, etc. Returns the original value for +invalid input (if input or argument is not an integer, or if argument is less +than 1). Otherwise, output is always an integer. + +For example:: + + {{ value|get_digit:"2" }} + +If ``value`` is ``123456789``, the output will be ``8``. iriencode ~~~~~~~~~ @@ -1401,7 +1494,14 @@ It's safe to use this filter on a string that has already gone through the join ~~~~ -Joins a list with a string, like Python's ``str.join(list)``. +Joins a list with a string, like Python's ``str.join(list)`` + +For example:: + + {{ value|join:" // " }} + +If ``value`` is the list ``['a', 'b', 'c']``, the output will be the string +``"a // b // c"``. last ~~~~ @@ -1410,15 +1510,34 @@ last Returns the last item in a list. +For example:: + + {{ value|last }} + +If ``value`` is the list ``['a', 'b', 'c', 'd']``, the output will be the string +``"d"``. + length ~~~~~~ -Returns the length of the value. Useful for lists. +Returns the length of the value. This works for both strings and lists. + +For example:: + + {{ value|length }} + +If ``value`` is ``['a', 'b', 'c', 'd']``, the output will be ``4``. length_is ~~~~~~~~~ -Returns a boolean of whether the value's length is the argument. +Returns ``True`` if the value's length is the argument, or ``False`` otherwise. + +For example:: + + {{ value|length_is:"4" }} + +If ``value`` is ``['a', 'b', 'c', 'd']``, the output will be ``True``. linebreaks ~~~~~~~~~~ @@ -1427,6 +1546,13 @@ Replaces line breaks in plain text with appropriate HTML; a single newline becomes an HTML line break (``<br />``) and a new line followed by a blank line becomes a paragraph break (``</p>``). +For example:: + + {{ value|linebreaks }} + +If ``value`` is ``Joel\nis a slug``, the output will be ``<p>Joe<br>is a +slug</p>``. + linebreaksbr ~~~~~~~~~~~~ @@ -1450,12 +1576,26 @@ lower Converts a string into all lowercase. +For example:: + + {{ value|lower }} + +If ``value`` is ``Still MAD At Yoko``, the output will be ``still mad at yoko``. + make_list ~~~~~~~~~ Returns the value turned into a list. For an integer, it's a list of digits. For a string, it's a list of characters. +For example:: + + {{ value|make_list }} + +If ``value`` is the string ``"Joe"``, the output would be the list +``[u'J', u'o', u'e']``. If ``value`` is ``123``, the output will be the list +``[1, 2, 3]``. + phone2numeric ~~~~~~~~~~~~~ @@ -1492,17 +1632,32 @@ Example:: pprint ~~~~~~ -A wrapper around pprint.pprint -- for debugging, really. +A wrapper around `pprint.pprint`__ -- for debugging, really. + +__ http://www.python.org/doc/2.5/lib/module-pprint.html random ~~~~~~ -Returns a random item from the list. +Returns a random item from the given list. + +For example:: + + {{ value|random }} + +If ``value`` is the list ``['a', 'b', 'c', 'd']``, the output could be ``"b"``. removetags ~~~~~~~~~~ -Removes a space separated list of [X]HTML tags from the output. +Removes a space-separated list of [X]HTML tags from the output. + +For example:: + + {{ value|removetags:"b span"|safe }} + +If ``value`` is ``"<b>Joel</b> <button>is</button> a <span>slug</span>"`` the +output will be ``"Joel <button>is</button> a slug"``. rjust ~~~~~ @@ -1535,6 +1690,12 @@ Converts to lowercase, removes non-word characters (alphanumerics and underscores) and converts spaces to hyphens. Also strips leading and trailing whitespace. +For example:: + + {{ value|slugify }} + +If ``value`` is ``"Joel is a slug"``, the output will be ``"joel-is-a-slug"``. + stringformat ~~~~~~~~~~~~ @@ -1545,11 +1706,24 @@ the leading "%" is dropped. See http://docs.python.org/lib/typesseq-strings.html for documentation of Python string formatting +For example:: + + {{ value|stringformat:"s" }} + +If ``value`` is ``"Joel is a slug"``, the output will be ``"Joel is a slug"``. + striptags ~~~~~~~~~ Strips all [X]HTML tags. +For example:: + + {{ value|striptags }} + +If ``value`` is ``"<b>Joel</b> <button>is</button> a <span>slug</span>"``, the +output will be ``"Joel is a slug"``. + time ~~~~ @@ -1558,10 +1732,17 @@ The time filter will only accept parameters in the format string that relate to the time of day, not the date (for obvious reasons). If you need to format a date, use the `date`_ filter. +For example:: + + {{ value|time:"H:i" }} + +If ``value`` is equivalent to ``datetime.datetime.now()``, the output will be +the string ``"01:23"``. + timesince ~~~~~~~~~ -Formats a date as the time since that date (i.e. "4 days, 6 hours"). +Formats a date as the time since that date (e.g., "4 days, 6 hours"). Takes an optional argument that is a variable containing the date to use as the comparison point (without the argument, the comparison point is *now*). @@ -1599,6 +1780,12 @@ Truncates a string after a certain number of words. **Argument:** Number of words to truncate after +For example:: + + {{ value|truncatewords:2 }} + +If ``value`` is ``"Joel is a slug"``, the output will be ``"Joel is ..."``. + truncatewords_html ~~~~~~~~~~~~~~~~~~ @@ -1615,10 +1802,8 @@ unordered_list Recursively takes a self-nested list and returns an HTML unordered list -- WITHOUT opening and closing <ul> tags. -**Changed in Django development version** - -The format accepted by ``unordered_list`` has changed to an easier to -understand format. +**New in Django development version:** The format accepted by +``unordered_list`` has changed to be easier to understand. The list is assumed to be in the proper format. For example, if ``var`` contains ``['States', ['Kansas', ['Lawrence', 'Topeka'], 'Illinois']]``, then @@ -1644,6 +1829,12 @@ upper Converts a string into all uppercase. +For example:: + + {{ value|upper }} + +If ``value`` is ``"Joel is a slug"``, the output will be ``"JOEL IS A SLUG"``. + urlencode ~~~~~~~~~ @@ -1657,6 +1848,14 @@ Converts URLs in plain text into clickable links. Note that if ``urlize`` is applied to text that already contains HTML markup, things won't work as expected. Apply this filter only to *plain* text. +For example:: + + {{ value|urlize }} + +If ``value`` is ``"Check out www.djangoproject.com"``, the output will be +``"Check out <a +href="http://www.djangoproject.com">www.djangoproject.com</a>"``. + urlizetrunc ~~~~~~~~~~~ @@ -1667,6 +1866,14 @@ As with urlize_, this filter should only be applied to *plain* text. **Argument:** Length to truncate URLs to +For example:: + + {{ value|urlizetrunc:15 }} + +If ``value`` is ``"Check out www.djangoproject.com"``, the output would be +``'Check out <a +href="http://www.djangoproject.com">www.djangopr...</a>'``. + wordcount ~~~~~~~~~ @@ -1679,6 +1886,16 @@ Wraps words at specified line length. **Argument:** number of characters at which to wrap the text +For example:: + + {{ value|wordwrap:5 }} + +If ``value`` is ``Joel is a slug``, the output would be:: + + Joel + is a + slug + yesno ~~~~~ diff --git a/docs/tutorial04.txt b/docs/tutorial04.txt index bd16fa2924..473fba1ef8 100644 --- a/docs/tutorial04.txt +++ b/docs/tutorial04.txt @@ -37,6 +37,12 @@ A quick rundown: form will alter data server-side. Whenever you create a form that alters data server-side, use ``method="post"``. This tip isn't specific to Django; it's just good Web development practice. + + * ``forloop.counter`` indicates how many times the ``for`` tag has + gone through its loop; for more information, see `the + documentation for the "for" tag`_. + +.. _the documentation for the "for" tag: ../templates/#for Now, let's create a Django view that handles the submitted data and does something with it. Remember, in `Tutorial 3`_, we created a URLconf for the diff --git a/docs/url_dispatch.txt b/docs/url_dispatch.txt index 789399de8d..053ee954a3 100644 --- a/docs/url_dispatch.txt +++ b/docs/url_dispatch.txt @@ -32,9 +32,11 @@ How Django processes a request When a user requests a page from your Django-powered site, this is the algorithm the system follows to determine which Python code to execute: - 1. Django looks at the ``ROOT_URLCONF`` setting in your `settings file`_. - This should be a string representing the full Python import path to your - URLconf. For example: ``"mydjangoapps.urls"``. + 1. Django determines the root URLConf module to use; ordinarily + this is the value of the ``ROOT_URLCONF`` setting in your + `settings file`_, but if the incoming ``HttpRequest`` object + has an attribute called ``urlconf``, its value will be used in + place of the ``ROOT_URLCONF`` setting. 2. Django loads that Python module and looks for the variable ``urlpatterns``. This should be a Python list, in the format returned by the function ``django.conf.urls.defaults.patterns()``. diff --git a/tests/modeltests/custom_pk/models.py b/tests/modeltests/custom_pk/models.py index 381d81b987..e3edf3187e 100644 --- a/tests/modeltests/custom_pk/models.py +++ b/tests/modeltests/custom_pk/models.py @@ -71,8 +71,9 @@ u'ABC123' >>> fran.save() >>> Employee.objects.filter(last_name__exact='Jones') [<Employee: Dan Jones>, <Employee: Fran Jones>] ->>> Employee.objects.in_bulk(['ABC123', 'XYZ456']) -{u'XYZ456': <Employee: Fran Jones>, u'ABC123': <Employee: Dan Jones>} +>>> emps = Employee.objects.in_bulk(['ABC123', 'XYZ456']) +>>> emps['ABC123'] +<Employee: Dan Jones> >>> b = Business(name='Sears') >>> b.save() diff --git a/tests/modeltests/lookup/models.py b/tests/modeltests/lookup/models.py index aa90d1e5ec..f31857e0fe 100644 --- a/tests/modeltests/lookup/models.py +++ b/tests/modeltests/lookup/models.py @@ -76,8 +76,11 @@ Article 4 # in_bulk() takes a list of IDs and returns a dictionary mapping IDs # to objects. ->>> Article.objects.in_bulk([1, 2]) -{1: <Article: Article 1>, 2: <Article: Article 2>} +>>> arts = Article.objects.in_bulk([1, 2]) +>>> arts[1] +<Article: Article 1> +>>> arts[2] +<Article: Article 2> >>> Article.objects.in_bulk([3]) {3: <Article: Article 3>} >>> Article.objects.in_bulk([1000]) diff --git a/tests/modeltests/manipulators/models.py b/tests/modeltests/manipulators/models.py index 2ee81f62b3..3e52e33bbb 100644 --- a/tests/modeltests/manipulators/models.py +++ b/tests/modeltests/manipulators/models.py @@ -1,3 +1,4 @@ +# coding: utf-8 """ 27. Default manipulators @@ -21,7 +22,7 @@ class Album(models.Model): def __unicode__(self): return self.name -__test__ = {'API_TESTS':""" +__test__ = {'API_TESTS':u""" >>> from django.utils.datastructures import MultiValueDict # Create a Musician object via the default AddManipulator. @@ -40,25 +41,33 @@ __test__ = {'API_TESTS':""" True # Attempt to add a Musician without a first_name. ->>> man.get_validation_errors(MultiValueDict({'last_name': ['Blakey']})) -{'first_name': [u'This field is required.']} +>>> man.get_validation_errors(MultiValueDict({'last_name': ['Blakey']}))['first_name'] +[u'This field is required.'] # Attempt to add a Musician without a first_name and last_name. ->>> man.get_validation_errors(MultiValueDict({})) -{'first_name': [u'This field is required.'], 'last_name': [u'This field is required.']} +>>> errors = man.get_validation_errors(MultiValueDict({})) +>>> errors['first_name'] +[u'This field is required.'] +>>> errors['last_name'] +[u'This field is required.'] # Attempt to create an Album without a name or musician. >>> man = Album.AddManipulator() ->>> man.get_validation_errors(MultiValueDict({})) -{'musician': [u'This field is required.'], 'name': [u'This field is required.']} +>>> errors = man.get_validation_errors(MultiValueDict({})) +>>> errors['musician'] +[u'This field is required.'] +>>> errors['name'] +[u'This field is required.'] # Attempt to create an Album with an invalid musician. ->>> man.get_validation_errors(MultiValueDict({'name': ['Sallies Fforth'], 'musician': ['foo']})) -{'musician': [u"Select a valid choice; 'foo' is not in [u'', u'1']."]} +>>> errors = man.get_validation_errors(MultiValueDict({'name': ['Sallies Fforth'], 'musician': ['foo']})) +>>> errors['musician'] +[u"Select a valid choice; 'foo' is not in [u'', u'1']."] # Attempt to create an Album with an invalid release_date. ->>> man.get_validation_errors(MultiValueDict({'name': ['Sallies Fforth'], 'musician': ['1'], 'release_date': 'today'})) -{'release_date': [u'Enter a valid date in YYYY-MM-DD format.']} +>>> errors = man.get_validation_errors(MultiValueDict({'name': ['Sallies Fforth'], 'musician': ['1'], 'release_date': 'today'})) +>>> errors['release_date'] +[u'Enter a valid date in YYYY-MM-DD format.'] # Create an Album without a release_date (because it's optional). >>> data = MultiValueDict({'name': ['Ella and Basie'], 'musician': ['1']}) @@ -88,4 +97,9 @@ True <Album: Ultimate Ella> >>> a2.release_date datetime.date(2005, 2, 13) + +# Test isValidFloat Unicode coercion +>>> from django.core.validators import isValidFloat, ValidationError +>>> try: isValidFloat(u"ä", None) +... except ValidationError: pass """} diff --git a/tests/modeltests/model_forms/models.py b/tests/modeltests/model_forms/models.py index c480899f84..470312f5ca 100644 --- a/tests/modeltests/model_forms/models.py +++ b/tests/modeltests/model_forms/models.py @@ -234,8 +234,12 @@ We can also subclass the Meta inner class to change the fields list. >>> f = CategoryForm({'name': 'Entertainment', 'slug': 'entertainment', 'url': 'entertainment'}) >>> f.is_valid() True ->>> f.cleaned_data -{'url': u'entertainment', 'name': u'Entertainment', 'slug': u'entertainment'} +>>> f.cleaned_data['url'] +u'entertainment' +>>> f.cleaned_data['name'] +u'Entertainment' +>>> f.cleaned_data['slug'] +u'entertainment' >>> obj = f.save() >>> obj <Category: Entertainment> @@ -245,8 +249,12 @@ True >>> f = CategoryForm({'name': "It's a test", 'slug': 'its-test', 'url': 'test'}) >>> f.is_valid() True ->>> f.cleaned_data -{'url': u'test', 'name': u"It's a test", 'slug': u'its-test'} +>>> f.cleaned_data['url'] +u'test' +>>> f.cleaned_data['name'] +u"It's a test" +>>> f.cleaned_data['slug'] +u'its-test' >>> obj = f.save() >>> obj <Category: It's a test> @@ -259,8 +267,12 @@ save() on the resulting model instance. >>> f = CategoryForm({'name': 'Third test', 'slug': 'third-test', 'url': 'third'}) >>> f.is_valid() True ->>> f.cleaned_data -{'url': u'third', 'name': u'Third test', 'slug': u'third-test'} +>>> f.cleaned_data['url'] +u'third' +>>> f.cleaned_data['name'] +u'Third test' +>>> f.cleaned_data['slug'] +u'third-test' >>> obj = f.save(commit=False) >>> obj <Category: Third test> @@ -272,8 +284,10 @@ True If you call save() with invalid data, you'll get a ValueError. >>> f = CategoryForm({'name': '', 'slug': '', 'url': 'foo'}) ->>> f.errors -{'name': [u'This field is required.'], 'slug': [u'This field is required.']} +>>> f.errors['name'] +[u'This field is required.'] +>>> f.errors['slug'] +[u'This field is required.'] >>> f.cleaned_data Traceback (most recent call last): ... @@ -645,6 +659,19 @@ Traceback (most recent call last): ... ValidationError: [u'Select a valid choice. That choice is not one of the available choices.'] +# check that we can safely iterate choices repeatedly +>>> gen_one = list(f.choices) +>>> gen_two = f.choices +>>> gen_one[2] +(2L, u"It's a test") +>>> list(gen_two) +[(u'', u'---------'), (1L, u'Entertainment'), (2L, u"It's a test"), (3L, u'Third')] + +# check that we can override the label_from_instance method to print custom labels (#4620) +>>> f.queryset = Category.objects.all() +>>> f.label_from_instance = lambda obj: "category " + str(obj) +>>> list(f.choices) +[(u'', u'---------'), (1L, 'category Entertainment'), (2L, "category It's a test"), (3L, 'category Third'), (4L, 'category Fourth')] # ModelMultipleChoiceField #################################################### @@ -730,6 +757,10 @@ Traceback (most recent call last): ... ValidationError: [u'Select a valid choice. 4 is not one of the available choices.'] +>>> f.queryset = Category.objects.all() +>>> f.label_from_instance = lambda obj: "multicategory " + str(obj) +>>> list(f.choices) +[(1L, 'multicategory Entertainment'), (2L, "multicategory It's a test"), (3L, 'multicategory Third'), (4L, 'multicategory Fourth')] # PhoneNumberField ############################################################ @@ -739,8 +770,10 @@ ValidationError: [u'Select a valid choice. 4 is not one of the available choices >>> f = PhoneNumberForm({'phone': '(312) 555-1212', 'description': 'Assistance'}) >>> f.is_valid() True ->>> f.cleaned_data -{'phone': u'312-555-1212', 'description': u'Assistance'} +>>> f.cleaned_data['phone'] +u'312-555-1212' +>>> f.cleaned_data['description'] +u'Assistance' # FileField ################################################################### @@ -766,7 +799,7 @@ True <class 'django.newforms.fields.UploadedFile'> >>> instance = f.save() >>> instance.file -u'.../test1.txt' +u'...test1.txt' # Edit an instance that already has the file defined in the model. This will not # save the file again, but leave it exactly as it is. @@ -775,10 +808,10 @@ u'.../test1.txt' >>> f.is_valid() True >>> f.cleaned_data['file'] -u'.../test1.txt' +u'...test1.txt' >>> instance = f.save() >>> instance.file -u'.../test1.txt' +u'...test1.txt' # Delete the current file since this is not done by Django. @@ -791,7 +824,7 @@ u'.../test1.txt' True >>> instance = f.save() >>> instance.file -u'.../test2.txt' +u'...test2.txt' >>> instance.delete() @@ -810,7 +843,7 @@ True True >>> instance = f.save() >>> instance.file -u'.../test3.txt' +u'...test3.txt' >>> instance.delete() # ImageField ################################################################### @@ -832,7 +865,7 @@ True <class 'django.newforms.fields.UploadedFile'> >>> instance = f.save() >>> instance.image -u'.../test.png' +u'...test.png' # Edit an instance that already has the image defined in the model. This will not # save the image again, but leave it exactly as it is. @@ -841,10 +874,10 @@ u'.../test.png' >>> f.is_valid() True >>> f.cleaned_data['image'] -u'.../test.png' +u'...test.png' >>> instance = f.save() >>> instance.image -u'.../test.png' +u'...test.png' # Delete the current image since this is not done by Django. @@ -857,7 +890,7 @@ u'.../test.png' True >>> instance = f.save() >>> instance.image -u'.../test2.png' +u'...test2.png' >>> instance.delete() @@ -876,7 +909,7 @@ True True >>> instance = f.save() >>> instance.image -u'.../test3.png' +u'...test3.png' >>> instance.delete() """} diff --git a/tests/modeltests/pagination/models.py b/tests/modeltests/pagination/models.py index f44c67a139..277c5961e3 100644 --- a/tests/modeltests/pagination/models.py +++ b/tests/modeltests/pagination/models.py @@ -4,6 +4,11 @@ Django provides a framework for paginating a list of objects in a few lines of code. This is often useful for dividing search results or long lists of objects into easily readable pages. + +In Django 0.96 and earlier, a single ObjectPaginator class implemented this +functionality. In the Django development version, the behavior is split across +two classes -- Paginator and Page -- that are more easier to use. The legacy +ObjectPaginator class is deprecated. """ from django.db import models @@ -16,70 +21,210 @@ class Article(models.Model): return self.headline __test__ = {'API_TESTS':""" -# prepare a list of objects for pagination +# Prepare a list of objects for pagination. >>> from datetime import datetime >>> for x in range(1, 10): ... a = Article(headline='Article %s' % x, pub_date=datetime(2005, 7, 29)) ... a.save() -# create a basic paginator, 5 articles per page +#################################### +# New/current API (Paginator/Page) # +#################################### + +>>> from django.core.paginator import Paginator, InvalidPage +>>> paginator = Paginator(Article.objects.all(), 5) +>>> paginator.count +9 +>>> paginator.num_pages +2 +>>> paginator.page_range +[1, 2] + +# Get the first page. +>>> p = paginator.page(1) +>>> p +<Page 1 of 2> +>>> p.object_list +[<Article: Article 1>, <Article: Article 2>, <Article: Article 3>, <Article: Article 4>, <Article: Article 5>] +>>> p.has_next() +True +>>> p.has_previous() +False +>>> p.has_other_pages() +True +>>> p.next_page_number() +2 +>>> p.previous_page_number() +0 +>>> p.start_index() +1 +>>> p.end_index() +5 + +# Get the second page. +>>> p = paginator.page(2) +>>> p +<Page 2 of 2> +>>> p.object_list +[<Article: Article 6>, <Article: Article 7>, <Article: Article 8>, <Article: Article 9>] +>>> p.has_next() +False +>>> p.has_previous() +True +>>> p.has_other_pages() +True +>>> p.next_page_number() +3 +>>> p.previous_page_number() +1 +>>> p.start_index() +6 +>>> p.end_index() +9 + +# Invalid pages raise InvalidPage. +>>> paginator.page(0) +Traceback (most recent call last): +... +InvalidPage: ... +>>> paginator.page(3) +Traceback (most recent call last): +... +InvalidPage: ... + +# Empty paginators with allow_empty_first_page=True. +>>> paginator = Paginator(Article.objects.filter(id=0), 5, allow_empty_first_page=True) +>>> paginator.count +0 +>>> paginator.num_pages +1 +>>> paginator.page_range +[1] + +# Empty paginators with allow_empty_first_page=False. +>>> paginator = Paginator(Article.objects.filter(id=0), 5, allow_empty_first_page=False) +>>> paginator.count +0 +>>> paginator.num_pages +0 +>>> paginator.page_range +[] + +# Paginators work with regular lists/tuples, too -- not just with QuerySets. +>>> paginator = Paginator([1, 2, 3, 4, 5, 6, 7, 8, 9], 5) +>>> paginator.count +9 +>>> paginator.num_pages +2 +>>> paginator.page_range +[1, 2] + +# Get the first page. +>>> p = paginator.page(1) +>>> p +<Page 1 of 2> +>>> p.object_list +[1, 2, 3, 4, 5] +>>> p.has_next() +True +>>> p.has_previous() +False +>>> p.has_other_pages() +True +>>> p.next_page_number() +2 +>>> p.previous_page_number() +0 +>>> p.start_index() +1 +>>> p.end_index() +5 + +################################ +# Legacy API (ObjectPaginator) # +################################ + +# Don't print out the deprecation warnings during testing. +>>> from warnings import filterwarnings +>>> filterwarnings("ignore") + >>> from django.core.paginator import ObjectPaginator, InvalidPage >>> paginator = ObjectPaginator(Article.objects.all(), 5) - -# the paginator knows how many hits and pages it contains >>> paginator.hits 9 - >>> paginator.pages 2 +>>> paginator.page_range +[1, 2] -# get the first page (zero-based) +# Get the first page. >>> paginator.get_page(0) [<Article: Article 1>, <Article: Article 2>, <Article: Article 3>, <Article: Article 4>, <Article: Article 5>] - -# get the second page ->>> paginator.get_page(1) -[<Article: Article 6>, <Article: Article 7>, <Article: Article 8>, <Article: Article 9>] - -# does the first page have a next or previous page? >>> paginator.has_next_page(0) True - >>> paginator.has_previous_page(0) False - -# check the second page ->>> paginator.has_next_page(1) -False - ->>> paginator.has_previous_page(1) -True - >>> paginator.first_on_page(0) 1 ->>> paginator.first_on_page(1) -6 >>> paginator.last_on_page(0) 5 + +# Get the second page. +>>> paginator.get_page(1) +[<Article: Article 6>, <Article: Article 7>, <Article: Article 8>, <Article: Article 9>] +>>> paginator.has_next_page(1) +False +>>> paginator.has_previous_page(1) +True +>>> paginator.first_on_page(1) +6 >>> paginator.last_on_page(1) 9 +# Invalid pages raise InvalidPage. +>>> paginator.get_page(-1) +Traceback (most recent call last): +... +InvalidPage: ... +>>> paginator.get_page(2) +Traceback (most recent call last): +... +InvalidPage: ... + +# Empty paginators with allow_empty_first_page=True. +>>> paginator = ObjectPaginator(Article.objects.filter(id=0), 5) +>>> paginator.count +0 +>>> paginator.num_pages +1 +>>> paginator.page_range +[1] + +################## +# Orphan support # +################## + # Add a few more records to test out the orphans feature. >>> for x in range(10, 13): ... Article(headline="Article %s" % x, pub_date=datetime(2006, 10, 6)).save() -# With orphans set to 3 and 10 items per page, we should get all 12 items on a single page: +# With orphans set to 3 and 10 items per page, we should get all 12 items on a single page. +>>> paginator = Paginator(Article.objects.all(), 10, orphans=3) +>>> paginator.num_pages +1 + +# With orphans only set to 1, we should get two pages. +>>> paginator = ObjectPaginator(Article.objects.all(), 10, orphans=1) +>>> paginator.num_pages +2 + +# LEGACY: With orphans set to 3 and 10 items per page, we should get all 12 items on a single page. >>> paginator = ObjectPaginator(Article.objects.all(), 10, orphans=3) >>> paginator.pages 1 -# With orphans only set to 1, we should get two pages: +# LEGACY: With orphans only set to 1, we should get two pages. >>> paginator = ObjectPaginator(Article.objects.all(), 10, orphans=1) >>> paginator.pages 2 - -# The paginator can provide a list of all available pages. ->>> paginator = ObjectPaginator(Article.objects.all(), 10) ->>> paginator.page_range -[1, 2] """} diff --git a/tests/modeltests/validation/models.py b/tests/modeltests/validation/models.py index aacd041678..63f9f7a361 100644 --- a/tests/modeltests/validation/models.py +++ b/tests/modeltests/validation/models.py @@ -41,8 +41,8 @@ __test__ = {'API_TESTS':""" 23 >>> p = Person(**dict(valid_params, id='foo')) ->>> p.validate() -{'id': [u'This value must be an integer.']} +>>> p.validate()['id'] +[u'This value must be an integer.'] >>> p = Person(**dict(valid_params, id=None)) >>> p.validate() @@ -75,8 +75,8 @@ True False >>> p = Person(**dict(valid_params, is_child='foo')) ->>> p.validate() -{'is_child': [u'This value must be either True or False.']} +>>> p.validate()['is_child'] +[u'This value must be either True or False.'] >>> p = Person(**dict(valid_params, name=u'Jose')) >>> p.validate() @@ -115,8 +115,8 @@ datetime.date(2000, 5, 3) datetime.date(2000, 5, 3) >>> p = Person(**dict(valid_params, birthdate='foo')) ->>> p.validate() -{'birthdate': [u'Enter a valid date in YYYY-MM-DD format.']} +>>> p.validate()['birthdate'] +[u'Enter a valid date in YYYY-MM-DD format.'] >>> p = Person(**dict(valid_params, favorite_moment=datetime.datetime(2002, 4, 3, 13, 23))) >>> p.validate() @@ -143,11 +143,15 @@ datetime.datetime(2002, 4, 3, 0, 0) u'john@example.com' >>> p = Person(**dict(valid_params, email=22)) ->>> p.validate() -{'email': [u'Enter a valid e-mail address.']} +>>> p.validate()['email'] +[u'Enter a valid e-mail address.'] # Make sure that Date and DateTime return validation errors and don't raise Python errors. ->>> Person(name='John Doe', is_child=True, email='abc@def.com').validate() -{'favorite_moment': [u'This field is required.'], 'birthdate': [u'This field is required.']} +>>> p = Person(name='John Doe', is_child=True, email='abc@def.com') +>>> errors = p.validate() +>>> errors['favorite_moment'] +[u'This field is required.'] +>>> errors['birthdate'] +[u'This field is required.'] """} diff --git a/tests/regressiontests/forms/extra.py b/tests/regressiontests/forms/extra.py index 9dff4071f1..a8b369715d 100644 --- a/tests/regressiontests/forms/extra.py +++ b/tests/regressiontests/forms/extra.py @@ -22,7 +22,7 @@ classes that demonstrate some of the library's abilities. >>> from django.newforms.extras import SelectDateWidget >>> w = SelectDateWidget(years=('2007','2008','2009','2010','2011','2012','2013','2014','2015','2016')) >>> print w.render('mydate', '') -<select name="mydate_month"> +<select name="mydate_month" id="id_mydate_month"> <option value="1">January</option> <option value="2">February</option> <option value="3">March</option> @@ -36,7 +36,7 @@ classes that demonstrate some of the library's abilities. <option value="11">November</option> <option value="12">December</option> </select> -<select name="mydate_day"> +<select name="mydate_day" id="id_mydate_day"> <option value="1">1</option> <option value="2">2</option> <option value="3">3</option> @@ -69,7 +69,7 @@ classes that demonstrate some of the library's abilities. <option value="30">30</option> <option value="31">31</option> </select> -<select name="mydate_year"> +<select name="mydate_year" id="id_mydate_year"> <option value="2007">2007</option> <option value="2008">2008</option> <option value="2009">2009</option> @@ -84,7 +84,7 @@ classes that demonstrate some of the library's abilities. >>> w.render('mydate', None) == w.render('mydate', '') True >>> print w.render('mydate', '2010-04-15') -<select name="mydate_month"> +<select name="mydate_month" id="id_mydate_month"> <option value="1">January</option> <option value="2">February</option> <option value="3">March</option> @@ -98,7 +98,7 @@ True <option value="11">November</option> <option value="12">December</option> </select> -<select name="mydate_day"> +<select name="mydate_day" id="id_mydate_day"> <option value="1">1</option> <option value="2">2</option> <option value="3">3</option> @@ -131,7 +131,74 @@ True <option value="30">30</option> <option value="31">31</option> </select> -<select name="mydate_year"> +<select name="mydate_year" id="id_mydate_year"> +<option value="2007">2007</option> +<option value="2008">2008</option> +<option value="2009">2009</option> +<option value="2010" selected="selected">2010</option> +<option value="2011">2011</option> +<option value="2012">2012</option> +<option value="2013">2013</option> +<option value="2014">2014</option> +<option value="2015">2015</option> +<option value="2016">2016</option> +</select> + +Accepts a datetime or a string: + +>>> w.render('mydate', datetime.date(2010, 4, 15)) == w.render('mydate', '2010-04-15') +True + +Invalid dates still render the failed date: +>>> print w.render('mydate', '2010-02-31') +<select name="mydate_month" id="id_mydate_month"> +<option value="1">January</option> +<option value="2" selected="selected">February</option> +<option value="3">March</option> +<option value="4">April</option> +<option value="5">May</option> +<option value="6">June</option> +<option value="7">July</option> +<option value="8">August</option> +<option value="9">September</option> +<option value="10">October</option> +<option value="11">November</option> +<option value="12">December</option> +</select> +<select name="mydate_day" id="id_mydate_day"> +<option value="1">1</option> +<option value="2">2</option> +<option value="3">3</option> +<option value="4">4</option> +<option value="5">5</option> +<option value="6">6</option> +<option value="7">7</option> +<option value="8">8</option> +<option value="9">9</option> +<option value="10">10</option> +<option value="11">11</option> +<option value="12">12</option> +<option value="13">13</option> +<option value="14">14</option> +<option value="15">15</option> +<option value="16">16</option> +<option value="17">17</option> +<option value="18">18</option> +<option value="19">19</option> +<option value="20">20</option> +<option value="21">21</option> +<option value="22">22</option> +<option value="23">23</option> +<option value="24">24</option> +<option value="25">25</option> +<option value="26">26</option> +<option value="27">27</option> +<option value="28">28</option> +<option value="29">29</option> +<option value="30">30</option> +<option value="31" selected="selected">31</option> +</select> +<select name="mydate_year" id="id_mydate_year"> <option value="2007">2007</option> <option value="2008">2008</option> <option value="2009">2009</option> @@ -252,8 +319,8 @@ ValidationError: [u'This field is required.'] </select> <input type="text" name="field1_2_0" value="2007-04-25" id="id_field1_2_0" /><input type="text" name="field1_2_1" value="06:24:00" id="id_field1_2_1" /></td></tr> ->>> f.cleaned_data -{'field1': u'some text,JP,2007-04-25 06:24:00'} +>>> f.cleaned_data['field1'] +u'some text,JP,2007-04-25 06:24:00' # IPAddressField ################################################################## diff --git a/tests/regressiontests/forms/fields.py b/tests/regressiontests/forms/fields.py index 9216210e09..9421d8c005 100644 --- a/tests/regressiontests/forms/fields.py +++ b/tests/regressiontests/forms/fields.py @@ -1133,6 +1133,33 @@ u'' >>> f.clean(None) u'' +# FilePathField ############################################################### + +>>> import os +>>> from django import newforms as forms +>>> path = forms.__file__ +>>> path = os.path.dirname(path) + '/' +>>> path +'.../django/newforms/' +>>> f = forms.FilePathField(path=path) +>>> f.choices.sort() +>>> f.choices +[('.../django/newforms/__init__.py', '__init__.py'), ('.../django/newforms/__init__.pyc', '__init__.pyc'), ('.../django/newforms/fields.py', 'fields.py'), ('.../django/newforms/fields.pyc', 'fields.pyc'), ('.../django/newforms/forms.py', 'forms.py'), ('.../django/newforms/forms.pyc', 'forms.pyc'), ('.../django/newforms/models.py', 'models.py'), ('.../django/newforms/models.pyc', 'models.pyc'), ('.../django/newforms/util.py', 'util.py'), ('.../django/newforms/util.pyc', 'util.pyc'), ('.../django/newforms/widgets.py', 'widgets.py'), ('.../django/newforms/widgets.pyc', 'widgets.pyc')] +>>> f.clean('fields.py') +Traceback (most recent call last): +... +ValidationError: [u'Select a valid choice. That choice is not one of the available choices.'] +>>> f.clean(path + 'fields.py') +u'.../django/newforms/fields.py' +>>> f = forms.FilePathField(path=path, match='^.*?\.py$') +>>> f.choices.sort() +>>> f.choices +[('.../django/newforms/__init__.py', '__init__.py'), ('.../django/newforms/fields.py', 'fields.py'), ('.../django/newforms/forms.py', 'forms.py'), ('.../django/newforms/models.py', 'models.py'), ('.../django/newforms/util.py', 'util.py'), ('.../django/newforms/widgets.py', 'widgets.py')] +>>> f = forms.FilePathField(path=path, recursive=True, match='^.*?\.py$') +>>> f.choices.sort() +>>> f.choices +[('.../django/newforms/__init__.py', '__init__.py'), ('.../django/newforms/extras/__init__.py', 'extras/__init__.py'), ('.../django/newforms/extras/widgets.py', 'extras/widgets.py'), ('.../django/newforms/fields.py', 'fields.py'), ('.../django/newforms/forms.py', 'forms.py'), ('.../django/newforms/models.py', 'models.py'), ('.../django/newforms/util.py', 'util.py'), ('.../django/newforms/widgets.py', 'widgets.py')] + # SplitDateTimeField ########################################################## >>> f = SplitDateTimeField() diff --git a/tests/regressiontests/forms/forms.py b/tests/regressiontests/forms/forms.py index 59937bc84e..d6f7919ff2 100644 --- a/tests/regressiontests/forms/forms.py +++ b/tests/regressiontests/forms/forms.py @@ -36,8 +36,8 @@ True u'' >>> p.errors.as_text() u'' ->>> p.cleaned_data -{'first_name': u'John', 'last_name': u'Lennon', 'birthday': datetime.date(1940, 10, 9)} +>>> p.cleaned_data["first_name"], p.cleaned_data["last_name"], p.cleaned_data["birthday"] +(u'John', u'Lennon', datetime.date(1940, 10, 9)) >>> print p['first_name'] <input type="text" name="first_name" value="John" id="id_first_name" /> >>> print p['last_name'] @@ -68,8 +68,12 @@ Empty dictionaries are valid, too. >>> p = Person({}) >>> p.is_bound True ->>> p.errors -{'first_name': [u'This field is required.'], 'last_name': [u'This field is required.'], 'birthday': [u'This field is required.']} +>>> p.errors['first_name'] +[u'This field is required.'] +>>> p.errors['last_name'] +[u'This field is required.'] +>>> p.errors['birthday'] +[u'This field is required.'] >>> p.is_valid() False >>> p.cleaned_data @@ -137,8 +141,10 @@ u'<li><label for="id_first_name">First name:</label> <input type="text" name="fi u'<p><label for="id_first_name">First name:</label> <input type="text" name="first_name" value="John" id="id_first_name" /></p>\n<p><label for="id_last_name">Last name:</label> <input type="text" name="last_name" value="\u0160\u0110\u0106\u017d\u0107\u017e\u0161\u0111" id="id_last_name" /></p>\n<p><label for="id_birthday">Birthday:</label> <input type="text" name="birthday" value="1940-10-9" id="id_birthday" /></p>' >>> p = Person({'last_name': u'Lennon'}) ->>> p.errors -{'first_name': [u'This field is required.'], 'birthday': [u'This field is required.']} +>>> p.errors['first_name'] +[u'This field is required.'] +>>> p.errors['birthday'] +[u'This field is required.'] >>> p.is_valid() False >>> p.errors.as_ul() @@ -175,8 +181,13 @@ but cleaned_data contains only the form's fields. >>> p = Person(data) >>> p.is_valid() True ->>> p.cleaned_data -{'first_name': u'John', 'last_name': u'Lennon', 'birthday': datetime.date(1940, 10, 9)} +>>> p.cleaned_data['first_name'] +u'John' +>>> p.cleaned_data['last_name'] +u'Lennon' +>>> p.cleaned_data['birthday'] +datetime.date(1940, 10, 9) + cleaned_data will include a key and value for *all* fields defined in the Form, even if the Form's data didn't include a value for fields that are not @@ -191,8 +202,12 @@ empty string. >>> f = OptionalPersonForm(data) >>> f.is_valid() True ->>> f.cleaned_data -{'nick_name': u'', 'first_name': u'John', 'last_name': u'Lennon'} +>>> f.cleaned_data['nick_name'] +u'' +>>> f.cleaned_data['first_name'] +u'John' +>>> f.cleaned_data['last_name'] +u'Lennon' For DateFields, it's set to None. >>> class OptionalPersonForm(Form): @@ -203,8 +218,12 @@ For DateFields, it's set to None. >>> f = OptionalPersonForm(data) >>> f.is_valid() True ->>> f.cleaned_data -{'birth_date': None, 'first_name': u'John', 'last_name': u'Lennon'} +>>> print f.cleaned_data['birth_date'] +None +>>> f.cleaned_data['first_name'] +u'John' +>>> f.cleaned_data['last_name'] +u'Lennon' "auto_id" tells the Form to add an "id" attribute to each form element. If it's a string that contains '%s', Django will use that as a format string @@ -549,18 +568,22 @@ The MultipleHiddenInput widget renders multiple values as hidden fields. When using CheckboxSelectMultiple, the framework expects a list of input and returns a list of input. >>> f = SongForm({'name': 'Yesterday'}, auto_id=False) ->>> f.errors -{'composers': [u'This field is required.']} +>>> f.errors['composers'] +[u'This field is required.'] >>> f = SongForm({'name': 'Yesterday', 'composers': ['J']}, auto_id=False) >>> f.errors {} ->>> f.cleaned_data -{'composers': [u'J'], 'name': u'Yesterday'} +>>> f.cleaned_data['composers'] +[u'J'] +>>> f.cleaned_data['name'] +u'Yesterday' >>> f = SongForm({'name': 'Yesterday', 'composers': ['J', 'P']}, auto_id=False) >>> f.errors {} ->>> f.cleaned_data -{'composers': [u'J', u'P'], 'name': u'Yesterday'} +>>> f.cleaned_data['composers'] +[u'J', u'P'] +>>> f.cleaned_data['name'] +u'Yesterday' Validation errors are HTML-escaped when output as HTML. >>> class EscapingForm(Form): @@ -598,16 +621,24 @@ including the current field (e.g., the field XXX if you're in clean_XXX()). >>> f.errors {} >>> f = UserRegistration({}, auto_id=False) ->>> f.errors -{'username': [u'This field is required.'], 'password1': [u'This field is required.'], 'password2': [u'This field is required.']} +>>> f.errors['username'] +[u'This field is required.'] +>>> f.errors['password1'] +[u'This field is required.'] +>>> f.errors['password2'] +[u'This field is required.'] >>> f = UserRegistration({'username': 'adrian', 'password1': 'foo', 'password2': 'bar'}, auto_id=False) ->>> f.errors -{'password2': [u'Please make sure your passwords match.']} +>>> f.errors['password2'] +[u'Please make sure your passwords match.'] >>> f = UserRegistration({'username': 'adrian', 'password1': 'foo', 'password2': 'foo'}, auto_id=False) >>> f.errors {} ->>> f.cleaned_data -{'username': u'adrian', 'password1': u'foo', 'password2': u'foo'} +>>> f.cleaned_data['username'] +u'adrian' +>>> f.cleaned_data['password1'] +u'foo' +>>> f.cleaned_data['password2'] +u'foo' Another way of doing multiple-field validation is by implementing the Form's clean() method. If you do this, any ValidationError raised by that @@ -632,11 +663,15 @@ Form.clean() is required to return a dictionary of all clean data. <tr><th>Username:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="text" name="username" maxlength="10" /></td></tr> <tr><th>Password1:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="password" name="password1" /></td></tr> <tr><th>Password2:</th><td><ul class="errorlist"><li>This field is required.</li></ul><input type="password" name="password2" /></td></tr> ->>> f.errors -{'username': [u'This field is required.'], 'password1': [u'This field is required.'], 'password2': [u'This field is required.']} +>>> f.errors['username'] +[u'This field is required.'] +>>> f.errors['password1'] +[u'This field is required.'] +>>> f.errors['password2'] +[u'This field is required.'] >>> f = UserRegistration({'username': 'adrian', 'password1': 'foo', 'password2': 'bar'}, auto_id=False) ->>> f.errors -{'__all__': [u'Please make sure your passwords match.']} +>>> f.errors['__all__'] +[u'Please make sure your passwords match.'] >>> print f.as_table() <tr><td colspan="2"><ul class="errorlist"><li>Please make sure your passwords match.</li></ul></td></tr> <tr><th>Username:</th><td><input type="text" name="username" value="adrian" maxlength="10" /></td></tr> @@ -650,8 +685,12 @@ Form.clean() is required to return a dictionary of all clean data. >>> f = UserRegistration({'username': 'adrian', 'password1': 'foo', 'password2': 'foo'}, auto_id=False) >>> f.errors {} ->>> f.cleaned_data -{'username': u'adrian', 'password1': u'foo', 'password2': u'foo'} +>>> f.cleaned_data['username'] +u'adrian' +>>> f.cleaned_data['password1'] +u'foo' +>>> f.cleaned_data['password2'] +u'foo' # Dynamic construction ######################################################## @@ -1024,8 +1063,8 @@ An 'initial' value is *not* used as a fallback if data is not provided. In this example, we don't provide a value for 'username', and the form raises a validation error rather than using the initial value for 'username'. >>> p = UserRegistration({'password': 'secret'}) ->>> p.errors -{'username': [u'This field is required.']} +>>> p.errors['username'] +[u'This field is required.'] >>> p.is_valid() False @@ -1069,8 +1108,8 @@ A dynamic 'initial' value is *not* used as a fallback if data is not provided. In this example, we don't provide a value for 'username', and the form raises a validation error rather than using the initial value for 'username'. >>> p = UserRegistration({'password': 'secret'}, initial={'username': 'django'}) ->>> p.errors -{'username': [u'This field is required.']} +>>> p.errors['username'] +[u'This field is required.'] >>> p.is_valid() False @@ -1123,8 +1162,8 @@ A callable 'initial' value is *not* used as a fallback if data is not provided. In this example, we don't provide a value for 'username', and the form raises a validation error rather than using the initial value for 'username'. >>> p = UserRegistration({'password': 'secret'}, initial={'username': initial_django}) ->>> p.errors -{'username': [u'This field is required.']} +>>> p.errors['username'] +[u'This field is required.'] >>> p.is_valid() False @@ -1258,8 +1297,12 @@ actual field name. {} >>> p.is_valid() True ->>> p.cleaned_data -{'first_name': u'John', 'last_name': u'Lennon', 'birthday': datetime.date(1940, 10, 9)} +>>> p.cleaned_data['first_name'] +u'John' +>>> p.cleaned_data['last_name'] +u'Lennon' +>>> p.cleaned_data['birthday'] +datetime.date(1940, 10, 9) Let's try submitting some bad data to make sure form.errors and field.errors work as expected. @@ -1269,8 +1312,12 @@ work as expected. ... 'person1-birthday': u'' ... } >>> p = Person(data, prefix='person1') ->>> p.errors -{'first_name': [u'This field is required.'], 'last_name': [u'This field is required.'], 'birthday': [u'This field is required.']} +>>> p.errors['first_name'] +[u'This field is required.'] +>>> p.errors['last_name'] +[u'This field is required.'] +>>> p.errors['birthday'] +[u'This field is required.'] >>> p['first_name'].errors [u'This field is required.'] >>> p['person1-first_name'].errors @@ -1286,8 +1333,12 @@ the form doesn't "see" the fields. ... 'birthday': u'1940-10-9' ... } >>> p = Person(data, prefix='person1') ->>> p.errors -{'first_name': [u'This field is required.'], 'last_name': [u'This field is required.'], 'birthday': [u'This field is required.']} +>>> p.errors['first_name'] +[u'This field is required.'] +>>> p.errors['last_name'] +[u'This field is required.'] +>>> p.errors['birthday'] +[u'This field is required.'] With prefixes, a single data dictionary can hold data for multiple instances of the same form. @@ -1302,13 +1353,21 @@ of the same form. >>> p1 = Person(data, prefix='person1') >>> p1.is_valid() True ->>> p1.cleaned_data -{'first_name': u'John', 'last_name': u'Lennon', 'birthday': datetime.date(1940, 10, 9)} +>>> p1.cleaned_data['first_name'] +u'John' +>>> p1.cleaned_data['last_name'] +u'Lennon' +>>> p1.cleaned_data['birthday'] +datetime.date(1940, 10, 9) >>> p2 = Person(data, prefix='person2') >>> p2.is_valid() True ->>> p2.cleaned_data -{'first_name': u'Jim', 'last_name': u'Morrison', 'birthday': datetime.date(1943, 12, 8)} +>>> p2.cleaned_data['first_name'] +u'Jim' +>>> p2.cleaned_data['last_name'] +u'Morrison' +>>> p2.cleaned_data['birthday'] +datetime.date(1943, 12, 8) By default, forms append a hyphen between the prefix and the field name, but a form can alter that behavior by implementing the add_prefix() method. This @@ -1333,8 +1392,12 @@ self.prefix. >>> p = Person(data, prefix='foo') >>> p.is_valid() True ->>> p.cleaned_data -{'first_name': u'John', 'last_name': u'Lennon', 'birthday': datetime.date(1940, 10, 9)} +>>> p.cleaned_data['first_name'] +u'John' +>>> p.cleaned_data['last_name'] +u'Lennon' +>>> p.cleaned_data['birthday'] +datetime.date(1940, 10, 9) # Forms with NullBooleanFields ################################################ diff --git a/tests/regressiontests/i18n/misc.py b/tests/regressiontests/i18n/misc.py index 6ed8afaee3..f8f35ad4e4 100644 --- a/tests/regressiontests/i18n/misc.py +++ b/tests/regressiontests/i18n/misc.py @@ -87,11 +87,12 @@ source tree. 'es-ar' """ -# Python 2.3 returns slightly different results for completely bogus locales, -# so we omit this test for that anything below 2.4. It's relatively harmless in -# any cases (GIGO). This also means this won't be executed on Jython currently, -# but life's like that sometimes. -if sys.version_info >= (2, 4): +# Python 2.3 and 2.4 return slightly different results for completely bogus +# locales, so we omit this test for that anything below 2.4. It's relatively +# harmless in any cases (GIGO). This also means this won't be executed on +# Jython currently, but life's like that sometimes. (On those platforms, +# passing in a truly bogus locale will get you the default locale back.) +if sys.version_info >= (2, 5): tests += """ This test assumes there won't be a Django translation to a US variation of the Spanish language, a safe assumption. When the user sets it diff --git a/tests/regressiontests/model_fields/models.py b/tests/regressiontests/model_fields/models.py index e69de29bb2..7e07227961 100644 --- a/tests/regressiontests/model_fields/models.py +++ b/tests/regressiontests/model_fields/models.py @@ -0,0 +1,24 @@ + +from django.db import models + +class Foo(models.Model): + a = models.CharField(max_length=10) + +def get_foo(): + return Foo.objects.get(id=1) + +class Bar(models.Model): + b = models.CharField(max_length=10) + a = models.ForeignKey(Foo, default=get_foo) + +__test__ = {'API_TESTS':""" +# Create a couple of Places. +>>> f = Foo.objects.create(a='abc') +>>> f.id +1 +>>> b = Bar(b = "bcd") +>>> b.a +<Foo: Foo object> +>>> b.save() + +"""} diff --git a/tests/regressiontests/requests/tests.py b/tests/regressiontests/requests/tests.py index f32ef14ae9..aaaef1d8b0 100644 --- a/tests/regressiontests/requests/tests.py +++ b/tests/regressiontests/requests/tests.py @@ -31,4 +31,8 @@ GET:{}, POST:{}, COOKIES:{}, META:{}> + +>>> from django.http import parse_cookie +>>> parse_cookie('invalid:key=true') +{} """ diff --git a/tests/regressiontests/syndication/__init__.py b/tests/regressiontests/syndication/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/regressiontests/syndication/models.py b/tests/regressiontests/syndication/models.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/regressiontests/syndication/tests.py b/tests/regressiontests/syndication/tests.py new file mode 100644 index 0000000000..6a9dd643d7 --- /dev/null +++ b/tests/regressiontests/syndication/tests.py @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- + +from django.test import TestCase +from django.test.client import Client + +class SyndicationFeedTest(TestCase): + def test_complex_base_url(self): + """ + Tests that that the base url for a complex feed doesn't raise a 500 + exception. + """ + c = Client() + response = c.get('/syndication/feeds/complex/') + self.assertEquals(response.status_code, 404) diff --git a/tests/regressiontests/syndication/urls.py b/tests/regressiontests/syndication/urls.py new file mode 100644 index 0000000000..24644ffd53 --- /dev/null +++ b/tests/regressiontests/syndication/urls.py @@ -0,0 +1,18 @@ +from django.conf.urls.defaults import patterns +from django.core.exceptions import ObjectDoesNotExist +from django.contrib.syndication import feeds + + +class ComplexFeed(feeds.Feed): + def get_object(self, bits): + if len(bits) != 1: + raise ObjectDoesNotExist + return None + + +urlpatterns = patterns('', + (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed', { + 'feed_dict': dict( + complex = ComplexFeed, + )}), +) diff --git a/tests/regressiontests/test_client_regress/models.py b/tests/regressiontests/test_client_regress/models.py index b5d9ae63b9..305ccc9aa3 100644 --- a/tests/regressiontests/test_client_regress/models.py +++ b/tests/regressiontests/test_client_regress/models.py @@ -3,7 +3,7 @@ Regression tests for the Test Client, especially the customized assertions. """ from django.test import Client, TestCase -from django.core import mail +from django.core.urlresolvers import reverse import os class AssertContainsTests(TestCase): @@ -261,3 +261,31 @@ class LoginTests(TestCase): # Check that assertRedirects uses the original client, not the # default client. self.assertRedirects(response, "http://testserver/test_client_regress/get_view/") + + +class URLEscapingTests(TestCase): + def test_simple_argument_get(self): + "Get a view that has a simple string argument" + response = self.client.get(reverse('arg_view', args=['Slartibartfast'])) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.content, 'Howdy, Slartibartfast') + + def test_argument_with_space_get(self): + "Get a view that has a string argument that requires escaping" + response = self.client.get(reverse('arg_view', args=['Arthur Dent'])) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.content, 'Hi, Arthur') + + def test_simple_argument_post(self): + "Post for a view that has a simple string argument" + response = self.client.post(reverse('arg_view', args=['Slartibartfast'])) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.content, 'Howdy, Slartibartfast') + + def test_argument_with_space_post(self): + "Post for a view that has a string argument that requires escaping" + response = self.client.post(reverse('arg_view', args=['Arthur Dent'])) + self.assertEqual(response.status_code, 200) + self.assertEqual(response.content, 'Hi, Arthur') + + diff --git a/tests/regressiontests/test_client_regress/urls.py b/tests/regressiontests/test_client_regress/urls.py index e771707f61..d3304caef0 100644 --- a/tests/regressiontests/test_client_regress/urls.py +++ b/tests/regressiontests/test_client_regress/urls.py @@ -5,5 +5,6 @@ urlpatterns = patterns('', (r'^no_template_view/$', views.no_template_view), (r'^file_upload/$', views.file_upload_view), (r'^get_view/$', views.get_view), + url(r'^arg_view/(?P<name>.+)/$', views.view_with_argument, name='arg_view'), (r'^login_protected_redirect_view/$', views.login_protected_redirect_view) ) diff --git a/tests/regressiontests/test_client_regress/views.py b/tests/regressiontests/test_client_regress/views.py index 75efd212e1..f44757dc10 100644 --- a/tests/regressiontests/test_client_regress/views.py +++ b/tests/regressiontests/test_client_regress/views.py @@ -1,7 +1,5 @@ from django.contrib.auth.decorators import login_required -from django.core.mail import EmailMessage, SMTPConnection from django.http import HttpResponse, HttpResponseRedirect, HttpResponseServerError -from django.shortcuts import render_to_response def no_template_view(request): "A simple view that expects a GET request, and returns a rendered template" @@ -20,10 +18,22 @@ def file_upload_view(request): return HttpResponseServerError() def get_view(request): - "A simple login protected view" + "A simple login protected view" return HttpResponse("Hello world") get_view = login_required(get_view) +def view_with_argument(request, name): + """A view that takes a string argument + + The purpose of this view is to check that if a space is provided in + the argument, the test framework unescapes the %20 before passing + the value to the view. + """ + if name == 'Arthur Dent': + return HttpResponse('Hi, Arthur') + else: + return HttpResponse('Howdy, %s' % name) + def login_protected_redirect_view(request): "A view that redirects all requests to the GET view" return HttpResponseRedirect('/test_client_regress/get_view/') diff --git a/tests/regressiontests/utils/decorators.py b/tests/regressiontests/utils/decorators.py new file mode 100644 index 0000000000..c6ae243c98 --- /dev/null +++ b/tests/regressiontests/utils/decorators.py @@ -0,0 +1,13 @@ +from django.test import TestCase + +class DecoratorFromMiddlewareTests(TestCase): + """ + Tests for view decorators created using + ``django.utils.decorators.decorator_from_middleware``. + """ + + def test_process_view_middleware(self): + """ + Test a middleware that implements process_view. + """ + self.client.get('/utils/xview/') diff --git a/tests/regressiontests/utils/tests.py b/tests/regressiontests/utils/tests.py index abcd7212d8..6fc645505b 100644 --- a/tests/regressiontests/utils/tests.py +++ b/tests/regressiontests/utils/tests.py @@ -8,6 +8,7 @@ from django.utils import html, checksums import timesince import datastructures +from decorators import DecoratorFromMiddlewareTests # Extra tests __test__ = { diff --git a/tests/regressiontests/utils/urls.py b/tests/regressiontests/utils/urls.py new file mode 100644 index 0000000000..7b60d0884c --- /dev/null +++ b/tests/regressiontests/utils/urls.py @@ -0,0 +1,7 @@ +from django.conf.urls.defaults import * + +import views + +urlpatterns = patterns('', + (r'^xview/$', views.xview), +) diff --git a/tests/regressiontests/utils/views.py b/tests/regressiontests/utils/views.py new file mode 100644 index 0000000000..d22ae26641 --- /dev/null +++ b/tests/regressiontests/utils/views.py @@ -0,0 +1,10 @@ +from django.http import HttpResponse +from django.utils.decorators import decorator_from_middleware +from django.middleware.doc import XViewMiddleware + + +xview_dec = decorator_from_middleware(XViewMiddleware) + +def xview(request): + return HttpResponse() +xview = xview_dec(xview) diff --git a/tests/urls.py b/tests/urls.py index 174e06969b..dbdf9a8064 100644 --- a/tests/urls.py +++ b/tests/urls.py @@ -11,10 +11,15 @@ urlpatterns = patterns('', # test urlconf for {% url %} template tag (r'^url_tag/', include('regressiontests.templates.urls')), - + # django built-in views (r'^views/', include('regressiontests.views.urls')), # test urlconf for middleware tests (r'^middleware/', include('regressiontests.middleware.urls')), + + (r'^utils/', include('regressiontests.utils.urls')), + + # test urlconf for syndication tests + (r'^syndication/', include('regressiontests.syndication.urls')), )