diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo index a5c3a73407..36826de942 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 19effac18a..66da6215eb 100644 --- a/django/conf/locale/bn/LC_MESSAGES/django.po +++ b/django/conf/locale/bn/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django CVS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: 2005-11-12 20:05+0530\n" "Last-Translator: Baishampayan Ghose \n" "Language-Team: Ankur Bangla \n" @@ -43,11 +43,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -#, fuzzy -msgid "count" -msgstr "অভ্যন্তরস্থ বস্তু" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1070,6 +1065,46 @@ msgstr "" msgid "Simplified Chinese" msgstr "সরলীকৃত চীনা" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +#, fuzzy +msgid "This field is required." +msgstr "এই ক্ষেত্রেটি অবৈধ।" + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +#, fuzzy +msgid "Line breaks are not allowed here." +msgstr "ছোটহাতের অক্ষর এখানে ঢোকাতে পারবেন না।" + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +#, fuzzy +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "একটি গোটা সংখ্যা ঢোকান।" + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "একটি গোটা সংখ্যা ঢোকান।" + +#: core/formfields.py:666 +#, fuzzy +msgid "Enter a whole number between 0 and 32,767." +msgstr "একটি গোটা সংখ্যা ঢোকান।" + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "এই মানটি শুধু মাত্র অক্ষর, অংক, এবং আন্ডারস্কোর (_) হতে পারবে।" @@ -1331,6 +1366,16 @@ msgstr "" "\"%(attr)s\"বৈশিষ্ট্যয় লাইন %(line)s একটি অবৈধ মান আছে । (\"%(start)s\"এর সঙ্গে " "লাইন আরম্ভ।)" +#: core/meta/fields.py:46 +#, fuzzy, python-format +msgid "Please enter a valid %s." +msgstr "দয়া করে একটি বৈধ IP ঠিকানা ঢোকান।" + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr "একাধিক আই.ডি.কমার দ্বারা আলাদা করুন।" @@ -1341,3 +1386,20 @@ msgid "" msgstr "" "একের চেয়ে বেশি নির্বাচন করতে \"Control\" অথবা ম্যাক-এ \"Command\" চেপে ধরে " "রাখুন।" + +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "একটি বৈধ ই-মেল ঠিকানা ঢোকান।" + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" + +#, fuzzy +#~ msgid "count" +#~ msgstr "অভ্যন্তরস্থ বস্তু" diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index 096794def1..2aed232826 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 47a1d57ff6..819061b690 100644 --- a/django/conf/locale/cs/LC_MESSAGES/django.po +++ b/django/conf/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Czech translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: 2005-10-31 19:42+0100\n" "Last-Translator: Radek Svarz \n" "Language-Team: Czech\n" @@ -46,11 +46,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -#, fuzzy -msgid "count" -msgstr "obsah" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1077,6 +1072,46 @@ msgstr "" msgid "Simplified Chinese" msgstr "Jednoduchá čínština" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +#, fuzzy +msgid "This field is required." +msgstr "Toto pole není platné." + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +#, fuzzy +msgid "Line breaks are not allowed here." +msgstr "Malá písmena zde nejsou povolená." + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +#, fuzzy +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Vložte celé číslo." + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "Vložte celé číslo." + +#: core/formfields.py:666 +#, fuzzy +msgid "Enter a whole number between 0 and 32,767." +msgstr "Vložte celé číslo." + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "Tato hodnota musí obsahovat pouze znaky, čísla nebo podtržítka." @@ -1347,6 +1382,16 @@ msgstr "" "Atribut \"%(attr)s\" na řádce %(line)s má neplatnou hodnotu. (Řádka začína s " "\"%(start)s\".)" +#: core/meta/fields.py:46 +#, fuzzy, python-format +msgid "Please enter a valid %s." +msgstr "Prosíme, zadejte platnou IP adresu." + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr "Oddělte více identifikátorů čárkami." @@ -1357,3 +1402,21 @@ msgid "" msgstr "" "Podržte \"Control\", nebo \"Command\" na Macu pro vybrání více jak jedné " "položky." + +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "Vložte platnou e-mailovou adresu." + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" +msgstr[2] "" + +#, fuzzy +#~ msgid "count" +#~ msgstr "obsah" diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo index 2955ee79bd..72d134632e 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 73fe848c42..1526622bbb 100644 --- a/django/conf/locale/cy/LC_MESSAGES/django.po +++ b/django/conf/locale/cy/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:22+0100\n" "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n" "Last-Translator: Jason Davies \n" "Language-Team: Cymraeg \n" @@ -43,11 +43,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -#, fuzzy -msgid "count" -msgstr "cynnwys" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1073,6 +1068,46 @@ msgstr "" msgid "Simplified Chinese" msgstr "Tsieinëeg Symledig" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +#, fuzzy +msgid "This field is required." +msgstr "Mae'r faes yma yn annilydd." + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +#, fuzzy +msgid "Line breaks are not allowed here." +msgstr "Ni chaniateir lythrennau bach yma." + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +#, fuzzy +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Rhowch rhif cyfan." + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "Rhowch rhif cyfan." + +#: core/formfields.py:666 +#, fuzzy +msgid "Enter a whole number between 0 and 32,767." +msgstr "Rhowch rhif cyfan." + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "Rhaid i'r werth yma cynnwys lythrennau, rhifau ac tanlinellau yn unig." @@ -1340,6 +1375,16 @@ msgstr "" "Mae gan y priodoledd \"%(attr)s\" ar lein %(line)s gwerth annilydd. (Linell " "yn ddechrau â \"%(start)s\".)" +#: core/meta/fields.py:46 +#, fuzzy, python-format +msgid "Please enter a valid %s." +msgstr "Rhowch cyfeiriad IP dilys, os gwelwch yn dda." + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr " Gwahanwch mwy nag un ID gyda atalnodau." @@ -1349,3 +1394,20 @@ msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Gafaelwch lawr \"Control\", neu \"Command\" ar Fac, i ddewis mwy nag un." + +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "Rhowch cyfeiriad e-bost ddilys." + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" + +#, fuzzy +#~ msgid "count" +#~ msgstr "cynnwys" diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index 344410ca3c..19a3206ac2 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 f5b02c70f2..6e802ff0ca 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: 2005-10-08 00:03+0200\n" "Last-Translator: Georg Bauer \n" "MIME-Version: 1.0\n" @@ -30,7 +30,8 @@ msgstr "Keine Abstimmung bei Dir selber" msgid "" "This rating is required because you've entered at least one other rating." msgstr "" -"Die Abstimmung ist zwangsweise, weil Du an mindestens einer anderen Abstimmung teilnimmst." +"Die Abstimmung ist zwangsweise, weil Du an mindestens einer anderen " +"Abstimmung teilnimmst." #: contrib/comments/views/comments.py:108 #, python-format @@ -45,10 +46,6 @@ msgstr "" "\n" "%(text)s" -#: contrib/comments/views/comments.py:109 -msgid "count" -msgstr "Anzahl" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -73,7 +70,8 @@ msgstr "Eines oder mehrere der erforderlichen Felder fehlt" #: contrib/comments/views/comments.py:192 #: contrib/comments/views/comments.py:281 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:202 #: contrib/comments/views/comments.py:287 @@ -81,12 +79,14 @@ 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 ungltig." +"Das Kommentarformular hatte einen falschen 'target' Parameter -- die Objekt-" +"ID ist ungltig." #: contrib/comments/views/comments.py:252 #: contrib/comments/views/comments.py:316 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/admin/models/admin.py:6 msgid "action time" @@ -1087,6 +1087,42 @@ msgstr "Schwedisch" msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +msgid "This field is required." +msgstr "Dieses Feld ist zwingend." + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "Bitte sicherstellen, das der Text weniger als %s Zeichen hat." + +#: core/formfields.py:333 +msgid "Line breaks are not allowed here." +msgstr "Zeilenumbrche sind hier nicht erlaubt." + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" +"Bitte eine gltige Auswahl treffen; '%(data)s' ist nicht in %(choices)s." + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "Die ausgewhlte Datei ist leer." + +#: core/formfields.py:648 +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Bitte eine ganze Zahl zwischen -32.768 und 32.767 eingeben." + +#: core/formfields.py:657 +msgid "Enter a positive number." +msgstr "Bitte eine ganze, positive Zahl eingeben." + +#: core/formfields.py:666 +msgid "Enter a whole number between 0 and 32,767." +msgstr "Bitte eine ganze Zahl zwischen 0 und 32.767 eingeben." + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "Dieser Wert darf nur Buchstaben, Ziffern und Unterstriche enthalten." @@ -1360,6 +1396,16 @@ msgstr "" "Das Attribut %(attr)s in Zeile %(line)s hat einen ungltigen Wert. Die Zeile " "beginnt mit \"%(start)s\"." +#: core/meta/fields.py:46 +#, python-format +msgid "Please enter a valid %s." +msgstr "Bitte ein gltiges '%s' eingeben." + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "Ein '%(optname)s' mit diesem '%(fieldname)s' existiert bereits." + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr "Mehrere IDs knnen mit Komma getrennt werden." @@ -1371,5 +1417,16 @@ msgstr "" " Um mehr als eine Selektion zu treffen, \"Strg\", oder auf dem Mac \"Command" "\", beim Klicken gedrckt halten." -#~ msgid "

