diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo index 923d02c8dc..6b7c4c38b5 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 0a7a471728..88fe7b42e7 100644 --- a/django/conf/locale/bn/LC_MESSAGES/django.po +++ b/django/conf/locale/bn/LC_MESSAGES/django.po @@ -8,13 +8,13 @@ msgid "" msgstr "" "Project-Id-Version: Django CVS\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-11-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: 2005-11-12 20:05+0530\n" "Last-Translator: Baishampayan Ghose \n" "Language-Team: Ankur Bangla \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" #: contrib/admin/models/admin.py:6 msgid "action time" @@ -391,6 +391,18 @@ msgstr "চ্যাপ্টা পাতা" msgid "flat pages" msgstr "চ্যাপ্টা পাতাগুলো" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "সোমবার" @@ -881,16 +893,16 @@ msgstr "দয়া করে একটি বৈধ দশমিক সংখ্ 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] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার অক্ষরের সংখ্যা %s থেকে কম হবে।" -msgstr [1] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার অক্ষরের সংখ্যা %s থেকে কম হবে।" +msgstr[0] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার অক্ষরের সংখ্যা %s থেকে কম হবে।" +msgstr[1] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার অক্ষরের সংখ্যা %s থেকে কম হবে।" #: core/validators.py:347 #, 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] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার দশমিক স্থান %s থেকে কম হবে।" -msgstr [1] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার দশমিক স্থান %s থেকে কম হবে।" +msgstr[0] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার দশমিক স্থান %s থেকে কম হবে।" +msgstr[1] "দয়া করে একটি বৈধ দশমিক সংখ্যা ঢোকান যার দশমিক স্থান %s থেকে কম হবে।" #: core/validators.py:357 #, python-format @@ -985,4 +997,3 @@ msgid "" msgstr "" "একের চেয়ে বেশি নির্বাচন করতে \"Control\" অথবা ম্যাক-এ \"Command\" চেপে ধরে " "রাখুন।" - diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo index 56c658906a..2a49d71e2b 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 5162c5b5a5..7cf5779d95 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: 2005-11-10 19:29+0100\n" "Last-Translator: Radek Svarz \n" "Language-Team: Czech\n" @@ -396,6 +396,18 @@ msgstr "statická stránka" msgid "flat pages" msgstr "statické stránky" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "Pondělí" diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo index 275f423c08..70ecc2fdb6 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 8b069f4465..184fe7d214 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n" "Last-Translator: Jason Davies \n" "Language-Team: Cymraeg \n" @@ -393,6 +393,18 @@ msgstr "tudalen fflat" msgid "flat pages" msgstr "tudalennau fflat" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "Dydd Llun" diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index fa53245ee7..318a9a269e 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 79008fa17b..8bfef4dc4b 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: 2005-11-06 13:54+0100\n" "Last-Translator: Lukas Kolbe \n" "Language-Team: \n" @@ -396,6 +396,18 @@ msgstr "Webseite" msgid "flat pages" msgstr "Webseiten" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "j. N Y" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "j. N Y, H:i" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "H:i" + #: utils/dates.py:6 msgid "Monday" msgstr "Montag" diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo index df3352f8ab..be55bb10ca 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 6e2f4c6866..c13bf6a970 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -370,6 +370,18 @@ msgstr "" msgid "flat pages" msgstr "" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "N j, Y" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "N j, Y, P" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "P" + #: utils/dates.py:6 msgid "Monday" msgstr "" diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index aa7a7ea813..b3bfb579e5 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 559f17c5a0..16ba503d39 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: 2005-10-04 20:59GMT\n" "Last-Translator: Ricardo Javier Crdenes Medina \n" @@ -389,6 +389,18 @@ msgstr "" msgid "flat pages" msgstr "" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "" diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo index 5c2d8efb2c..5b8a618c29 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 cee6a7b128..4bdced2af5 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: 2005-10-18 12:27+0200\n" "Last-Translator: Laurent Rahuel \n" "Language-Team: franais \n" @@ -400,6 +400,18 @@ msgstr "page msgid "flat pages" msgstr "pages plat" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "Lundi" diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo index 113793c594..b772851a3a 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 78b4ec31fc..7e91c23710 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: 2005-10-16 14:29+0100\n" "Last-Translator: Afonso Fernández Nogueira \n" "Language-Team: Galego\n" @@ -388,6 +388,18 @@ msgstr "" msgid "flat pages" msgstr "" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "" diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo index 2ba68dc697..3b8a31b26a 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 5d884e7bc1..652f308151 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -394,6 +394,18 @@ msgstr "pagina statica" msgid "flat pages" msgstr "pagine statiche" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "Luned" diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo index d69a98817d..3dbccf7282 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 09b4f25149..1ce4850cd3 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Espen Grndhaug \n" "Language-Team: Norwegian\n" @@ -395,6 +395,18 @@ msgstr "flatside" msgid "flat pages" msgstr "flatsider" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "Mondag" diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo index 98dc42d3e6..d90741a0d5 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 79f958e172..a5b95db0c5 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\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" @@ -393,6 +393,18 @@ msgstr "página plana" msgid "flat pages" msgstr "páginas planas" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "Segunda Feira" diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo index 38ed56780f..e9b58d551c 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 b3c57fac26..43a2279923 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-11 23:12+0100\n" +"POT-Creation-Date: 2005-11-12 23:04+0100\n" "PO-Revision-Date: 2005-11-08 19:06+GMT+2\n" "Last-Translator: Tiberiu Micu \n" "Language-Team: Romanian \n" @@ -395,6 +395,18 @@ msgstr "pagina plată" msgid "flat pages" msgstr "pagini plate" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "Luni" diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo index d0d7d97915..3b760d9fec 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 11020ee9bd..cf2adfd100 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: 2005-10-05 00:00\n" "Last-Translator: Dmitry Sorokin \n" "Language-Team: LANGUAGE \n" @@ -386,6 +386,18 @@ msgstr "" msgid "flat pages" msgstr "" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "" diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo index c19f78a391..66d28f818d 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 e7bb04f935..ac48ae8a86 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: 2005-11-10 23:22-0500\n" "Last-Translator: Vladimir Labath \n" "Language-Team: Slovak \n" @@ -76,8 +76,12 @@ msgid "DATE_WITH_TIME_FULL" msgstr "PLNY_DATUM_AJ_CAS" #: contrib/admin/templates/admin/object_history.html:36 -msgid "This object doesn't have a change history. It probably wasn't added via this admin site." -msgstr "Tento object nemá históriu zmien. Možno nebol pridaný prostredníctvom tohoto web admina" +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" +"Tento object nemá históriu zmien. Možno nebol pridaný prostredníctvom tohoto " +"web admina" #: contrib/admin/templates/admin/base_site.html:4 msgid "Django site admin" @@ -100,8 +104,12 @@ msgid "Server Error (500)" msgstr "Chyba servera (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 "Vznikla chyba. Prostredníctvom e-mailu bol o nej informovaný správca a chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť." +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 "" +"Vznikla chyba. Prostredníctvom e-mailu bol o nej informovaný správca a " +"chyba by mala byť o chviľu odstránená. Ďakujeme za vašu trpezlivosť." #: contrib/admin/templates/admin/404.html:4 #: contrib/admin/templates/admin/404.html:8 @@ -166,13 +174,23 @@ msgstr "Odhlásenie" #: contrib/admin/templates/admin/delete_confirmation.html:7 #, python-format -msgid "Deleting the %(object_name)s '%(object)s' would result in deleting related objects, but your account doesn't have permission to delete the following types of objects:" -msgstr "Vymazaním objektu %(object_name)s '%(object)s' môžete spôsobiť vymazanie súvisiacich objektov, ale váš účet nemá povolenie na mazanie nasledujúcich typov objektov:" +msgid "" +"Deleting the %(object_name)s '%(object)s' would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"Vymazaním objektu %(object_name)s '%(object)s' môžete spôsobiť vymazanie " +"súvisiacich objektov, ale váš účet nemá povolenie na mazanie nasledujúcich " +"typov objektov:" #: contrib/admin/templates/admin/delete_confirmation.html:14 #, python-format -msgid "Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of the following related items will be deleted:" -msgstr "Ste si istý, že chcete vymazať %(object_name)s \"%(object)s\"? Všetky nasledujúce objekty budú tiež vymazané :" +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(object)s\"? All of " +"the following related items will be deleted:" +msgstr "" +"Ste si istý, že chcete vymazať %(object_name)s \"%(object)s\"? Všetky " +"nasledujúce objekty budú tiež vymazané :" #: contrib/admin/templates/admin/delete_confirmation.html:18 msgid "Yes, I'm sure" @@ -201,8 +219,12 @@ msgid "Password reset" msgstr "Obnova hesla" #: 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 "Zabudli ste vaše heslo? Vložte nižšie vašu e-mail adresu, a nové heslo vám bude na ňu zaslané ." +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 "" +"Zabudli ste vaše heslo? Vložte nižšie vašu e-mail adresu, a nové heslo vám " +"bude na ňu zaslané ." #: contrib/admin/templates/registration/password_reset_form.html:16 msgid "E-mail address:" @@ -226,12 +248,20 @@ msgid "Password reset successful" msgstr "Heslo bolo úspešne obnovené" #: 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 "Poslali sme vám, nové heslo na vami uvedenú emailovú adresu.Mali by ste ho dostať čo najskôr." +msgid "" +"We've e-mailed a new password to the e-mail address you submitted. You " +"should be receiving it shortly." +msgstr "" +"Poslali sme vám, nové heslo na vami uvedenú emailovú adresu.Mali by ste ho " +"dostať čo najskôr." #: 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 "Kvôli bezpečnosti vložte prosím vaše staré heslo, a potom dvakrát vaše nové heslo, tým môžeme skontrolovať jeho správnosť." +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 "" +"Kvôli bezpečnosti vložte prosím vaše staré heslo, a potom dvakrát vaše nové " +"heslo, tým môžeme skontrolovať jeho správnosť." #: contrib/admin/templates/registration/password_change_form.html:17 msgid "Old password:" @@ -363,6 +393,18 @@ msgstr "plochá stránka" msgid "flat pages" msgstr "ploché stránky" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "Pondelok" @@ -511,41 +553,6 @@ msgstr "typ obsahu" msgid "content types" msgstr "typy obsahu" -#: models/core.py:68 - -#: models/core.py:69 - -#: models/core.py:70 - -#: models/core.py:71 - -#: models/core.py:73 - -#: models/core.py:74 - -#: models/core.py:87 - -#: models/core.py:88 - -#: models/core.py:89 - -#: models/core.py:90 - -#: models/core.py:91 - -#: models/core.py:92 - -#: models/core.py:93 - -#: models/core.py:94 - -#: models/core.py:94 - -#: models/core.py:98 - -#: models/core.py:99 - -#: models/core.py:117 #: models/core.py:67 msgid "session key" msgstr "kľúč sedenia" @@ -608,7 +615,8 @@ msgstr "heslo" #: models/auth.py:37 msgid "Use an MD5 hash -- not the raw password." -msgstr "Vložte takú hodnotu hesla , ako vám ju vráti MD5, nevkladajte ho priamo. " +msgstr "" +"Vložte takú hodnotu hesla , ako vám ju vráti MD5, nevkladajte ho priamo. " #: models/auth.py:38 msgid "staff status" @@ -635,8 +643,12 @@ msgid "date joined" msgstr "dátum registrácie" #: models/auth.py:44 -msgid "In addition to the permissions manually assigned, this user will also get all permissions granted to each group he/she is in." -msgstr "Okrem ručne vložených povolení, tento uživateľ dostane všetky povolenia skupin, v ktorých sa nachádza." +msgid "" +"In addition to the permissions manually assigned, this user will also get " +"all permissions granted to each group he/she is in." +msgstr "" +"Okrem ručne vložených povolení, tento uživateľ dostane všetky povolenia " +"skupin, v ktorých sa nachádza." #: models/auth.py:48 msgid "Users" @@ -783,8 +795,12 @@ msgid "Enter a valid e-mail address." msgstr "Vložte platnú e-mail adresu." #: core/validators.py:147 -msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image." -msgstr "Nahrajte platný obrázok. Súbor, ktorý ste nahrali buď nebol obrázok alebo je nahratý poškodený obrázok." +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "" +"Nahrajte platný obrázok. Súbor, ktorý ste nahrali buď nebol obrázok alebo je " +"nahratý poškodený obrázok." #: core/validators.py:154 #, python-format @@ -880,16 +896,20 @@ msgstr "Prosím vložte platné desiatkové číslo. " #: core/validators.py:344 #, 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] "Prosím vložte platné desiatkové číslo s najviac %s číslicou." msgstr[1] "Prosím vložte platné desiatkové číslo s najviac %s číslicami." #: core/validators.py:347 #, 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] "Prosím vložte platné desatinné číslo s najviac %s desatinným miestom." -msgstr[1] "Prosím vložte platné desatinné číslo s najviac %s desatinnými miestami." +msgid_plural "" +"Please enter a valid decimal number with at most %s decimal places." +msgstr[0] "" +"Prosím vložte platné desatinné číslo s najviac %s desatinným miestom." +msgstr[1] "" +"Prosím vložte platné desatinné číslo s najviac %s desatinnými miestami." #: core/validators.py:357 #, python-format @@ -916,167 +936,175 @@ msgstr "Nič som nemohol získať z %s." #: core/validators.py:424 #, python-format -msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." -msgstr " URL %(url)s vrátilo neplatnú hlavičku Content-Type '%(contenttype)s'." +msgid "" +"The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." +msgstr "" +" URL %(url)s vrátilo neplatnú hlavičku Content-Type '%(contenttype)s'." #: core/validators.py:457 #, python-format -msgid "Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with \"%(start)s\".)" -msgstr "Prosím zavrite nezavretý %(tag)s popisovač v riadku %(line)s. (Riadok začína s \"%(start)s\".)" +msgid "" +"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " +"\"%(start)s\".)" +msgstr "" +"Prosím zavrite nezavretý %(tag)s popisovač v riadku %(line)s. (Riadok " +"začína s \"%(start)s\".)" #: core/validators.py:461 #, python-format -msgid "Some text starting on line %(line)s is not allowed in that context. (Line starts with \"%(start)s\".)" -msgstr "Nejaký text začínajúci na riadku %(line)s nie je povolený v tomto kontexte. (Riadok začína s \"%(start)s\".)" +msgid "" +"Some text starting on line %(line)s is not allowed in that context. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Nejaký text začínajúci na riadku %(line)s nie je povolený v tomto kontexte. " +"(Riadok začína s \"%(start)s\".)" #: core/validators.py:466 #, python-format -msgid "\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%(start)s\".)" -msgstr "\"%(attr)s\" na riadku %(line)s je neplatný atribút. (Riadok začína s \"%(start)s\".)" +msgid "" +"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"\"%(attr)s\" na riadku %(line)s je neplatný atribút. (Riadok začína s \"%" +"(start)s\".)" #: core/validators.py:471 #, python-format -msgid "\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%(start)s\".)" -msgstr "\"<%(tag)s>\" na riadku %(line)s je neplatný popisovač. (Riadok začína s \"%(start)s\".)" +msgid "" +"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" +"(start)s\".)" +msgstr "" +"\"<%(tag)s>\" na riadku %(line)s je neplatný popisovač. (Riadok začína s \"%" +"(start)s\".)" #: core/validators.py:475 #, python-format -msgid "A tag on line %(line)s is missing one or more required attributes. (Line starts with \"%(start)s\".)" -msgstr "Popisovaču na riadku %(line)s chýba jeden alebo viac atribútov. (Riadok začína s \"%(start)s\".)" +msgid "" +"A tag on line %(line)s is missing one or more required attributes. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Popisovaču na riadku %(line)s chýba jeden alebo viac atribútov. (Riadok " +"začína s \"%(start)s\".)" #: core/validators.py:480 #, python-format -msgid "The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line starts with \"%(start)s\".)" -msgstr "Atribút \"%(attr)s\" na riadku %(line)s má neplatnú hodnotu. (Riadok začína s \"%(start)s\".)" +msgid "" +"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " +"starts with \"%(start)s\".)" +msgstr "" +"Atribút \"%(attr)s\" na riadku %(line)s má neplatnú hodnotu. (Riadok začína " +"s \"%(start)s\".)" #: core/meta/fields.py:111 msgid " Separate multiple IDs with commas." msgstr "Identifikátory oddeľte čiarkami." #: core/meta/fields.py:114 -msgid " Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr " Podržte \"Control\", alebo \"Command\" na Mac_u, na výber viac ako jednej položky." +msgid "" +" Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "" +" Podržte \"Control\", alebo \"Command\" na Mac_u, na výber viac ako jednej " +"položky." -#:templates/comments/posted.html :5 -msgid "Comment posted" -msgstr "Komentár bol poslaný" - -#:templates/comments/posted.html :9 -msgid "Comment posted successfully" -msgstr "Komentár bol úspešne odoslaný" - -#:templates/comments/posted.html :11 -msgid "Thanks for contributing." -msgstr "Ďakujeme za príspevok." - -#:templates/comments/posted.html :11 -msgid "View your comment" -msgstr "Pozri svôj príspevok" - -#templates/blog/entries_detail.html:24 -msgid "Post a comment" -msgstr "Pridaj komentár" +#~ msgid "Comment posted" +#~ msgstr "Komentár bol poslaný" -#templates/blog/entries_detail.html:15 -msgid "Comments" -msgstr "Komentáre" -#:templates/comments/free_preview.html :40 -msgid "Comment" -msgstr "Komentár" +#~ msgid "Comment posted successfully" +#~ msgstr "Komentár bol úspešne odoslaný" -#:templates/comments/free_preview.html :34 -msgid "Your name" -msgstr "Vaše meno" +#~ msgid "Thanks for contributing." +#~ msgstr "Ďakujeme za príspevok." -#:templates/comments/free_preview.html :5 -msgid "Preview revised comment" -msgstr "Prezretie upraveného komentára" +#~ msgid "View your comment" +#~ msgstr "Pozri svôj príspevok" -#:templates/comments/free_preview.html :25 -msgid "Post public comment" -msgstr "Zveréjniť komentár" # templates/blog/entries_detail.html:24 +#~ msgid "Post a comment" +#~ msgstr "Pridaj komentár" -#:templates/comments/free_preview.html :5 -msgid "Preview comment" -msgstr "Prezrieť komentár" # templates/blog/entries_detail.html:15 +#~ msgid "Comments" +#~ msgstr "Komentáre" -#:templates/comments/free_preview.html :13 -msgid "Preview your comment" -msgstr "Prezrite si svoj komentár" +#~ msgid "Comment" +#~ msgstr "Komentár" -#:templates/comments/free_preview.html :22 -msgid "Posted by" -msgstr "Poslané" +#~ msgid "Your name" +#~ msgstr "Vaše meno" -#:templates/comments/free_preview.html :27 -msgid "Or edit it again" -msgstr "Alebo ho vytvorte znova" +#~ msgid "Preview revised comment" +#~ msgstr "Prezretie upraveného komentára" -#:templates/comments/free_preview.html :18 -msgid "Please correct the following errors." -msgstr "Odstráňte nasledujúce chyby, prosím." +#~ msgid "Post public comment" +#~ msgstr "Zveréjniť komentár" -#:templates/404.html :10 -msgid "Looks like you followed a bad link. If you think it is our fault, please let us know" -msgstr "Pozrite si linku , kde vzikla chyba. Ak si myslíte, že je to naša chyba, dajte nám to vedieť, prosím" +# templates/blog/entries_detail.html:24 +#~ msgid "Preview comment" +#~ msgstr "Prezrieť komentár" -#:templates/404.html :12 -msgid "Here is a link to the homepage. You know, just in case" -msgstr "Tu je adresa úvodnej stránky. Ak by ste ju potrebovali" +# templates/blog/entries_detail.html:15 +#~ msgid "Preview your comment" +#~ msgstr "Prezrite si svoj komentár" -#:templates/comments/freecomments.html :9 -msgid "Recent comments" -msgstr "Posledný komentár" +#~ msgid "Posted by" +#~ msgstr "Poslané" -#:templates/comments/freecomments.html :9 -msgid "Previous" -msgstr "Predchádzajúci/a" +#~ msgid "Or edit it again" +#~ msgstr "Alebo ho vytvorte znova" -#:templates/comments/freecomments.html :10 -msgid "Page" -msgstr "Stránka" +#~ msgid "Please correct the following errors." +#~ msgstr "Odstráňte nasledujúce chyby, prosím." -#:templates/comments/freecomments.html :11 -msgid "Next" -msgstr "Ďalší/ia" +#~ msgid "" +#~ "Looks like you followed a bad link. If you think it is our fault, please " +#~ "let us know" +#~ msgstr "" +#~ "Pozrite si linku , kde vzikla chyba. Ak si myslíte, že je to naša chyba, " +#~ "dajte nám to vedieť, " +#~ "prosím" -#:templates/blog/entries_archive.html :9 -msgid "Latest entries" -msgstr "Posledné záznamy" +#~ msgid "" +#~ "Here is a link to the homepage. You know, just in case" +#~ msgstr "" +#~ "Tu je adresa úvodnej stránky. Ak by ste ju potrebovali" -#:templates/blog/entries_archive_day.html :9 -msgid "archive" -msgstr "archív" +#~ msgid "Recent comments" +#~ msgstr "Posledný komentár" -#:templates/500.html :4 -msgid "Page unavailable" -msgstr "Stránka je neprístupná" +#~ msgid "Previous" +#~ msgstr "Predchádzajúci/a" -#:templates/500.html :10 -msgid "We're sorry, but the requested page is currently unavailable" -msgstr "Ľutujeme ale požadovaná stránka je neprístupná" +#~ msgid "Page" +#~ msgstr "Stránka" -#:templates/500.html :12 -msgid "We're messing around with things internally, and the server had a bit of a hiccup" -msgstr "Máme problém na servri, ktorý sa snažíme odstrániť" +#~ msgid "Next" +#~ msgstr "Ďalší/ia" -#:templates/500.html :14 -msgid "Please try again later" -msgstr "Skúste znovu neskôr, prosím" +#~ msgid "Latest entries" +#~ msgstr "Posledné záznamy" -#:templates/miesta/miesta_archive.html :7 -msgid "Latest miesta" -msgstr "Posledné miesta" +#~ msgid "archive" +#~ msgstr "archív" -#:templates/miesta/miesta_detail.html :57 -msgid "on" -msgstr " " +#~ msgid "Page unavailable" +#~ msgstr "Stránka je neprístupná" -#:templates/miesta/miesta_detail.html :67 -msgid "at" -msgstr "o" +#~ msgid "We're sorry, but the requested page is currently unavailable" +#~ msgstr "Ľutujeme ale požadovaná stránka je neprístupná" +#~ msgid "" +#~ "We're messing around with things internally, and the server had a bit of " +#~ "a hiccup" +#~ msgstr "Máme problém na servri, ktorý sa snažíme odstrániť" +#~ msgid "Please try again later" +#~ msgstr "Skúste znovu neskôr, prosím" +#~ msgid "Latest miesta" +#~ msgstr "Posledné miesta" + +#~ msgid "on" +#~ msgstr " " + +#~ msgid "at" +#~ msgstr "o" diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo index a9bb78959b..bfd62e8c1e 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 7663e70e85..476e23797a 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-11 16:13-0600\n" +"POT-Creation-Date: 2005-11-12 16:05-0600\n" "PO-Revision-Date: 2005-11-03 00:28+0100\n" "Last-Translator: Petar Marić \n" "Language-Team: Nesh & Petar \n" "Language-Team: Simplified Chinese \n" @@ -385,6 +385,18 @@ msgstr "简单页面" msgid "flat pages" msgstr "简单页面" +#: utils/translation.py:335 +msgid "DATE_FORMAT" +msgstr "" + +#: utils/translation.py:336 +msgid "DATETIME_FORMAT" +msgstr "" + +#: utils/translation.py:337 +msgid "TIME_FORMAT" +msgstr "" + #: utils/dates.py:6 msgid "Monday" msgstr "星期一" diff --git a/django/contrib/admin/views/main.py b/django/contrib/admin/views/main.py index 81c494b03f..849a774e0a 100644 --- a/django/contrib/admin/views/main.py +++ b/django/contrib/admin/views/main.py @@ -10,7 +10,8 @@ from django.models.admin import log from django.utils.html import strip_tags from django.utils.httpwrappers import HttpResponse, HttpResponseRedirect from django.utils.text import capfirst, get_text_list -from django.conf.settings import ADMIN_MEDIA_PREFIX, DATE_FORMAT, DATETIME_FORMAT, TIME_FORMAT +from django.conf.settings import ADMIN_MEDIA_PREFIX +from django.utils.translation import get_date_formats import operator # Text to display within changelist table cells if the value is blank. @@ -410,12 +411,13 @@ def change_list(request, app_label, module_name): # Dates and times are special: They're formatted in a certain way. elif isinstance(f, meta.DateField) or isinstance(f, meta.TimeField): if field_val: + (date_format, datetime_format, time_format) = get_date_formats() if isinstance(f, meta.DateTimeField): - result_repr = capfirst(dateformat.format(field_val, DATETIME_FORMAT)) + result_repr = capfirst(dateformat.format(field_val, datetime_format)) elif isinstance(f, meta.TimeField): - result_repr = capfirst(dateformat.time_format(field_val, TIME_FORMAT)) + result_repr = capfirst(dateformat.time_format(field_val, time_format)) else: - result_repr = capfirst(dateformat.format(field_val, DATE_FORMAT)) + result_repr = capfirst(dateformat.format(field_val, date_format)) else: result_repr = EMPTY_CHANGELIST_VALUE row_class = ' class="nowrap"' diff --git a/django/utils/translation.py b/django/utils/translation.py index a58188e87f..426faaaff0 100644 --- a/django/utils/translation.py +++ b/django/utils/translation.py @@ -325,6 +325,24 @@ def get_language_from_request(request): return settings.LANGUAGE_CODE +def get_date_formats(): + """ + This function checks wether translation files provide a translation for some + technical message ID to store date and time formats. If it doesn't contain + one, the formats provided in the settings will be used. + """ + from django.conf.settings import DATE_FORMAT, DATETIME_FORMAT, TIME_FORMAT + date_format = _('DATE_FORMAT') + datetime_format = _('DATETIME_FORMAT') + time_format = _('TIME_FORMAT') + if date_format == 'DATE_FORMAT': + date_format = DATE_FORMAT + if datetime_format == 'DATETIME_FORMAT': + datetime_format = DATETIME_FORMAT + if time_format == 'TIME_FORMAT': + time_format = TIME_FORMAT + return (date_format, datetime_format, time_format) + def install(): """ Installs the gettext function as the default translation function under