By %s:

    \n" -#~ msgstr "

    Nach %s:

      \n" +#: core/meta/fields.py:495 +msgid "Enter a valid filename." +msgstr "Bitte einen gltigen Dateinamen eingeben" + +#: core/meta/fields.py:764 +#, 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 gltige IDs fr %(self)s eingeben. Der Wert %(value)r ist ungltig." +msgstr[1] "" +"Bitte gltige IDs fr %(self)s eingeben. Die Werte %(value)r sind ungltig." diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo index 95b156d9a1..cc70f357c7 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 efca886fd1..c58daf6a81 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:35+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -42,10 +42,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -msgid "count" -msgstr "" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1039,6 +1035,41 @@ msgstr "" msgid "Simplified Chinese" msgstr "" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +msgid "This field is required." +msgstr "" + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +msgid "Line breaks are not allowed here." +msgstr "" + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "" + +#: core/formfields.py:657 +msgid "Enter a positive number." +msgstr "" + +#: core/formfields.py:666 +msgid "Enter a whole number between 0 and 32,767." +msgstr "" + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "" @@ -1284,6 +1315,16 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" +#: core/meta/fields.py:46 +#, python-format +msgid "Please enter a valid %s." +msgstr "" + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr "" @@ -1292,3 +1333,15 @@ msgstr "" msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" + +#: core/meta/fields.py:495 +msgid "Enter a valid filename." +msgstr "" + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index 2a42443334..f50290da5d 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 6a366fc5f4..860d0a0dcf 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: 2005-10-04 20:59GMT\n" "Last-Translator: Ricardo Javier Crdenes Medina \n" @@ -43,10 +43,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -msgid "count" -msgstr "" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1067,6 +1063,42 @@ msgstr "" msgid "Simplified Chinese" msgstr "" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +msgid "This field is required." +msgstr "" + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +msgid "Line breaks are not allowed here." +msgstr "" + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "" + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "Direccin de correo:" + +#: core/formfields.py:666 +msgid "Enter a whole number between 0 and 32,767." +msgstr "" + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "Este valor debe contener slo letras, nmeros y guin bajo." @@ -1314,6 +1346,16 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" +#: core/meta/fields.py:46 +#, python-format +msgid "Please enter a valid %s." +msgstr "" + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr "" @@ -1323,5 +1365,18 @@ msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "Direccin de correo:" + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" + #~ msgid "Server error (500)" #~ msgstr "Error del servidor (500)" diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo index 425072c09e..9eee7ef0c1 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 943f215bb4..79f375b42e 100644 --- a/django/conf/locale/fr/LC_MESSAGES/django.po +++ b/django/conf/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: 2005-10-18 12:27+0200\n" "Last-Translator: Laurent Rahuel \n" "Language-Team: franais \n" @@ -42,11 +42,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -#, fuzzy -msgid "count" -msgstr "contenu" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1083,6 +1078,46 @@ msgstr "" msgid "Simplified Chinese" msgstr "" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +#, fuzzy +msgid "This field is required." +msgstr "Ce champ est invalide." + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +#, fuzzy +msgid "Line breaks are not allowed here." +msgstr "Les lettres minuscules ne sont pas autorises ici." + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +#, fuzzy +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Entrez un nombre entier." + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "Entrez un nombre entier." + +#: core/formfields.py:666 +#, fuzzy +msgid "Enter a whole number between 0 and 32,767." +msgstr "Entrez un nombre entier." + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "" @@ -1357,6 +1392,16 @@ msgstr "" "La valeur de l'attribut \"%(attr)s\" de la ligne %(line)s n'est pas valide. " "(Ligne dbutant par \"%(start)s\".)" +#: core/meta/fields.py:46 +#, fuzzy, python-format +msgid "Please enter a valid %s." +msgstr "Entrez une adresse IP valide." + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr "Sparez les ID par des virgules." @@ -1368,6 +1413,23 @@ msgstr "" "Maintenez \"Control\", or \"Command\" sur un Mac, pour en slectionner plus " "d'une." +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "Entrez une adresse de courriel valide." + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" + +#, fuzzy +#~ msgid "count" +#~ msgstr "contenu" + #~ msgid "Traditional Chinese" #~ msgstr "Chinois traditionnel" diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo index 96afb28db9..b1c3a84a64 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 387626df74..e8b73cfaf1 100644 --- a/django/conf/locale/gl/LC_MESSAGES/django.po +++ b/django/conf/locale/gl/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:35+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: 2005-10-16 14:29+0100\n" "Last-Translator: Afonso Fernández Nogueira \n" "Language-Team: Galego\n" @@ -43,10 +43,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -msgid "count" -msgstr "" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1066,6 +1062,42 @@ msgstr "" msgid "Simplified Chinese" msgstr "" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +msgid "This field is required." +msgstr "" + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +msgid "Line breaks are not allowed here." +msgstr "" + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "" + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "Enderezo de correo electrónico:" + +#: core/formfields.py:666 +msgid "Enter a whole number between 0 and 32,767." +msgstr "" + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "Este valor soamente pode conter letras, números e guións baixos (_)." @@ -1313,6 +1345,16 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" +#: core/meta/fields.py:46 +#, python-format +msgid "Please enter a valid %s." +msgstr "" + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr "" @@ -1321,3 +1363,16 @@ msgstr "" msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" + +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "Enderezo de correo electrónico:" + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo index 3136c5a7c2..564f11ee22 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 2f3f20ea53..c8aebdb892 100644 --- a/django/conf/locale/is/LC_MESSAGES/django.po +++ b/django/conf/locale/is/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:22+0100\n" "PO-Revision-Date: 2005-11-13 18:08-0000\n" "Last-Translator: Dagur Páll Ammendrup \n" "Language-Team: \n" @@ -45,11 +45,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -#, fuzzy -msgid "count" -msgstr "innihald" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1075,6 +1070,46 @@ msgstr "" msgid "Simplified Chinese" msgstr "Einfölduð Kínverska " +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +#, fuzzy +msgid "This field is required." +msgstr "Þessi reitur er ótækur." + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +#, fuzzy +msgid "Line breaks are not allowed here." +msgstr "Lágstafir eru ekki leyfðir hér." + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +#, fuzzy +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Settu inn heila tölu." + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "Settu inn heila tölu." + +#: core/formfields.py:666 +#, fuzzy +msgid "Enter a whole number between 0 and 32,767." +msgstr "Settu inn heila tölu." + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "Þetta gildi má einungis innihalda stafi, tölur og undirstrik." @@ -1337,6 +1372,16 @@ msgstr "" "\"%(attr)s\" eigindið á línu %(line)s hefur ótækt gildi (línan hefst á \"%" "(start)s\")." +#: core/meta/fields.py:46 +#, fuzzy, python-format +msgid "Please enter a valid %s." +msgstr "Vinsamlegast skrifaðu gilda IP tölu." + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr "Notaðu kommur til að aðskilja kenni." @@ -1347,3 +1392,20 @@ msgid "" msgstr "" "Haltu niðri \"Control\", eða \"Command\" á Mac til þess að velja fleira en " "eitt." + +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "Skrifaðu gilt tölvupóstfang." + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" + +#, fuzzy +#~ msgid "count" +#~ msgstr "innihald" diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo index 539ae73f81..761af8ebb6 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 9de248ef25..1c722e5311 100644 --- a/django/conf/locale/it/LC_MESSAGES/django.po +++ b/django/conf/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -43,11 +43,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -#, fuzzy -msgid "count" -msgstr "contenuto" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1075,6 +1070,46 @@ msgstr "" msgid "Simplified Chinese" msgstr "" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +#, fuzzy +msgid "This field is required." +msgstr "Il campo non valido." + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +#, fuzzy +msgid "Line breaks are not allowed here." +msgstr "Non sono ammesse lettere minuscole." + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +#, fuzzy +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Inserire un numero." + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "Inserire un numero." + +#: core/formfields.py:666 +#, fuzzy +msgid "Enter a whole number between 0 and 32,767." +msgstr "Inserire un numero." + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "Sono ammesse solo lettere, numeri e sottolineature ('_')." @@ -1339,6 +1374,16 @@ msgstr "" "L'attributo \"%(attr)s\" alla linea %(line)s ha un valore non valido. (La " "linea comincia con \"%(start)s\".)" +#: core/meta/fields.py:46 +#, fuzzy, python-format +msgid "Please enter a valid %s." +msgstr "Inserire un indirizzo IP valido." + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr " Separa ID multipli con virgole." @@ -1348,6 +1393,23 @@ msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr " Premi \"Control\", o \"Command\" su Mac, per selezionarne pi di uno." +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "Inserire un indirizzo e-mail valido." + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" + +#, fuzzy +#~ msgid "count" +#~ msgstr "contenuto" + #~ msgid "Itialian" #~ msgstr "Italiano" diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo index e16c9bed1a..04bcc3561a 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 b87482f180..eabbf3fc55 100644 --- a/django/conf/locale/no/LC_MESSAGES/django.po +++ b/django/conf/locale/no/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Espen Grndhaug \n" "Language-Team: Norwegian\n" @@ -43,11 +43,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -#, fuzzy -msgid "count" -msgstr "innhold" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1075,6 +1070,46 @@ msgstr "" msgid "Simplified Chinese" msgstr "Simpel Kinesisk" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +#, fuzzy +msgid "This field is required." +msgstr "Dette feltet er feil." + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +#, fuzzy +msgid "Line breaks are not allowed here." +msgstr "Små bokstaver er ikke tillatt her." + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +#, fuzzy +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Skriv inn et helt nummer." + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "Skriv inn et helt nummer." + +#: core/formfields.py:666 +#, fuzzy +msgid "Enter a whole number between 0 and 32,767." +msgstr "Skriv inn et helt nummer." + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "Dette feltet må bare inneholde bokstaver, nummer og understreker." @@ -1343,6 +1378,16 @@ msgstr "" "\"%(attr)s\" tillegg på linje $(line)s har en ikke godkjent verdi. (Linja " "starter med \"%(start)s\".)" +#: core/meta/fields.py:46 +#, fuzzy, python-format +msgid "Please enter a valid %s." +msgstr "Vennligst skriv inn en godkjent IP adresse." + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr "Separer Id-ene med kommaer." @@ -1353,5 +1398,22 @@ msgid "" msgstr "" "Hold nede \"Control\", eller \"Command\" på en Mac, for å velge mere enn en." +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "Skriv inn en godkjent e-post adresse." + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" + +#, fuzzy +#~ msgid "count" +#~ msgstr "innhold" + #~ msgid "Traditional Chinese" #~ msgstr "Tradisjonell Kinesisk" diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo index 0a4f973221..f27bd18267 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 97f308eb55..cc79548fa8 100644 --- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po +++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: 2005-10-11 09:12GMT-3\n" "Last-Translator: João Paulo Farias \n" "Language-Team: Português do Brasil \n" @@ -43,11 +43,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -#, fuzzy -msgid "count" -msgstr "conteúdo" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1079,6 +1074,46 @@ msgstr "" msgid "Simplified Chinese" msgstr "" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +#, fuzzy +msgid "This field is required." +msgstr "Este campo é inválido." + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +#, fuzzy +msgid "Line breaks are not allowed here." +msgstr "Letras em minúsculo não são permitidas aqui." + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +#, fuzzy +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Informe um número inteiro." + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "Informe um número inteiro." + +#: core/formfields.py:666 +#, fuzzy +msgid "Enter a whole number between 0 and 32,767." +msgstr "Informe um número inteiro." + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "Deve conter apenas letras, números e sublinhados (_)." @@ -1343,6 +1378,16 @@ msgstr "" "O atributo \"%(attr)s\" na linha %(line)s tem um valor inválido. (Linha " "começa com \"%(start)s\".)" +#: core/meta/fields.py:46 +#, fuzzy, python-format +msgid "Please enter a valid %s." +msgstr "Informe um endereço IP válido." + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr " Separe IDs múltiplos com vírgulas." @@ -1353,3 +1398,20 @@ msgid "" msgstr "" " Mantenha pressionado \"Control\", ou \"Command\" num Mac para selecionar " "mais de uma opção." + +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "Informe um endereço de email válido." + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" + +#, fuzzy +#~ msgid "count" +#~ msgstr "conteúdo" diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo index cd99f24056..9d2e609984 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 1ca57b4cb3..31321772e4 100644 --- a/django/conf/locale/ro/LC_MESSAGES/django.po +++ b/django/conf/locale/ro/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Django \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: 2005-11-08 19:06+GMT+2\n" "Last-Translator: Tiberiu Micu \n" "Language-Team: Romanian \n" @@ -43,11 +43,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -#, fuzzy -msgid "count" -msgstr "conţinut" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1075,6 +1070,46 @@ msgstr "" msgid "Simplified Chinese" msgstr "Chineză simplificată" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +#, fuzzy +msgid "This field is required." +msgstr "Cîmpul este invalid." + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +#, fuzzy +msgid "Line breaks are not allowed here." +msgstr "Literele mici nu sînt permise aici." + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +#, fuzzy +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Introduceţi un număr întreg." + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "Introduceţi un număr întreg." + +#: core/formfields.py:666 +#, fuzzy +msgid "Enter a whole number between 0 and 32,767." +msgstr "Introduceţi un număr întreg." + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "" @@ -1343,6 +1378,16 @@ msgstr "" "Atributul \"%(attr)s\" din linia %(line)s are o valoare invalidă. ( Linia " "începe cu \"%(start)s\".)" +#: core/meta/fields.py:46 +#, fuzzy, python-format +msgid "Please enter a valid %s." +msgstr "Introduceţi vă rog o adresă IP validă." + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr "Separă ID-urile multiple cu virgulă." @@ -1353,3 +1398,20 @@ msgid "" msgstr "" " Ţine apăsat \"Control\", sau \"Command\" pe un Mac, pentru a selecta mai " "multe." + +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "Introduceţi o adresă de email validă." + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" + +#, fuzzy +#~ msgid "count" +#~ msgstr "conţinut" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo index 11c13027de..860aa45054 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 10d10cdee0..e3f8d8b73a 100644 --- a/django/conf/locale/ru/LC_MESSAGES/django.po +++ b/django/conf/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: 2005-10-05 00:00\n" "Last-Translator: Dmitry Sorokin \n" "Language-Team: LANGUAGE \n" @@ -41,10 +41,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -msgid "count" -msgstr "" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1064,6 +1060,42 @@ msgstr "" msgid "Simplified Chinese" msgstr "" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +msgid "This field is required." +msgstr "" + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +msgid "Line breaks are not allowed here." +msgstr "" + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "" + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "E-mail :" + +#: core/formfields.py:666 +msgid "Enter a whole number between 0 and 32,767." +msgstr "" + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr " , ." @@ -1311,6 +1343,16 @@ msgid "" "starts with \"%(start)s\".)" msgstr "" +#: core/meta/fields.py:46 +#, python-format +msgid "Please enter a valid %s." +msgstr "" + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr "" @@ -1320,5 +1362,18 @@ msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "E-mail :" + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" + #~ msgid "Server error (500)" #~ msgstr " (500)" diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo index 5ed2c230d3..153f0c1122 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 25c64d061a..6d60c22749 100644 --- a/django/conf/locale/sk/LC_MESSAGES/django.po +++ b/django/conf/locale/sk/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Vladimir Labath \n" "Language-Team: Slovak \n" @@ -43,11 +43,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -#, fuzzy -msgid "count" -msgstr "obsah" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1080,6 +1075,46 @@ msgstr "" msgid "Simplified Chinese" msgstr "Zjednodušená činština " +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +#, fuzzy +msgid "This field is required." +msgstr "Toto pole nie je platné." + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +#, fuzzy +msgid "Line breaks are not allowed here." +msgstr "Malé písmena tu nie sú povolené." + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +#, fuzzy +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Vložte celé číslo." + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "Vložte celé číslo." + +#: core/formfields.py:666 +#, fuzzy +msgid "Enter a whole number between 0 and 32,767." +msgstr "Vložte celé číslo." + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "Toto môže obsahovať len písmená, číslice a podčiarkovníky." @@ -1345,6 +1380,16 @@ msgstr "" "Atribút \"%(attr)s\" na riadku %(line)s má neplatnú hodnotu. (Riadok začína " "s \"%(start)s\".)" +#: core/meta/fields.py:46 +#, fuzzy, python-format +msgid "Please enter a valid %s." +msgstr "Prosím vložte platnú IP adresu." + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr "Identifikátory oddeľte čiarkami." @@ -1356,6 +1401,23 @@ msgstr "" " Podržte \"Control\", alebo \"Command\" na Mac_u, na výber viac ako jednej " "položky." +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "Vložte platnú e-mail adresu." + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" + +#, fuzzy +#~ msgid "count" +#~ msgstr "obsah" + # #-#-#-#-# django.po (PACKAGE VERSION) #-#-#-#-# # templates/blog/entries_detail.html:24 #~ msgid "Post a comment" diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo index 6932e25abd..377461bbf7 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 a49c7c18e0..565666cfc1 100644 --- a/django/conf/locale/sr/LC_MESSAGES/django.po +++ b/django/conf/locale/sr/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Django Serbian (latin) translation v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:36+0100\n" +"POT-Creation-Date: 2005-11-15 14:21+0100\n" "PO-Revision-Date: 2005-11-03 00:28+0100\n" "Last-Translator: Petar Marić \n" "Language-Team: Nesh & Petar \n" "Language-Team: LANGUAGE \n" @@ -43,11 +43,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -#, fuzzy -msgid "count" -msgstr "innehåll" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1076,6 +1071,46 @@ msgstr "" msgid "Simplified Chinese" msgstr "Förenklad kinesiska" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +#, fuzzy +msgid "This field is required." +msgstr "Det här fältet är ogiltigt." + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +#, fuzzy +msgid "Line breaks are not allowed here." +msgstr "Små bokstäver är inte tillåtna här." + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +#, fuzzy +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "Fyll i ett heltal." + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "Fyll i ett heltal." + +#: core/formfields.py:666 +#, fuzzy +msgid "Enter a whole number between 0 and 32,767." +msgstr "Fyll i ett heltal." + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "Det här värdet får bara innehålla bokstäver, tal och understräck." @@ -1342,6 +1377,16 @@ msgstr "" "Attributet \"%(attr)s\" på rad %(line)s har ett ogiltigt värde. (Raden " "börjar med \"%(start)s\".)" +#: core/meta/fields.py:46 +#, fuzzy, python-format +msgid "Please enter a valid %s." +msgstr "Var god fyll i ett giltigt IP-nummer." + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr " Separera flera ID:n med kommatecken." @@ -1351,3 +1396,20 @@ 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 mer än en." + +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "Fyll i en giltig e-postadress." + +#: core/meta/fields.py:764 +#, 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] "" +msgstr[1] "" + +#, fuzzy +#~ msgid "count" +#~ msgstr "innehåll" diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo index 8a46875e16..783f1eb1b4 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 c004fbb115..139f7319e6 100644 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po +++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: django v1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-15 13:35+0100\n" +"POT-Creation-Date: 2005-11-15 14:20+0100\n" "PO-Revision-Date: 2005-11-11 13:55+0800\n" "Last-Translator: limodou \n" "Language-Team: Simplified Chinese \n" @@ -46,11 +46,6 @@ msgid "" "%(text)s" msgstr "" -#: contrib/comments/views/comments.py:109 -#, fuzzy -msgid "count" -msgstr "内容" - #: contrib/comments/views/comments.py:112 #, python-format msgid "" @@ -1064,6 +1059,46 @@ msgstr "" msgid "Simplified Chinese" msgstr "简体中文" +#: core/formfields.py:59 core/meta/fields.py:287 core/meta/fields.py:475 +#: core/meta/fields.py:486 +#, fuzzy +msgid "This field is required." +msgstr "这个字段无效。" + +#: core/formfields.py:329 +#, python-format +msgid "Ensure your text is less than %s characters." +msgstr "" + +#: core/formfields.py:333 +#, fuzzy +msgid "Line breaks are not allowed here." +msgstr "这里不允许小写字母。" + +#: core/formfields.py:429 core/formfields.py:500 core/formfields.py:538 +#, python-format +msgid "Select a valid choice; '%(data)s' is not in %(choices)s." +msgstr "" + +#: core/formfields.py:594 +msgid "The submitted file is empty." +msgstr "" + +#: core/formfields.py:648 +#, fuzzy +msgid "Enter a whole number between -32,768 and 32,767." +msgstr "输入整数。" + +#: core/formfields.py:657 +#, fuzzy +msgid "Enter a positive number." +msgstr "输入整数。" + +#: core/formfields.py:666 +#, fuzzy +msgid "Enter a whole number between 0 and 32,767." +msgstr "输入整数。" + #: core/validators.py:59 msgid "This value must contain only letters, numbers and underscores." msgstr "此值只能包含字母、数字和下划线。" @@ -1314,6 +1349,16 @@ msgid "" msgstr "" "在行 %(line)s 的\"%(attr)s\"属性有一个无效的值。(行开始于 \"%(start)s\"。)" +#: core/meta/fields.py:46 +#, fuzzy, python-format +msgid "Please enter a valid %s." +msgstr "请输入一个有效的IP地址。" + +#: core/meta/fields.py:60 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "" + #: core/meta/fields.py:131 msgid " Separate multiple IDs with commas." msgstr " 用逗号分隔多个ID。" @@ -1322,3 +1367,19 @@ msgstr " 用逗号分隔多个ID。" msgid "" " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr " 按下 \"Control\",或者在Mac上按 \"Command\" 来选择一个或多个值。" + +#: core/meta/fields.py:495 +#, fuzzy +msgid "Enter a valid filename." +msgstr "输入一个有效的邮件地址。" + +#: core/meta/fields.py:764 +#, 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] "" + +#, fuzzy +#~ msgid "count" +#~ msgstr "内容" diff --git a/django/contrib/comments/views/comments.py b/django/contrib/comments/views/comments.py index 3eb4a31b71..537a7fe2f5 100644 --- a/django/contrib/comments/views/comments.py +++ b/django/contrib/comments/views/comments.py @@ -105,7 +105,7 @@ class PublicCommentManipulator(AuthenticationForm): # If the commentor has posted fewer than COMMENTS_FIRST_FEW comments, # send the comment to the managers. if self.user_cache.get_comments_comment_count() <= COMMENTS_FIRST_FEW: - message = _('This comment was posted by a user who has posted fewer than %(count)s comments:\n\n%(text)s' % \ + message = _('This comment was posted by a user who has posted fewer than %(count)s comments:\n\n%(text)s') % \ {'count': COMMENTS_FIRST_FEW, 'text': c.get_as_text()} mail_managers("Comment posted by rookie user", message) if COMMENTS_SKETCHY_USERS_GROUP and COMMENTS_SKETCHY_USERS_GROUP in [g.id for g in self.user_cache.get_group_list()]: diff --git a/django/core/formfields.py b/django/core/formfields.py index 6226ebfebc..f242ed3415 100644 --- a/django/core/formfields.py +++ b/django/core/formfields.py @@ -2,6 +2,7 @@ from django.core import validators from django.core.exceptions import PermissionDenied from django.utils.html import escape from django.conf.settings import DEFAULT_CHARSET +from django.utils.translation import gettext_lazy FORM_FIELD_ID_PREFIX = 'id_' @@ -55,7 +56,7 @@ class Manipulator: errors = {} for field in self.fields: if field.is_required and not new_data.get(field.field_name, False): - errors.setdefault(field.field_name, []).append('This field is required.') + errors.setdefault(field.field_name, []).append(gettext_lazy('This field is required.')) continue try: validator_list = field.validator_list @@ -89,7 +90,7 @@ class Manipulator: expected to deal with invalid input. """ for field in self.fields: - field.convert_post_data(new_data) + field.convert_post_data(new_data) class FormWrapper: """ @@ -110,7 +111,7 @@ class FormWrapper: for field in self.manipulator.fields: if field.field_name == key: data = field.extract_data(self.data) - return FormFieldWrapper(field, data, self.error_dict.get(field.field_name, [])) + return FormFieldWrapper(field, data, self.error_dict.get(field.field_name, [])) if self.edit_inline: self.fill_inline_collections() for inline_collection in self._inline_collections: @@ -279,7 +280,7 @@ class FormField: def get_member_name(self): if hasattr(self, 'member_name'): return self.member_name - else: + else: return self.field_name def extract_data(self, data_dict): @@ -309,7 +310,7 @@ class FormField: new_data.setlist(name, []) def get_id(self): - "Returns the HTML 'id' attribute for this form field." + "Returns the HTML 'id' attribute for this form field." return FORM_FIELD_ID_PREFIX + self.field_name #################### # GENERIC WIDGETS # @@ -325,11 +326,11 @@ class TextField(FormField): def isValidLength(self, data, form): if data and self.maxlength and len(data.decode(DEFAULT_CHARSET)) > self.maxlength: - raise validators.ValidationError, "Ensure your text is less than %s characters." % self.maxlength + raise validators.ValidationError, _("Ensure your text is less than %s characters.") % self.maxlength def hasNoNewlines(self, data, form): if data and '\n' in data: - raise validators.ValidationError, "Line breaks are not allowed here." + raise validators.ValidationError, _("Line breaks are not allowed here.") def render(self, data): if data is None: @@ -425,7 +426,7 @@ class SelectField(FormField): str_data = str(data) str_choices = [str(item[0]) for item in self.choices] if str_data not in str_choices: - raise validators.ValidationError, "Select a valid choice; '%s' is not in %s." % (str_data, str_choices) + raise validators.ValidationError, _("Select a valid choice; '%(data)s' is not in %(choices)s.") % {'data': str_data, 'choices': str_choices} class NullSelectField(SelectField): "This SelectField converts blank fields to None" @@ -496,7 +497,7 @@ class RadioSelectField(FormField): str_data = str(data) str_choices = [str(item[0]) for item in self.choices] if str_data not in str_choices: - raise validators.ValidationError, "Select a valid choice; '%s' is not in %s." % (str_data, str_choices) + raise validators.ValidationError, _("Select a valid choice; '%(data)s' is not in %(choices)s.") % {'data':str_data, 'choices':str_choices} class NullBooleanField(SelectField): "This SelectField provides 'Yes', 'No' and 'Unknown', mapping results to True, False or None" @@ -534,7 +535,7 @@ class SelectMultipleField(SelectField): str_choices = [str(item[0]) for item in self.choices] for val in map(str, field_data): if val not in str_choices: - raise validators.ValidationError, "Select a valid choice; '%s' is not in %s." % (val, str_choices) + raise validators.ValidationError, _("Select a valid choice; '%(data)s' is not in %(choices)s.") % {'data':val, 'choices':str_choices} def html2python(data): if data is None: @@ -590,7 +591,7 @@ class FileUploadField(FormField): def isNonEmptyFile(self, field_data, all_data): if not field_data['content']: - raise validators.CriticalValidationError, "The submitted file is empty." + raise validators.CriticalValidationError, _("The submitted file is empty.") def render(self, data): return '' % \ @@ -622,7 +623,7 @@ class IntegerField(TextField): def __init__(self, field_name, length=10, maxlength=None, is_required=False, validator_list=[], member_name=None): validator_list = [self.isInteger] + validator_list if member_name is not None: - self.member_name = member_name + self.member_name = member_name TextField.__init__(self, field_name, length, maxlength, is_required, validator_list) def isInteger(self, field_data, all_data): @@ -644,7 +645,7 @@ class SmallIntegerField(IntegerField): def isSmallInteger(self, field_data, all_data): if not -32768 <= int(field_data) <= 32767: - raise validators.CriticalValidationError, "Enter a whole number between -32,768 and 32,767." + raise validators.CriticalValidationError, _("Enter a whole number between -32,768 and 32,767.") class PositiveIntegerField(IntegerField): def __init__(self, field_name, length=10, maxlength=None, is_required=False, validator_list=[]): @@ -653,7 +654,7 @@ class PositiveIntegerField(IntegerField): def isPositive(self, field_data, all_data): if int(field_data) < 0: - raise validators.CriticalValidationError, "Enter a positive number." + raise validators.CriticalValidationError, _("Enter a positive number.") class PositiveSmallIntegerField(IntegerField): def __init__(self, field_name, length=5, maxlength=None, is_required=False, validator_list=[]): @@ -662,7 +663,7 @@ class PositiveSmallIntegerField(IntegerField): def isPositiveSmall(self, field_data, all_data): if not 0 <= int(field_data) <= 32767: - raise validators.CriticalValidationError, "Enter a whole number between 0 and 32,767." + raise validators.CriticalValidationError, _("Enter a whole number between 0 and 32,767.") class FloatField(TextField): def __init__(self, field_name, max_digits, decimal_places, is_required=False, validator_list=[]): diff --git a/django/core/meta/fields.py b/django/core/meta/fields.py index 7d8b81b0de..43a2acca05 100644 --- a/django/core/meta/fields.py +++ b/django/core/meta/fields.py @@ -3,7 +3,7 @@ from django.core import formfields, validators from django.core.exceptions import ObjectDoesNotExist from django.utils.functional import curry, lazy from django.utils.text import capfirst -from django.utils.translation import gettext_lazy +from django.utils.translation import gettext_lazy, ngettext import datetime, os # Random entropy string used by "default" param. @@ -43,7 +43,7 @@ def manipulator_valid_rel_key(f, self, field_data, all_data): try: mod.get_object(pk=field_data) except ObjectDoesNotExist: - raise validators.ValidationError, "Please enter a valid %s." % f.verbose_name + raise validators.ValidationError, _("Please enter a valid %s.") % f.verbose_name def manipulator_validator_unique(f, opts, self, field_data, all_data): "Validates that the value is unique for this field." @@ -57,7 +57,7 @@ def manipulator_validator_unique(f, opts, self, field_data, all_data): return if hasattr(self, 'original_object') and getattr(self.original_object, opts.pk.attname) == getattr(old_obj, opts.pk.attname): return - raise validators.ValidationError, "%s with this %s already exists." % (capfirst(opts.verbose_name), f.verbose_name) + raise validators.ValidationError, _("%(optname)s with this %(fieldname)s already exists.") % {'optname':capfirst(opts.verbose_name), 'fieldname':f.verbose_name} class BoundField(object): @@ -284,7 +284,7 @@ class Field(object): core_field_names.extend(f.get_manipulator_field_names(name_prefix)) # Now, if there are any, add the validator to this FormField. if core_field_names: - params['validator_list'].append(validators.RequiredIfOtherFieldsGiven(core_field_names, "This field is required.")) + params['validator_list'].append(validators.RequiredIfOtherFieldsGiven(core_field_names, gettext_lazy("This field is required."))) # BooleanFields (CheckboxFields) are a special case. They don't take # is_required or validator_list. @@ -472,7 +472,7 @@ class FileField(Field): self.always_test = True def __call__(self, field_data, all_data): if not all_data.get(self.other_file_field_name, False): - c = validators.RequiredIfOtherFieldsGiven(self.other_field_names, "This field is required.") + c = validators.RequiredIfOtherFieldsGiven(self.other_field_names, gettext_lazy("This field is required.")) c(field_data, all_data) # First, get the core fields, if any. core_field_names = [] @@ -483,7 +483,7 @@ class FileField(Field): if core_field_names: field_list[0].validator_list.append(RequiredFileField(core_field_names, field_list[1].field_name)) else: - v = validators.RequiredIfOtherFieldNotGiven(field_list[1].field_name, "This field is required.") + v = validators.RequiredIfOtherFieldNotGiven(field_list[1].field_name, gettext_lazy("This field is required.")) v.always_test = True field_list[0].validator_list.append(v) field_list[0].is_required = field_list[1].is_required = False @@ -492,7 +492,7 @@ class FileField(Field): def isWithinMediaRoot(field_data, all_data): f = os.path.abspath(os.path.join(settings.MEDIA_ROOT, field_data)) if not f.startswith(os.path.normpath(settings.MEDIA_ROOT)): - raise validators.ValidationError, "Enter a valid filename." + raise validators.ValidationError, _("Enter a valid filename.") field_list[1].validator_list.append(isWithinMediaRoot) return field_list @@ -761,10 +761,11 @@ class ManyToManyField(Field): objects = mod.get_in_bulk(pks) if len(objects) != len(pks): badkeys = [k for k in pks if k not in objects] - raise validators.ValidationError, "Please enter valid %s IDs. The value%s %r %s invalid." % \ - (self.verbose_name, len(badkeys) > 1 and 's' or '', - len(badkeys) == 1 and badkeys[0] or tuple(badkeys), - len(badkeys) == 1 and "is" or "are") + raise validators.ValidationError, ngettext("Please enter valid %(self)s IDs. The value %(value)r is invalid.", + "Please enter valid %(self)s IDs. The values %(value)r are invalid", len(badkeys)) % { + 'self': self.verbose_name, + 'value': len(badkeys) == 1 and badkeys[0] or tuple(badkeys), + } def flatten_data(self, follow, obj = None): new_data = {}