summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJannis Leidel <jannis@leidel.info>2011-03-01 08:50:02 +0000
committerJannis Leidel <jannis@leidel.info>2011-03-01 08:50:02 +0000
commit8a94108110a489cab80089d8fcba3a8e058b608f (patch)
treeaf000eff6a57c0842500d458faaf2cefe6a7e282
parent5aca35329cb44f05b3594c311ba4d1bae4f48e12 (diff)
Fixed #15300 -- Updated core translations from transifex.net.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15680 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/conf/locale/ar/LC_MESSAGES/django.mobin16595 -> 17889 bytes
-rw-r--r--django/conf/locale/ar/LC_MESSAGES/django.po372
-rw-r--r--django/conf/locale/bg/LC_MESSAGES/django.mobin11057 -> 10446 bytes
-rw-r--r--django/conf/locale/bg/LC_MESSAGES/django.po488
-rw-r--r--django/conf/locale/bn/LC_MESSAGES/django.mobin13929 -> 13109 bytes
-rw-r--r--django/conf/locale/bn/LC_MESSAGES/django.po422
-rw-r--r--django/conf/locale/bs/LC_MESSAGES/django.mobin13812 -> 12721 bytes
-rw-r--r--django/conf/locale/bs/LC_MESSAGES/django.po415
-rw-r--r--django/conf/locale/ca/LC_MESSAGES/django.mobin14061 -> 15128 bytes
-rw-r--r--django/conf/locale/ca/LC_MESSAGES/django.po315
-rw-r--r--django/conf/locale/cs/LC_MESSAGES/django.mobin14780 -> 15040 bytes
-rw-r--r--django/conf/locale/cs/LC_MESSAGES/django.po314
-rw-r--r--django/conf/locale/cy/LC_MESSAGES/django.mobin3888 -> 3283 bytes
-rw-r--r--django/conf/locale/cy/LC_MESSAGES/django.po526
-rw-r--r--django/conf/locale/da/LC_MESSAGES/django.mobin13440 -> 12785 bytes
-rw-r--r--django/conf/locale/da/LC_MESSAGES/django.po369
-rw-r--r--django/conf/locale/de/LC_MESSAGES/django.mobin14848 -> 15421 bytes
-rw-r--r--django/conf/locale/de/LC_MESSAGES/django.po288
-rw-r--r--django/conf/locale/el/LC_MESSAGES/django.mobin8237 -> 11362 bytes
-rw-r--r--django/conf/locale/el/LC_MESSAGES/django.po510
-rw-r--r--django/conf/locale/en/LC_MESSAGES/django.mobin557 -> 557 bytes
-rw-r--r--django/conf/locale/en/LC_MESSAGES/django.po256
-rw-r--r--django/conf/locale/en_GB/LC_MESSAGES/django.mobin558 -> 14656 bytes
-rw-r--r--django/conf/locale/en_GB/LC_MESSAGES/django.po739
-rw-r--r--django/conf/locale/es/LC_MESSAGES/django.mobin13838 -> 15162 bytes
-rw-r--r--django/conf/locale/es/LC_MESSAGES/django.po334
-rw-r--r--django/conf/locale/es_AR/LC_MESSAGES/django.mobin14349 -> 15236 bytes
-rw-r--r--django/conf/locale/es_AR/LC_MESSAGES/django.po300
-rw-r--r--django/conf/locale/es_MX/LC_MESSAGES/django.mobin15215 -> 15215 bytes
-rw-r--r--django/conf/locale/es_MX/LC_MESSAGES/django.po343
-rw-r--r--django/conf/locale/et/LC_MESSAGES/django.mobin11605 -> 10907 bytes
-rw-r--r--django/conf/locale/et/LC_MESSAGES/django.po414
-rw-r--r--django/conf/locale/eu/LC_MESSAGES/django.mobin9556 -> 13140 bytes
-rw-r--r--django/conf/locale/eu/LC_MESSAGES/django.po441
-rw-r--r--django/conf/locale/fa/LC_MESSAGES/django.mobin11561 -> 14856 bytes
-rw-r--r--django/conf/locale/fa/LC_MESSAGES/django.po405
-rw-r--r--django/conf/locale/fi/LC_MESSAGES/django.mobin14645 -> 15034 bytes
-rw-r--r--django/conf/locale/fi/LC_MESSAGES/django.po325
-rw-r--r--django/conf/locale/fr/LC_MESSAGES/django.mobin14501 -> 15400 bytes
-rw-r--r--django/conf/locale/fr/LC_MESSAGES/django.po345
-rw-r--r--django/conf/locale/fy_NL/LC_MESSAGES/django.mobin4638 -> 4645 bytes
-rw-r--r--django/conf/locale/fy_NL/LC_MESSAGES/django.po265
-rw-r--r--django/conf/locale/ga/LC_MESSAGES/django.mobin14542 -> 15548 bytes
-rw-r--r--django/conf/locale/ga/LC_MESSAGES/django.po375
-rw-r--r--django/conf/locale/gl/LC_MESSAGES/django.mobin8916 -> 8208 bytes
-rw-r--r--django/conf/locale/gl/LC_MESSAGES/django.po500
-rw-r--r--django/conf/locale/he/LC_MESSAGES/django.mobin15446 -> 16009 bytes
-rw-r--r--django/conf/locale/he/LC_MESSAGES/django.po331
-rw-r--r--django/conf/locale/hi/LC_MESSAGES/django.mobin12876 -> 12039 bytes
-rw-r--r--django/conf/locale/hi/LC_MESSAGES/django.po413
-rw-r--r--django/conf/locale/hr/LC_MESSAGES/django.mobin14729 -> 14681 bytes
-rw-r--r--django/conf/locale/hr/LC_MESSAGES/django.po305
-rw-r--r--django/conf/locale/hu/LC_MESSAGES/django.mobin10638 -> 10613 bytes
-rw-r--r--django/conf/locale/hu/LC_MESSAGES/django.po442
-rw-r--r--django/conf/locale/id/LC_MESSAGES/django.mobin14141 -> 14969 bytes
-rw-r--r--django/conf/locale/id/LC_MESSAGES/django.po595
-rw-r--r--django/conf/locale/is/LC_MESSAGES/django.mobin10047 -> 9414 bytes
-rw-r--r--django/conf/locale/is/LC_MESSAGES/django.po418
-rw-r--r--django/conf/locale/it/LC_MESSAGES/django.mobin13917 -> 13231 bytes
-rw-r--r--django/conf/locale/it/LC_MESSAGES/django.po359
-rw-r--r--django/conf/locale/ja/LC_MESSAGES/django.mobin15318 -> 16535 bytes
-rw-r--r--django/conf/locale/ja/LC_MESSAGES/django.po308
-rw-r--r--django/conf/locale/ka/LC_MESSAGES/django.mobin14681 -> 21465 bytes
-rw-r--r--django/conf/locale/ka/LC_MESSAGES/django.po430
-rw-r--r--django/conf/locale/km/LC_MESSAGES/django.mobin8899 -> 8222 bytes
-rw-r--r--django/conf/locale/km/LC_MESSAGES/django.po532
-rw-r--r--django/conf/locale/kn/LC_MESSAGES/django.mobin8718 -> 7980 bytes
-rw-r--r--django/conf/locale/kn/LC_MESSAGES/django.po521
-rw-r--r--django/conf/locale/ko/LC_MESSAGES/django.mobin14723 -> 14112 bytes
-rw-r--r--django/conf/locale/ko/LC_MESSAGES/django.po355
-rw-r--r--django/conf/locale/lt/LC_MESSAGES/django.mobin7759 -> 7061 bytes
-rw-r--r--django/conf/locale/lt/LC_MESSAGES/django.po547
-rw-r--r--django/conf/locale/lv/LC_MESSAGES/django.mobin13971 -> 13331 bytes
-rw-r--r--django/conf/locale/lv/LC_MESSAGES/django.po370
-rw-r--r--django/conf/locale/mk/LC_MESSAGES/django.mobin17067 -> 16345 bytes
-rw-r--r--django/conf/locale/mk/LC_MESSAGES/django.po364
-rw-r--r--django/conf/locale/ml/LC_MESSAGES/django.mobin17124 -> 23008 bytes
-rw-r--r--django/conf/locale/ml/LC_MESSAGES/django.po423
-rw-r--r--django/conf/locale/mn/LC_MESSAGES/django.mobin12142 -> 17873 bytes
-rw-r--r--django/conf/locale/mn/LC_MESSAGES/django.po528
-rw-r--r--django/conf/locale/nb/LC_MESSAGES/django.mobin13474 -> 14533 bytes
-rw-r--r--django/conf/locale/nb/LC_MESSAGES/django.po338
-rw-r--r--django/conf/locale/nl/LC_MESSAGES/django.mobin11806 -> 14869 bytes
-rw-r--r--django/conf/locale/nl/LC_MESSAGES/django.po407
-rw-r--r--django/conf/locale/nn/LC_MESSAGES/django.mobin13425 -> 12816 bytes
-rw-r--r--django/conf/locale/nn/LC_MESSAGES/django.po348
-rw-r--r--django/conf/locale/no/LC_MESSAGES/django.mobin13474 -> 12844 bytes
-rw-r--r--django/conf/locale/no/LC_MESSAGES/django.po355
-rw-r--r--django/conf/locale/pa/LC_MESSAGES/django.mobin9766 -> 10632 bytes
-rw-r--r--django/conf/locale/pa/LC_MESSAGES/django.po314
-rw-r--r--django/conf/locale/pl/LC_MESSAGES/django.mobin15475 -> 15439 bytes
-rw-r--r--django/conf/locale/pl/LC_MESSAGES/django.po298
-rw-r--r--django/conf/locale/pt/LC_MESSAGES/django.mobin13543 -> 12999 bytes
-rw-r--r--django/conf/locale/pt/LC_MESSAGES/django.po344
-rw-r--r--django/conf/locale/pt_BR/LC_MESSAGES/django.mobin13850 -> 15135 bytes
-rw-r--r--django/conf/locale/pt_BR/LC_MESSAGES/django.po322
-rw-r--r--django/conf/locale/ro/LC_MESSAGES/django.mobin9885 -> 8968 bytes
-rw-r--r--django/conf/locale/ro/LC_MESSAGES/django.po492
-rw-r--r--django/conf/locale/ru/LC_MESSAGES/django.mobin18041 -> 18745 bytes
-rw-r--r--django/conf/locale/ru/LC_MESSAGES/django.po326
-rw-r--r--django/conf/locale/sk/LC_MESSAGES/django.mobin14174 -> 15332 bytes
-rw-r--r--django/conf/locale/sk/LC_MESSAGES/django.po312
-rw-r--r--django/conf/locale/sl/LC_MESSAGES/django.mobin14368 -> 15478 bytes
-rw-r--r--django/conf/locale/sl/LC_MESSAGES/django.po360
-rw-r--r--django/conf/locale/sq/LC_MESSAGES/django.mobin4854 -> 14865 bytes
-rw-r--r--django/conf/locale/sq/LC_MESSAGES/django.po654
-rw-r--r--django/conf/locale/sr/LC_MESSAGES/django.mobin17217 -> 18212 bytes
-rw-r--r--django/conf/locale/sr/LC_MESSAGES/django.po358
-rw-r--r--django/conf/locale/sr_Latn/LC_MESSAGES/django.mobin14258 -> 15105 bytes
-rw-r--r--django/conf/locale/sr_Latn/LC_MESSAGES/django.po358
-rw-r--r--django/conf/locale/sv/LC_MESSAGES/django.mobin11028 -> 14997 bytes
-rw-r--r--django/conf/locale/sv/LC_MESSAGES/django.po416
-rw-r--r--django/conf/locale/ta/LC_MESSAGES/django.mobin9280 -> 8619 bytes
-rw-r--r--django/conf/locale/ta/LC_MESSAGES/django.po499
-rw-r--r--django/conf/locale/te/LC_MESSAGES/django.mobin11308 -> 13071 bytes
-rw-r--r--django/conf/locale/te/LC_MESSAGES/django.po471
-rw-r--r--django/conf/locale/th/LC_MESSAGES/django.mobin14063 -> 19894 bytes
-rw-r--r--django/conf/locale/th/LC_MESSAGES/django.po425
-rw-r--r--django/conf/locale/tr/LC_MESSAGES/django.mobin14041 -> 15174 bytes
-rw-r--r--django/conf/locale/tr/LC_MESSAGES/django.po310
-rw-r--r--django/conf/locale/uk/LC_MESSAGES/django.mobin13829 -> 18778 bytes
-rw-r--r--django/conf/locale/uk/LC_MESSAGES/django.po420
-rw-r--r--django/conf/locale/vi/LC_MESSAGES/django.mobin11004 -> 10339 bytes
-rw-r--r--django/conf/locale/vi/LC_MESSAGES/django.po364
-rw-r--r--django/conf/locale/zh_CN/LC_MESSAGES/django.mobin11569 -> 13636 bytes
-rw-r--r--django/conf/locale/zh_CN/LC_MESSAGES/django.po385
-rw-r--r--django/conf/locale/zh_TW/LC_MESSAGES/django.mobin8396 -> 14879 bytes
-rw-r--r--django/conf/locale/zh_TW/LC_MESSAGES/django.po470
128 files changed, 14047 insertions, 11601 deletions
diff --git a/django/conf/locale/ar/LC_MESSAGES/django.mo b/django/conf/locale/ar/LC_MESSAGES/django.mo
index badbde0553..759cf5f5ce 100644
--- a/django/conf/locale/ar/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ar/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ar/LC_MESSAGES/django.po b/django/conf/locale/ar/LC_MESSAGES/django.po
index c3eda1589d..81f0125248 100644
--- a/django/conf/locale/ar/LC_MESSAGES/django.po
+++ b/django/conf/locale/ar/LC_MESSAGES/django.po
@@ -1,23 +1,19 @@
-# translation of django.po to Arabic
-# This file is distributed under the same license as the django package.
+# This file is distributed under the same license as the Django package.
#
-# Ossama M. Khayat <okhayat@yahoo.com>, 2009, 2010.
msgid ""
msgstr ""
-"Project-Id-Version: django\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:56+0100\n"
-"PO-Revision-Date: 2010-05-12 11:20+0300\n"
-"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
-"Language-Team: Arabic <support@arabeyes.org>\n"
+"POT-Creation-Date: 2011-02-28 17:32+0100\n"
+"PO-Revision-Date: 2011-02-25 10:11+0000\n"
+"Last-Translator: okhayat <okhayat@gmail.com>\n"
+"Language-Team: Arabic <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=4; plural=(n == 1? 0 : (n == 2? 1 : (n <= 10? 2 : "
-"3)))\n"
-"\n"
-"\n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -72,251 +68,259 @@ msgid "Spanish"
msgstr "الإسبانيّة"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "الإسبانيّة الأرجنتينيّة"
+msgstr "الأسبانية الأرجنتينية"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "الأسبانية الأرجنتينية"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "الإستونيّة"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "الباسك"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "الفارسيّة"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "الفنلنديّة"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "الفرنسيّة"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "الفريزيّة"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "الإيرلنديّة"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "الجليقيّة"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "العبريّة"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "الهندية"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "الكرواتيّة"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "الهنغاريّة"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "الإندونيسيّة"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "الآيسلنديّة"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "الإيطاليّة"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "اليابانيّة"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "الجورجيّة"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "الخمر"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "الهنديّة (كنّادا)"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "الكوريّة"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "اللتوانيّة"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "اللاتفيّة"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "المقدونيّة"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr ""
+msgstr "المايالام"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "المنغوليّة"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "الهولنديّة"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "النرويجيّة"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "البوكمال نرويجيّة"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "النينورسك نرويجيّة"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "البنجابيّة"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "البولنديّة"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "البرتغاليّة"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "البرتغاليّة البرازيليّة"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "الرومانيّة"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "الروسيّة"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "السلوفاكيّة"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "السلوفانيّة"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "الألبانيّة"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "الصربيّة"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "اللاتينيّة الصربيّة"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "السويديّة"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "التاميل"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "التيلوغو"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "التايلنديّة"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "التركيّة"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "الأكرانيّة"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "الفيتناميّة"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "الصينيّة المبسطة"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "الصينيّة التقليدية"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "أدخل قيمة صحيحة."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "أدخل رابطاً صحيحاً."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "يبدو أن هذا الرابط غير متوفر."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "أدخل رابطاً صحيحاً."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "أدخل عنوان بريد إلكتروني صحيح."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "أدخل اختصار 'slug' صحيح يتكوّن من أحرف، أرقام، شرطات سفلية وعاديّة."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "أدخل عنوان IPv4 صحيح."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "أدخل أرقاما فقط مفصول بينها بفواصل."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "تحقق من أن هذه القيمة هي %(limit_value)s (إنها %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "تحقق من أن تكون هذه القيمة أقل من %(limit_value)s أو مساوية لها."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "تحقق من أن تكون هذه القيمة أكثر من %(limit_value)s أو مساوية لها."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -325,7 +329,7 @@ msgstr ""
"تحقق من أن هذه القيمة تحتوي %(limit_value)d أحرف على الأقل (عدد أحرفها %"
"(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -334,17 +338,17 @@ msgstr ""
"تحقق من أن هذه القيمة مكونة من %(limit_value)d أحرف كحد أقصى (عدد أحرفها "
"الآن %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s يجب أن يكون مُميّزاً مع %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "النموذج %(model_name)s والحقل %(field_label)s موجود مسبقاً."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "و"
@@ -427,7 +431,7 @@ msgid "E-mail address"
msgstr "عنوان بريد إلكتروني"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "مسار الملف"
@@ -475,24 +479,24 @@ msgstr "رابط"
msgid "XML text"
msgstr "نص XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "النموذج %(model)s ذو الحقل الرئيسي %(pk)r غير موجود."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "الحقل المرتبط (تم تحديد النوع وفقاً للحقل المرتبط)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "علاقة واحد إلى واحد"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "علاقة متعدد إلى متعدد"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -560,7 +564,7 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "رجاءً أرسل ملف أو صح علامة صح عند مربع اختيار \"فارغ\"، وليس كلاهما."
#: forms/fields.py:518
msgid ""
@@ -575,29 +579,29 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "انتق خياراً صحيحاً. %(value)s ليس أحد الخيارات المتاحة."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "أدخل قائمة من القيم."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "الترتيب"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "احذف"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "رجاء صحّح بيانات %(field)s المتكررة."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "رجاء صحّح بيانات %(field)s المتكررة والتي يجب أن تكون مُميّزة."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -606,91 +610,91 @@ msgstr ""
"رجاء صحّح بيانات %(field_name)s المتكررة والتي يجب أن تكون مُميّزة لـ%(lookup)s "
"في %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "رجاءً صحّح القيم المُكرّرة أدناه."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "حقل foreign key المحدد لا يطابق الحقل الرئيسي له."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "انتق خياراً صحيحاً. اختيارك ليس أحد الخيارات المتاحة."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "انتق خياراً صحيحاً. %s ليس أحد الخيارات المتاحة."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "القيمة \"%s\" هي صحيحة للحقل المرجعي."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "حالياً:"
+msgstr "حالياً"
#: forms/widgets.py:300
msgid "Change"
msgstr "عدّل"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "سنة"
+msgstr "تفريغ"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "مجهول"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "نعم"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "لا"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "نعم,لا,ربما"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] "بايت واحد"
-msgstr[1] "بايتان"
-msgstr[2] "%(size)d بايتات"
-msgstr[3] "%(size)d بايت"
+msgstr[0] "%(size)d بايت"
+msgstr[1] "بايت واحد"
+msgstr[2] "بايتان"
+msgstr[3] "%(size)d بايتان"
+msgstr[4] "%(size)d بايت"
+msgstr[5] "%(size)d بايت"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s ك.ب"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s م.ب"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s ج.ب"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s ك.ب"
+msgstr "%s ت.ب"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s ك.ب"
+msgstr "%s ب.ب"
#: utils/dateformat.py:42
msgid "p.m."
@@ -929,73 +933,61 @@ msgid "Dec."
msgstr "ديسمبر"
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "يناير"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "فبراير"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "مارس"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "إبريل"
+msgstr "أبريل"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "مايو"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "يونيو"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "يوليو"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "أغسطس"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "سبتمبر"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "أكتوبر"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "نوفمبر"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "ديسمبر"
@@ -1013,49 +1005,61 @@ msgstr "، "
msgid "year"
msgid_plural "years"
msgstr[0] "سنة"
-msgstr[1] "سنتان"
-msgstr[2] "سنوات"
-msgstr[3] "سنة"
+msgstr[1] "سنة"
+msgstr[2] "سنتان"
+msgstr[3] "سنوات"
+msgstr[4] "سنة"
+msgstr[5] "سنة"
#: utils/timesince.py:22
msgid "month"
msgid_plural "months"
msgstr[0] "شهر"
-msgstr[1] "شهران"
-msgstr[2] "أشهر"
-msgstr[3] "شهر"
+msgstr[1] "شهر"
+msgstr[2] "شهران"
+msgstr[3] "أشهر"
+msgstr[4] "شهر"
+msgstr[5] "شهر"
#: utils/timesince.py:23
msgid "week"
msgid_plural "weeks"
msgstr[0] "أسبوع"
-msgstr[1] "أسبوعان"
-msgstr[2] "أسابيع"
-msgstr[3] "أسبوع"
+msgstr[1] "أسبوع"
+msgstr[2] "أسبوعان"
+msgstr[3] "أسابيع"
+msgstr[4] "أسبوع"
+msgstr[5] "أسبوع"
#: utils/timesince.py:24
msgid "day"
msgid_plural "days"
msgstr[0] "يوم"
-msgstr[1] "يومان"
-msgstr[2] "أيام"
-msgstr[3] "يوم"
+msgstr[1] "يوم"
+msgstr[2] "يومان"
+msgstr[3] "أيام"
+msgstr[4] "يوم"
+msgstr[5] "يوم"
#: utils/timesince.py:25
msgid "hour"
msgid_plural "hours"
msgstr[0] "ساعة"
-msgstr[1] "ساعتان"
-msgstr[2] "ساعات"
-msgstr[3] "ساعة"
+msgstr[1] "ساعة"
+msgstr[2] "ساعتان"
+msgstr[3] "ساعات"
+msgstr[4] "ساعة"
+msgstr[5] "ساعة"
#: utils/timesince.py:26
msgid "minute"
msgid_plural "minutes"
msgstr[0] "دقيقة"
-msgstr[1] "دقيقتان"
-msgstr[2] "دقائق"
-msgstr[3] "دقيقة"
+msgstr[1] "دقيقة"
+msgstr[2] "دقيقتان"
+msgstr[3] "دقائق"
+msgstr[4] "دقيقة"
+msgstr[5] "دقيقة"
#: utils/timesince.py:45
msgid "minutes"
@@ -1071,23 +1075,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr "، %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j F Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j F Y، G:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "G:i:s"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
@@ -1105,3 +1109,55 @@ msgstr "%(verbose_name)s تم تحديثه بنجاح."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s تم حذفه."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s تم حذفه."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s تم تحديثه بنجاح."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/bg/LC_MESSAGES/django.mo b/django/conf/locale/bg/LC_MESSAGES/django.mo
index 8bd66572aa..a86cf64c10 100644
--- a/django/conf/locale/bg/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bg/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/bg/LC_MESSAGES/django.po b/django/conf/locale/bg/LC_MESSAGES/django.po
index 4adc395660..ee5a800900 100644
--- a/django/conf/locale/bg/LC_MESSAGES/django.po
+++ b/django/conf/locale/bg/LC_MESSAGES/django.po
@@ -1,17 +1,18 @@
-# translation of django.po to Bulgarian
-#
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
-"Project-Id-Version: django\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:56+0100\n"
-"PO-Revision-Date: 2008-03-12 13:01+0200\n"
-"Last-Translator: Vladislav <vladislav.mitov@gmail.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2011-02-28 17:32+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -26,9 +27,8 @@ msgid "Bengali"
msgstr "бенгалски"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "ромънски"
+msgstr ""
#: conf/global_settings.py:48
msgid "Catalan"
@@ -59,305 +59,291 @@ msgid "English"
msgstr "английски"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "английски"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "испански"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "аржентински испански"
+msgstr ""
#: conf/global_settings.py:58
#, fuzzy
-msgid "Estonian"
-msgstr "ромънски"
+msgid "Mexican Spanish"
+msgstr "испански"
#: conf/global_settings.py:59
+msgid "Estonian"
+msgstr ""
+
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Баски"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "персийски"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "финландски"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "френски"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "персийски"
+msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "ирландски"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "галицейски"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "еврит"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "хърватски"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "унгарски"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "македонски"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "исландски"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "италиански"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "японски"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "грузински"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Кхмерски"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "каннада (индийски)"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "корейски"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "латвийски"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "македонски"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Малага"
+msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "македонски"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "холандски"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "норвежки"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "норвежки"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "норвежки"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "полски"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
-msgstr "португалски"
+msgstr ""
-#: conf/global_settings.py:90
-#, fuzzy
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
-msgstr "португалски"
+msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "ромънски"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "руски"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "словашки"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "словенски"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "ромънски"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "сръбски"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "сръбски"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "шведски"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "тамил (индийски)"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "телугу (индийски)"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "тамил (индийски)"
+msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "турски"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "украински"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "собствено име"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "китайски"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "традиционен китайски"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Въведете валидна стойност. "
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Въведете валиден URL. "
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Този URL май е счупен линк. "
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Въведете валиден URL. "
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Въведете валиден e-mail адрес. "
-#: core/validators.py:123 forms/fields.py:958
-#, fuzzy
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"Тази стойност трябва да съдържа само букви, цифри, подчертавки или тиренца. "
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Въведете валиден IPv4 адрес."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Въведете само цифри, разделени със запетая. "
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Уверете се, че тази стойност съдържа поне %(min)d символа (в момента %"
-"(length)d)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Тази стойност трябва да е по-малка или равна на %s. "
+msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Тази стойност трябва да е по-голяма или равна на %s."
+msgstr ""
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Уверете се, че тази стойност съдържа поне %(min)d символа (в момента %"
-"(length)d)."
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Уверете се, че стойността съдържа максимално %(max)d символа (в момента %"
-"(length)d)."
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "Това поле трябва да е зададено ако %(field)s е %(value)s"
+msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
-#, fuzzy, python-format
+#: db/models/base.py:784 db/models/base.py:792
+#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(optname)s с този %(fieldname)s вече съществува."
+msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "и"
@@ -371,9 +357,8 @@ msgid "This field cannot be null."
msgstr "Това поле не може да има празна стойност."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Това поле не може да има празна стойност."
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -421,9 +406,8 @@ msgid "Invalid date: %s"
msgstr "Невалидна дата: %s"
#: db/models/fields/__init__.py:670
-#, fuzzy
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Въведете валидна дата и час в формат ГГГГ-ММ-ДД ЧЧ:ММ."
+msgstr ""
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
@@ -442,14 +426,13 @@ msgid "E-mail address"
msgstr "E-mail адрес"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Път към файл"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "Тази стойност трябва да бъде поне %s. "
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -480,9 +463,8 @@ msgid "Time"
msgstr "Час"
#: db/models/fields/__init__.py:1044
-#, fuzzy
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Въведете валиден час във формат ЧЧ:ММ. "
+msgstr ""
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -492,24 +474,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML текст"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -568,12 +550,10 @@ msgid "The submitted file is empty."
msgstr "Каченият файл е празен. "
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Уверете се, че стойността съдържа максимално %(max)d символа (в момента %"
-"(length)d)."
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
@@ -592,120 +572,116 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Направете валиден избор. %(value)s не е един от възможните избори."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Въведете списък от стойности"
-#: forms/formsets.py:308 forms/formsets.py:310
-#, fuzzy
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr "Подредба:"
+msgstr ""
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Изтрий"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Коригирайте долу допуснатата грешка. "
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "Коригирайте долу допуснатата грешка. "
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Направете валиден избор. Този не е един от възможните избори. "
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Направете валиден избор. %s не е един от възможните избори. "
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Сега:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Промени"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "година"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Неизвестно"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Да"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Не"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "да,не,може-би"
-#: template/defaultfilters.py:805
-#, fuzzy, python-format
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
+#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d байт"
-msgstr[1] "%(size)d байт"
+msgstr[0] ""
+msgstr[1] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s КБ"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s МБ"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s ГБ"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s КБ"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s КБ"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -886,134 +862,122 @@ msgstr "дек"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Яну."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Фев."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "Март"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Април"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "Май"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Юни"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Юли"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Авг."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Септ."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Окт."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Ное."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Дек."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "Януари"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "Февруари"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "Март"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "Април"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "Май"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "Юни"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "Юли"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "Август"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "Септември"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "Октомври"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "Ноември"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "Декември"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1025,46 +989,40 @@ msgid ", "
msgstr ""
#: utils/timesince.py:21
-#, fuzzy
msgid "year"
msgid_plural "years"
-msgstr[0] "година"
-msgstr[1] "година"
+msgstr[0] ""
+msgstr[1] ""
#: utils/timesince.py:22
-#, fuzzy
msgid "month"
msgid_plural "months"
-msgstr[0] "месец"
-msgstr[1] "месец"
+msgstr[0] ""
+msgstr[1] ""
#: utils/timesince.py:23
-#, fuzzy
msgid "week"
msgid_plural "weeks"
-msgstr[0] "седмица"
-msgstr[1] "седмица"
+msgstr[0] ""
+msgstr[1] ""
#: utils/timesince.py:24
-#, fuzzy
msgid "day"
msgid_plural "days"
-msgstr[0] "ден"
-msgstr[1] "ден"
+msgstr[0] ""
+msgstr[1] ""
#: utils/timesince.py:25
-#, fuzzy
msgid "hour"
msgid_plural "hours"
-msgstr[0] "час"
-msgstr[1] "час"
+msgstr[0] ""
+msgstr[1] ""
#: utils/timesince.py:26
-#, fuzzy
msgid "minute"
msgid_plural "minutes"
-msgstr[0] "минута"
-msgstr[1] "минута"
+msgstr[0] ""
+msgstr[1] ""
#: utils/timesince.py:45
msgid "minutes"
@@ -1080,23 +1038,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j N, Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j N, Y, P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
@@ -1114,3 +1072,55 @@ msgstr "Обектът %(verbose_name)s бе успешно актуализир
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "Обектът %(verbose_name)s бе затрит."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Обектът %(verbose_name)s бе затрит."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Обектът %(verbose_name)s бе успешно актуализиран."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.mo b/django/conf/locale/bn/LC_MESSAGES/django.mo
index 3d25e57fd4..6155dee82f 100644
--- a/django/conf/locale/bn/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bn/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/bn/LC_MESSAGES/django.po b/django/conf/locale/bn/LC_MESSAGES/django.po
index b9acc70557..94a18e77b3 100644
--- a/django/conf/locale/bn/LC_MESSAGES/django.po
+++ b/django/conf/locale/bn/LC_MESSAGES/django.po
@@ -4,14 +4,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:56+0100\n"
-"PO-Revision-Date: 2009-07-19 22:49+0000\n"
-"Last-Translator: Nasimul Haque <nasim.haque@gmail.com>\n"
-"Language-Team: Nasimul Haque <nasim.haque@gmail.com>\n"
+"POT-Creation-Date: 2011-02-28 17:32+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: Bengali <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: bn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -26,9 +27,8 @@ msgid "Bengali"
msgstr "বাংলা"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "এস্তোনিয়ান"
+msgstr ""
#: conf/global_settings.py:48
msgid "Catalan"
@@ -59,296 +59,293 @@ msgid "English"
msgstr "ইংলিশ"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "ইংলিশ"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "স্প্যানিশ"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "আর্জেন্টিনিয়ান স্প্যানিশ"
+msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "স্প্যানিশ"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "এস্তোনিয়ান"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "বাস্ক"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "ফারসি"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "ফিনিশ"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "ফ্রেঞ্চ"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "ফারসি"
+msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "আইরিশ"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "গ্যালিসিয়ান"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "হিব্রু"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "ক্রোয়েশিয়ান"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "হাঙ্গেরিয়ান"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "ম্যাসাডোনিয়ান"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "আইসল্যান্ডিক"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "ইটালিয়ান"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "জাপানিজ"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "জর্জিয়ান"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "খমার"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "কান্নাড়া"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "কোরিয়ান"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "লিথুয়ানিয়ান"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "লাটভিয়ান"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "ম্যাসাডোনিয়ান"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "ম্যাসাডোনিয়ান"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "ডাচ"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "নরওয়েজিয়ান"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "নরওয়েজিয়ান"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "নরওয়েজিয়ান"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "পোলিশ"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
-msgstr "পর্তুগীজ"
+msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "ব্রাজিলিয়ান পর্তুগীজ"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "রোমানিয়ান"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "রাশান"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "স্লোভাক"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "স্লোভেনিয়ান"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "রোমানিয়ান"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "সার্বিয়ান"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "সার্বিয়ান"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "সুইডিশ"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "তামিল"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "তেলেগু"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "তামিল"
+msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "তুর্কি"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ইউক্রেনিয়ান"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "প্রথম নাম"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "সরলীকৃত চাইনীজ"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "প্রচলিত চাইনীজ"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "একটি বৈধ মান দিন।"
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "বৈধ URL দিন"
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "এই URL টি সঠিক নয়।"
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "বৈধ URL দিন"
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "বৈধ ইমেইল ঠিকানা দিন।"
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"বৈধ ’slug' প্রবেশ করান যাতে শুধুমাত্র ইংরেজী বর্ণ, অঙ্ক, আন্ডারস্কোর অথবা হাইফেন "
"রয়েছে।"
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "একটি বৈধ IPv4 ঠিকানা দিন।"
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "শুধুমাত্র কমা দিয়ে সংখ্যা দিন।"
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "নিশ্চিত করুন যে এটি কমপক্ষে %(min)d সংখ্যক বর্ণ আছে (এর আছে %(length)d)।"
+msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "নিশ্চিত করুন যে, সংখ্যাটি %s -এর কম অথবা সমান।"
+msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "নিশ্চিত করুন যে, সংখ্যাটি %s -এর বেশি অথবা সমান।"
+msgstr ""
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "নিশ্চিত করুন যে এটি কমপক্ষে %(min)d সংখ্যক বর্ণ আছে (এর আছে %(length)d)।"
+msgstr ""
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "নিশ্চিত করুন যে এটি সর্বোচ্চ %(max)d সংখ্যক বর্ণ আছে (এর আছে %(length)d)।"
+msgstr ""
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(field_label)s সহ %(model_name)s আরেকটি রয়েছে।"
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "এবং"
@@ -362,9 +359,8 @@ msgid "This field cannot be null."
msgstr "এর মান null হতে পারবে না।"
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "এর মান null হতে পারবে না।"
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -432,14 +428,13 @@ msgid "E-mail address"
msgstr "ইমেইল ঠিকানা"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "ফাইল পথ"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "এর মান অবশ্যই ইন্টিজার হতে হবে।"
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -481,24 +476,24 @@ msgstr "ইউআরএল (URL)"
msgid "XML text"
msgstr "XML টেক্সট"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "একাধিক বাছাই করতে \"কন্ট্রোল\", অথবা ম্যাকে \"কমান্ড\", চেপে ধরুন।"
@@ -555,10 +550,10 @@ msgid "The submitted file is empty."
msgstr "ফাইলটি খালি।"
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "নিশ্চিত করুন যে এটি সর্বোচ্চ %(max)d সংখ্যক বর্ণ আছে (এর আছে %(length)d)।"
+msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
@@ -577,119 +572,116 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "%(value)s বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।"
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "কয়েকটি মানের তালিকা দিন।"
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "ক্রম"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "মুছুন"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "অনুগ্রহ করে নিচের ভুলটি সংশোধন করুন।"
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "অনুগ্রহ করে নিচের ভুলটি সংশোধন করুন।"
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "এটি বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।"
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "%s বৈধ নয়। অনুগ্রহ করে আরেকটি সিলেক্ট করুন।"
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "চলতিঃ"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "পরিবর্তন"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "বছর"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "অজানা"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "হ্যাঁ"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "না"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "হ্যাঁ,না,হয়তো"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d বাইট"
msgstr[1] "%(size)d বাইট"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s কেবি"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s এমবি"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s জিবি"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s কেবি"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s কেবি"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -870,134 +862,122 @@ msgstr "ডিসে."
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "জান."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "ফেব."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "মার্চ"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "এপ্রিল"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "মে"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "জুন"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "জুলাই"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "আগ."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "সেপ্টে."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "অক্টো."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "নভে."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "ডিসে."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "জানুয়ারি"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "ফেব্রুয়ারি"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "মার্চ"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "এপ্রিল"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "মে"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "জুন"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "জুলাই"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "আগস্ট"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "সেপ্টেম্বর"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "অক্টোবর"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "নভেম্বর"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "ডিসেম্বর"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1058,23 +1038,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "N j, Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "N j, Y, P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
@@ -1092,3 +1072,55 @@ msgstr "%(verbose_name)s হালনাগাদ সফল হয়েছে।"
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s মুছে ফেলা হয়েছে।"
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s মুছে ফেলা হয়েছে।"
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s হালনাগাদ সফল হয়েছে।"
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/bs/LC_MESSAGES/django.mo b/django/conf/locale/bs/LC_MESSAGES/django.mo
index cb88ff293e..c75fe363c2 100644
--- a/django/conf/locale/bs/LC_MESSAGES/django.mo
+++ b/django/conf/locale/bs/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/bs/LC_MESSAGES/django.po b/django/conf/locale/bs/LC_MESSAGES/django.po
index 1bc6a1caa0..d673dbb9e5 100644
--- a/django/conf/locale/bs/LC_MESSAGES/django.po
+++ b/django/conf/locale/bs/LC_MESSAGES/django.po
@@ -4,15 +4,16 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:56+0100\n"
-"PO-Revision-Date: 2010-04-28 13:45+0100\n"
-"Last-Translator: Filip Dupanović <kron@kron.ba>\n"
-"Language-Team: Filip Dupanović <kron@kron.ba>\n"
+"POT-Creation-Date: 2011-02-28 17:33+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: Bosnian <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -59,268 +60,271 @@ msgid "English"
msgstr "engleski"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "engleski"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "španski"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "argentinski španski"
+msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "španski"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "estonski"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "baskijski"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "persijski"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "finski"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "francuski"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "frišanski"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "irski"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "galski"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "hebrejski"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "hrvatski"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "mađarski"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "makedonski"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islandski"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "italijanski"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "japanski"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "gruzijski"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "kambođanski"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "kanada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "korejski"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "litvanski"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "latvijski"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "makedonski"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "makedonski"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "holandski"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "norveški"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "norveški"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "norveški"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "poljski"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "portugalski"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "brazilski portugalski"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "rumunski"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "ruski"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "slovački"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "slovenački"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "albanski"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "srpski"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "srpski latinski"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "švedski"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "tamilski"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "tajlandski"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "turski"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ukrajinski"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "vijetnamežanski"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "novokineski"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "starokineski"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Unesite ispravnu vrijednost."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Unesite ispravan URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Ovaj URL izgleda ne vodi nikuda."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Unesite ispravan URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Unesite važeću email adresu."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Unesite ispravan „slug“, koji se sastoji od slova, brojki, donjih crta ili "
"crtica."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Unesite ispravnu IPv4 adresu."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Unesite samo brojke razdvojene zapetama."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Pobrinite se da je ova vrijednost %(limit_value)s (trenutno je %(show_value)"
"s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Ova vrijednost mora da bude manja ili jednaka %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Ova vrijednost mora biti veća ili jednaka %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -329,7 +333,7 @@ msgstr ""
"Pobrinite se da ova vrijednost ima najmanje %(limit_value)d znamenki "
"(trenutno ima %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -338,17 +342,17 @@ msgstr ""
"Pobrinite se da ova vrijednost ima najviše %(limit_value)d znamenki (ima %"
"(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s mora da bude jedinstven za %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s sa ovom vrijednošću %(field_label)s već postoji."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "i"
@@ -432,7 +436,7 @@ msgid "E-mail address"
msgstr "Email adresa"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Putanja fajla"
@@ -480,24 +484,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML tekst"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Model %(model)s sa pk %(pk)r ne postoji."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Strani ključ (tip određen povezanim poljem)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Jedan-na-jedan odnos"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Više-na-više odsnos"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -581,30 +585,30 @@ msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"%(value)s nije među ponuđenim vrijednostima. Odaberite jednu od ponuđenih."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Unesite listu vrijednosti."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Redoslijed"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Obriši"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ispravite dupli sadržaj za polja: %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Ispravite dupli sadržaj za polja: %(field)s, koji mora da bude jedinstven."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -613,91 +617,90 @@ msgstr ""
"Ispravite dupli sadržaj za polja: %(field_name)s, koji mora da bude "
"jedinstven za %(lookup)s u %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Ispravite duple vrijednosti dole."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Strani ključ se nije poklopio sa instancom roditeljskog ključa."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Odabrana vrijednost nije među ponuđenima. Odaberite jednu od ponuđenih."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "%s nije među ponuđenim vrijednostima. Odaberite jednu od ponuđenih."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "„%s“ nije ispravna vrijednost za primarni ključ."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Trenutno:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Izmjeni"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "godina"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Nepoznato"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Da"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "da,ne,možda"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d bajt"
-msgstr[1] "%(size)d bajta"
-msgstr[2] "%(size)d bajtova"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -878,134 +881,122 @@ msgstr "dec."
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "jan."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "feb."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "mart"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "april"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "maj"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "juni"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "juli"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "aug."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "sept."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "okt."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "nov."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "dec."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "januar"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "februar"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "mart"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "april"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "maj"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "juni"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "juli"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "august"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "septembar"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "oktobar"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "novembar"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "decembar"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1019,44 +1010,50 @@ msgstr ""
#: utils/timesince.py:21
msgid "year"
msgid_plural "years"
-msgstr[0] "godina"
-msgstr[1] "godine"
-msgstr[2] "godina"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: utils/timesince.py:22
msgid "month"
msgid_plural "months"
-msgstr[0] "mjesec"
-msgstr[1] "mjeseca"
-msgstr[2] "mjeseci"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: utils/timesince.py:23
msgid "week"
msgid_plural "weeks"
-msgstr[0] "nedelja"
-msgstr[1] "nedelje"
-msgstr[2] "nedelja"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: utils/timesince.py:24
msgid "day"
msgid_plural "days"
-msgstr[0] "dan"
-msgstr[1] "dana"
-msgstr[2] "dana"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: utils/timesince.py:25
msgid "hour"
msgid_plural "hours"
-msgstr[0] "sat"
-msgstr[1] "sata"
-msgstr[2] "sati"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: utils/timesince.py:26
msgid "minute"
msgid_plural "minutes"
-msgstr[0] "minut"
-msgstr[1] "minute"
-msgstr[2] "minuta"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
#: utils/timesince.py:45
msgid "minutes"
@@ -1072,23 +1069,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j. N Y."
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. N. Y. G:i T"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "G:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y."
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1106,3 +1103,55 @@ msgstr "%(verbose_name)s je uspješno ažuriran."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s je obrisan."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s je obrisan."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s je uspješno ažuriran."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/ca/LC_MESSAGES/django.mo b/django/conf/locale/ca/LC_MESSAGES/django.mo
index 2224c821f6..e95d6dffb0 100644
--- a/django/conf/locale/ca/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ca/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ca/LC_MESSAGES/django.po b/django/conf/locale/ca/LC_MESSAGES/django.po
index dacd9c94e4..c9a7c8044d 100644
--- a/django/conf/locale/ca/LC_MESSAGES/django.po
+++ b/django/conf/locale/ca/LC_MESSAGES/django.po
@@ -1,18 +1,18 @@
-# translation of django.po to Catalan
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:56+0100\n"
-"PO-Revision-Date: 2009-03-24 13:28+0100\n"
-"Last-Translator: Django Catalan Group <django-cat@googlegroups.com>\n"
-"Language-Team: Catalan <ca@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:33+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: txels <carles@barrobes.com>\n"
+"Language-Team: Catalan <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -67,256 +67,263 @@ msgid "Spanish"
msgstr "espanyol"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "castellà argentí"
+msgstr "castellà d'Argentina"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "castellà d'Argentina"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "estonià"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "euskera"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "persa"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "finlandès"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "francès"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "frisi"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "irlandès"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "gallec"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "hebreu"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "croat"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "hongarès"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "indonesi"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islandès"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "italià"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "japonès"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "georgià"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "kannarès"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "coreà"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "lituà"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "letó"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "macedoni"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Màlaga"
+msgstr "malaiàlam "
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "mongol"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "holandès"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "noruec"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "noruec bokmal"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "noruec nynorsk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "panjabi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "polonès"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "portuguès"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "portuguès de brasil"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "romanès"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "rus"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "eslovac"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "eslovè"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "albanès"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "serbi"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "serbi llatí"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "suec"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "tàmil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "tailandès"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "turc"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ucraïnès"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "vietnamita"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "xinès simplificat"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "xinès tradicional"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Introduïu un valor vàlid."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Introduïu una URL vàlida."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Aquesta URL sembla ser un enllaç trencat."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Introduïu una URL vàlida."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Introduïu una adreça de correu vàlida."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Introduïu un 'slug' vàlid, consistent en lletres, números, guions o guions "
"baixos."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Introduïu una adreça IPv4 vàlida."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Introduïu només dígits separats per comes."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Assegureu-vos que el valor sigui %(limit_value)s (és %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Assegureu-vos que aquest valor sigui menor o igual que %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Assegureu-vos que aquest valor sigui més gran o igual que %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -325,7 +332,7 @@ msgstr ""
"Assegureu-vos que el valor tingui com a mínim %(limit_value)d caràcters (en "
"té %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -334,17 +341,17 @@ msgstr ""
"Assegureu-vos que el valor tingui com a màxim %(limit_value)d caràcters (en "
"té %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "El camp %(field_name)s ha de ser únic per a %(lookup)s %(date_field)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Ja existeix %(model_name)s amb aquest %(field_label)s."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "i"
@@ -428,7 +435,7 @@ msgid "E-mail address"
msgstr "Adreça de correu electrònic"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Ruta del fitxer"
@@ -476,24 +483,24 @@ msgstr "URL"
msgid "XML text"
msgstr "Text XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "No existeix el model %(model)s amb la clau primària %(pk)r."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Clau forana (tipus determinat pel camp relacionat)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Inter-relació un-a-un"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Inter-relació molts-a-molts"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -563,6 +570,8 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Si us plau, envieu un fitxer o marqueu la casella de selecció \"netejar\", "
+"no ambdós."
#: forms/fields.py:518
msgid ""
@@ -577,31 +586,31 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Esculliu una opció vàlida. %(value)s no és una de les opcions vàlides."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Introduïu una llista de valors."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Ordre"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Si us plau, corregiu la dada duplicada per a %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Si us plau, corregiu la dada duplicada per a %(field)s, la qual ha de ser "
"única."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -610,92 +619,90 @@ msgstr ""
"Si us plau, corregiu la dada duplicada per a %(field_name)s, la qual ha de "
"ser única per a %(lookup)s en %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Si us plau, corregiu els valors duplicats a sota."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La clau forana en línia no coincideix amb la clau primària de la instància "
"mare."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Esculli una opció vàlida. Aquesta opció no és una de les opcions disponibles."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Escolliu una opció vàlida; %s no és una de les opcions vàlides."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" no és un valor vàlid per a una clau primària."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Actualment:"
+msgstr "Actualment"
#: forms/widgets.py:300
msgid "Change"
msgstr "Modificar"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr "Netejar"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Desconegut"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Sí"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "sí,no,potser"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -886,27 +893,27 @@ msgstr "feb."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "març"
+msgstr "mar."
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "abril"
+msgstr "abr."
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "maig"
+msgstr "mai."
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "juny"
+msgstr "jun."
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "juliol"
+msgstr "jul."
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -934,73 +941,61 @@ msgid "Dec."
msgstr "des."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "gener"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "febrer"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "març"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "abril"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "maig"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "juny"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "juliol"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "agost"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "setembre"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "octubre"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "novembre"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "desembre"
@@ -1012,7 +1007,7 @@ msgstr "o"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1064,23 +1059,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j \\de F \\de Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j \\de F \\de Y, H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F \\de Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j \\de F"
@@ -1098,3 +1093,55 @@ msgstr "El/la %(verbose_name)s s'ha actualtzat amb èxit."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "El/la %(verbose_name)s s'ha eliminat."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "El/la %(verbose_name)s s'ha eliminat."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "El/la %(verbose_name)s s'ha actualtzat amb èxit."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.mo b/django/conf/locale/cs/LC_MESSAGES/django.mo
index 0487132a6c..8a91e35b23 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cs/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/cs/LC_MESSAGES/django.po b/django/conf/locale/cs/LC_MESSAGES/django.po
index 69681ee413..2331c1f2c3 100644
--- a/django/conf/locale/cs/LC_MESSAGES/django.po
+++ b/django/conf/locale/cs/LC_MESSAGES/django.po
@@ -1,21 +1,18 @@
-# Translation of django.po to Czech
-# This file is distributed under the same license as the DJANGO package.
-# Radek Svarz <translate@svarz.cz>, 2005,
-# Tomáš Ehrlich <tomas.ehrlich@gmail.com>, 2009,
-# Vlada Macek <macek@sandbox.cz>, 2010.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:56+0100\n"
-"PO-Revision-Date: 2010-08-06 18:33+0100\n"
-"Last-Translator: Vlada Macek <macek@sandbox.cz>\n"
-"Language-Team: Czech\n"
+"POT-Creation-Date: 2011-02-28 17:33+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: JirkaV <Jirka.Vejrazka@gmail.com>\n"
+"Language-Team: Czech <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n>1 && n<5 ? 1 : 2;\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -74,248 +71,257 @@ msgid "Argentinian Spanish"
msgstr "španělsky (Argentina)"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "španělsky (Argentina)"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "estonsky"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "baskicky"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "persky"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "finsky"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "francouzsky"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "frísky"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "irsky"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "galicijsky"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "hebrejsky"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "hindsky"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "chorvatsky"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "maďarsky"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "indonésky"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islandsky"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "italsky"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "japonsky"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "gruzínsky"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "khmersky"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "kannadsky"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "korejsky"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "litevsky"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "lotyšsky"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "makedonsky"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr "malajálamsky"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "mongolsky"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "holandsky"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "norsky"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "norsky (Bokmål)"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "norsky (Nynorsk)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Paňdžábsky"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "polsky"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "portugalsky"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "portugalsky (Brazílie)"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "rumunsky"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "rusky"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "slovensky"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "slovinsky"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "albánsky"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "srbsky"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "srbsky (latinkou)"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "švédsky"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "tamilsky"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telužsky"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "thajsky"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "turecky"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ukrajinsky"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "vietnamsky"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "čínsky (zjednodušeně)"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "čínsky (tradičně)"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Vložte platnou hodnotu."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Vložte platnou adresu URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Tato adresa URL je zřejmě neplatný odkaz."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Vložte platnou adresu URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Vložte platnou e-mailovou adresu."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Vložte platný identifikátor složený pouze z písmen, čísel, podtržítek a "
"pomlček."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Vložte platnou adresu typu IPv4."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Vložte pouze číslice oddělené čárkami."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Hodnota musí být %(limit_value)s (nyní je %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Hodnota musí být menší nebo rovna %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Hodnota musí být větší nebo rovna %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -324,7 +330,7 @@ msgstr ""
"Hodnota musí mít alespoň %(limit_value)d znaků, ale nyní jich má %"
"(show_value)d."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -333,19 +339,19 @@ msgstr ""
"Hodnota smí mít nejvýše %(limit_value)d znaků, ale nyní jich má %(show_value)"
"d."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"Pole %(field_name)s musí být unikátní testem %(lookup)s pole %(date_field)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
"Položka %(model_name)s s touto hodnotou v poli %(field_label)s již existuje."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "a"
@@ -428,7 +434,7 @@ msgid "E-mail address"
msgstr "E-mailová adresa"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Cesta k souboru"
@@ -476,24 +482,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML text"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Položka typu %(model)s s primárním klíčem %(pk)r neexistuje."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Cizí klíč (typ určen pomocí souvisejícího pole)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Vazba jedna-jedna"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Vazba mnoho-mnoho"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -575,29 +581,29 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Vyberte platnou možnost, \"%(value)s\" není k dispozici."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Vložte seznam hodnot."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Pořadí"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Odstranit"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Opravte duplicitní data v poli %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Opravte duplicitní data v poli %(field)s, které musí být unikátní."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -606,60 +612,58 @@ msgstr ""
"Opravte duplicitní data v poli %(field_name)s, které musí být unikátní "
"testem %(lookup)s pole %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Odstraňte duplicitní hodnoty níže."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Cizí klíč typu inline neodpovídá primárnímu klíči v rodičovské položce."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Vyberte platnou možnost. Tato není k dispozici."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Vyberte platnou možnost, \"%s\" není k dispozici."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "Hodnota \"%s\" není platný primární klíč."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Aktuálně:"
+msgstr "Aktuálně"
#: forms/widgets.py:300
msgid "Change"
msgstr "Změnit"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr "Zrušit"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Neznámé"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Ano"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ano, ne, možná"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -667,30 +671,30 @@ msgstr[0] "%(size)d bajt"
msgstr[1] "%(size)d bajty"
msgstr[2] "%(size)d bajtů"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -871,62 +875,62 @@ msgstr "pro"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "leden"
+msgstr "Led."
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "únor"
+msgstr "Úno."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "březen"
+msgstr "Bře."
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "duben"
+msgstr "Dub."
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "květen"
+msgstr "Kvě."
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "červen"
+msgstr "Čer."
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "červenec"
+msgstr "Čec."
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "srpen"
+msgstr "Srp."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "září"
+msgstr "Zář."
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "říjen"
+msgstr "Říj."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "listopad"
+msgstr "Lis."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "prosinec"
+msgstr "Pro."
#: utils/dates.py:45
msgctxt "alt. month"
@@ -995,7 +999,7 @@ msgstr "nebo"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1053,23 +1057,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j. n. Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. n. Y H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1087,3 +1091,55 @@ msgstr "Položka typu %(verbose_name)s byla úspěšně aktualizována."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "Položka typu %(verbose_name)s byla odstraněna."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Položka typu %(verbose_name)s byla odstraněna."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Položka typu %(verbose_name)s byla úspěšně aktualizována."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.mo b/django/conf/locale/cy/LC_MESSAGES/django.mo
index b0aaa461ab..0c94dfbb01 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.mo
+++ b/django/conf/locale/cy/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/cy/LC_MESSAGES/django.po b/django/conf/locale/cy/LC_MESSAGES/django.po
index ca4be228c8..dd9ad671b5 100644
--- a/django/conf/locale/cy/LC_MESSAGES/django.po
+++ b/django/conf/locale/cy/LC_MESSAGES/django.po
@@ -1,20 +1,18 @@
-# Translation of Django to Welsh.
-# Copyright (C) 2005 Django.
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:56+0100\n"
-"PO-Revision-Date: 2005-11-05 HO:MI+ZONE\n"
-"Last-Translator: Jason Davies <jason@jasondavies.com>\n"
-"Language-Team: Cymraeg <cy@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:33+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural= (n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != "
-"11) ? 2 : 3;\n"
+"Language: cy\n"
+"Plural-Forms: nplurals=4; plural=(n==2) ? 1 : 0\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -29,14 +27,12 @@ msgid "Bengali"
msgstr "Bengaleg"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "Romaneg"
+msgstr ""
#: conf/global_settings.py:48
-#, fuzzy
msgid "Catalan"
-msgstr "Eidaleg"
+msgstr ""
#: conf/global_settings.py:49
msgid "Czech"
@@ -63,9 +59,8 @@ msgid "English"
msgstr "Saesneg"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Saesneg"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
@@ -77,293 +72,278 @@ msgstr ""
#: conf/global_settings.py:58
#, fuzzy
-msgid "Estonian"
-msgstr "Romaneg"
+msgid "Mexican Spanish"
+msgstr "Spaeneg"
#: conf/global_settings.py:59
-msgid "Basque"
+msgid "Estonian"
msgstr ""
#: conf/global_settings.py:60
-#, fuzzy
-msgid "Persian"
-msgstr "Serbeg"
+msgid "Basque"
+msgstr ""
#: conf/global_settings.py:61
-#, fuzzy
-msgid "Finnish"
-msgstr "Daneg"
+msgid "Persian"
+msgstr ""
#: conf/global_settings.py:62
+msgid "Finnish"
+msgstr ""
+
+#: conf/global_settings.py:63
msgid "French"
msgstr "Ffrangeg"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "Brasileg"
+msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr ""
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galisieg"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr ""
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:68
-#, fuzzy
+#: conf/global_settings.py:69
msgid "Croatian"
-msgstr "Romaneg"
+msgstr ""
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr ""
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandeg"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Eidaleg"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr ""
-#: conf/global_settings.py:74
-#, fuzzy
+#: conf/global_settings.py:75
msgid "Georgian"
-msgstr "Almaeneg"
+msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:76
-#, fuzzy
+#: conf/global_settings.py:77
msgid "Kannada"
-msgstr "ac"
+msgstr ""
-#: conf/global_settings.py:77
-#, fuzzy
+#: conf/global_settings.py:78
msgid "Korean"
-msgstr "Norwyeg"
+msgstr ""
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr ""
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norwyeg"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Norwyeg"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Norwyeg"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
-#, fuzzy
+#: conf/global_settings.py:89
msgid "Polish"
-msgstr "Saesneg"
+msgstr ""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:90
-#, fuzzy
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
-msgstr "Brasileg"
+msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Romaneg"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Rwsieg"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slofaceg"
-#: conf/global_settings.py:94
-#, fuzzy
+#: conf/global_settings.py:95
msgid "Slovenian"
-msgstr "Slofaceg"
+msgstr ""
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Romaneg"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Serbeg"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "Serbeg"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Swedeg"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr ""
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr ""
-#: conf/global_settings.py:103
-#, fuzzy
+#: conf/global_settings.py:104
msgid "Ukrainian"
-msgstr "Brasileg"
+msgstr ""
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "enw cyntaf"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Tsieinëeg Symledig"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr ""
-#: core/validators.py:20 forms/fields.py:67
-#, fuzzy
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
-msgstr "Rhowch enw ffeil dilys."
-
-#: core/validators.py:87 forms/fields.py:574
-#, fuzzy
-msgid "Enter a valid URL."
-msgstr "Rhowch enw ffeil dilys."
+msgstr ""
#: core/validators.py:89 forms/fields.py:575
-#, fuzzy
msgid "This URL appears to be a broken link."
-msgstr "Mae'r URL %s yn gyswllt toredig."
+msgstr ""
+
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr ""
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Rhowch cyfeiriad e-bost ddilys."
-#: core/validators.py:123 forms/fields.py:958
-#, fuzzy
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"Rhaid i'r werth yma cynnwys lythrennau, rhifau, tanlinellau ac slaesau yn "
-"unig."
-#: core/validators.py:126 forms/fields.py:951
-#, fuzzy
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
-msgstr "Rhowch cyfeiriad e-bost ddilys."
+msgstr ""
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Rhowch digidau gwahanu gyda atalnodau yn unig."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "Rhaid roi'r faes yma os mae %(field)s yn %(value)s"
+msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "ac"
@@ -373,14 +353,12 @@ msgid "Value %r is not a valid choice."
msgstr ""
#: db/models/fields/__init__.py:64
-#, fuzzy
msgid "This field cannot be null."
-msgstr "Mae'r faes yma yn annilydd."
+msgstr ""
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Mae'r faes yma yn annilydd."
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -394,23 +372,21 @@ msgid "Integer"
msgstr ""
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
-#, fuzzy
msgid "This value must be an integer."
-msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
+msgstr ""
#: db/models/fields/__init__.py:493
-#, fuzzy
msgid "This value must be either True or False."
-msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
+msgstr ""
#: db/models/fields/__init__.py:495
msgid "Boolean (Either True or False)"
msgstr ""
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
-#, fuzzy, python-format
+#, python-format
msgid "String (up to %(max_length)s)"
-msgstr "Llinyn (i fyny at 50)"
+msgstr ""
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
@@ -425,23 +401,21 @@ msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Rhowch dyddiad dilys mewn fformat YYYY-MM-DD."
#: db/models/fields/__init__.py:589
-#, fuzzy, python-format
+#, python-format
msgid "Invalid date: %s"
-msgstr "URL annilys: %s"
+msgstr ""
#: db/models/fields/__init__.py:670
-#, fuzzy
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Rhowch dyddiad/amser ddilys mewn fformat YYYY-MM-DD HH:MM."
+msgstr ""
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
msgstr "Dyddiad (gyda amser)"
#: db/models/fields/__init__.py:746
-#, fuzzy
msgid "This value must be a decimal number."
-msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
+msgstr ""
#: db/models/fields/__init__.py:748
msgid "Decimal number"
@@ -452,14 +426,13 @@ msgid "E-mail address"
msgstr "Cyfeiriad e-bost"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Llwybr ffeil"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -474,9 +447,8 @@ msgid "IP address"
msgstr "cyfeiriad IP"
#: db/models/fields/__init__.py:931
-#, fuzzy
msgid "This value must be either None, True or False."
-msgstr "Rhaid i'r gwerth yma fod yn bŵer o %s."
+msgstr ""
#: db/models/fields/__init__.py:933
msgid "Boolean (Either True, False or None)"
@@ -491,9 +463,8 @@ msgid "Time"
msgstr "Amser"
#: db/models/fields/__init__.py:1044
-#, fuzzy
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Rhowch amser ddilys mewn fformat HH:MM."
+msgstr ""
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -503,29 +474,27 @@ msgstr "URL"
msgid "XML text"
msgstr "Testun XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
-#, fuzzy
+#: db/models/fields/related.py:1023
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."
#: forms/fields.py:66
msgid "This field is required."
@@ -536,9 +505,8 @@ msgid "Enter a whole number."
msgstr "Rhowch rhif cyfan."
#: forms/fields.py:253 forms/fields.py:274
-#, fuzzy
msgid "Enter a number."
-msgstr "Rhowch rhif cyfan."
+msgstr ""
#: forms/fields.py:277
#, python-format
@@ -556,19 +524,16 @@ msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
#: forms/fields.py:342 forms/fields.py:918
-#, fuzzy
msgid "Enter a valid date."
-msgstr "Rhowch enw ffeil dilys."
+msgstr ""
#: forms/fields.py:370 forms/fields.py:919
-#, fuzzy
msgid "Enter a valid time."
-msgstr "Rhowch enw ffeil dilys."
+msgstr ""
#: forms/fields.py:396
-#, fuzzy
msgid "Enter a valid date/time."
-msgstr "Rhowch enw ffeil dilys."
+msgstr ""
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
@@ -601,60 +566,57 @@ msgstr ""
"neu roedd o'n ddelwedd llwgr."
#: forms/fields.py:650 forms/fields.py:725
-#, fuzzy, python-format
+#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Dewisiwch dewis dilys; dydy '%(data)s' dim mewn %(choices)s."
+msgstr ""
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
-#, fuzzy
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
-msgstr "Rhowch enw ffeil dilys."
+msgstr ""
-#: forms/formsets.py:308 forms/formsets.py:310
-#, fuzzy
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr "Trefn:"
+msgstr ""
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Dileu"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
-#, fuzzy
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Dewisiwch dewis dilys; dydy '%(data)s' dim mewn %(choices)s."
+msgstr ""
-#: forms/models.py:1019
-#, fuzzy, python-format
+#: forms/models.py:984
+#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Dewisiwch dewis dilys; dydy '%(data)s' dim mewn %(choices)s."
+msgstr ""
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
@@ -668,27 +630,26 @@ msgid "Change"
msgstr "Newidio"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "blwyddyn"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Ie"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Na"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ie,na,efallai"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -697,27 +658,27 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
msgstr ""
@@ -775,14 +736,12 @@ msgid "Sunday"
msgstr "Dydd Sul"
#: utils/dates.py:10
-#, fuzzy
msgid "Mon"
-msgstr "Dydd Llun"
+msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Tue"
-msgstr "Dydd Mawrth"
+msgstr ""
#: utils/dates.py:10
msgid "Wed"
@@ -793,18 +752,16 @@ msgid "Thu"
msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Fri"
-msgstr "Dydd Gwener"
+msgstr ""
#: utils/dates.py:11
msgid "Sat"
msgstr ""
#: utils/dates.py:11
-#, fuzzy
msgid "Sun"
-msgstr "Dydd Sul"
+msgstr ""
#: utils/dates.py:18
msgid "January"
@@ -855,9 +812,8 @@ msgid "December"
msgstr "Rhagfyr"
#: utils/dates.py:23
-#, fuzzy
msgid "jan"
-msgstr "ac"
+msgstr ""
#: utils/dates.py:23
msgid "feb"
@@ -872,9 +828,8 @@ msgid "apr"
msgstr ""
#: utils/dates.py:23
-#, fuzzy
msgid "may"
-msgstr "diwrnod"
+msgstr ""
#: utils/dates.py:23
msgid "jun"
@@ -907,139 +862,126 @@ msgstr ""
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Ion."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Chwe."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "Mawrth"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Ebrill"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "Mai"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Mehefin"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Gorffenaf"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Awst"
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Medi"
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Hyd."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Tach."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Rhag."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "Ionawr"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "Chwefror"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "Mawrth"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "Ebrill"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "Mai"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "Mehefin"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "Gorffenaf"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "Awst"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "Medi"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "Hydref"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "Tachwedd"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "Rhagfyr"
+msgstr ""
#: utils/text.py:136
-#, fuzzy
msgid "or"
-msgstr "awr"
+msgstr ""
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
@@ -1047,20 +989,18 @@ msgid ", "
msgstr ""
#: utils/timesince.py:21
-#, fuzzy
msgid "year"
msgid_plural "years"
-msgstr[0] "blwyddyn"
-msgstr[1] "blynyddoedd"
+msgstr[0] ""
+msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
#: utils/timesince.py:22
-#, fuzzy
msgid "month"
msgid_plural "months"
-msgstr[0] "mis"
-msgstr[1] "misoedd"
+msgstr[0] ""
+msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
@@ -1073,36 +1013,32 @@ msgstr[2] ""
msgstr[3] ""
#: utils/timesince.py:24
-#, fuzzy
msgid "day"
msgid_plural "days"
-msgstr[0] "diwrnod"
-msgstr[1] "diwrnodau"
+msgstr[0] ""
+msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
#: utils/timesince.py:25
-#, fuzzy
msgid "hour"
msgid_plural "hours"
-msgstr[0] "awr"
-msgstr[1] "oriau"
+msgstr[0] ""
+msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
#: utils/timesince.py:26
-#, fuzzy
msgid "minute"
msgid_plural "minutes"
-msgstr[0] "munud"
-msgstr[1] "munudau"
+msgstr[0] ""
+msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
#: utils/timesince.py:45
-#, fuzzy
msgid "minutes"
-msgstr "munud"
+msgstr ""
#: utils/timesince.py:50
#, python-format
@@ -1114,23 +1050,23 @@ msgstr ""
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr ""
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr ""
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr ""
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr ""
@@ -1145,6 +1081,58 @@ msgid "The %(verbose_name)s was updated successfully."
msgstr ""
#: views/generic/create_update.py:207
-#, fuzzy, python-format
+#, python-format
msgid "The %(verbose_name)s was deleted."
-msgstr "Y tîm %(site_name)s"
+msgstr ""
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/da/LC_MESSAGES/django.mo b/django/conf/locale/da/LC_MESSAGES/django.mo
index 5ba5ba2286..af96e75a31 100644
--- a/django/conf/locale/da/LC_MESSAGES/django.mo
+++ b/django/conf/locale/da/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/da/LC_MESSAGES/django.po b/django/conf/locale/da/LC_MESSAGES/django.po
index 7db5e4095a..1e5b46ddfe 100644
--- a/django/conf/locale/da/LC_MESSAGES/django.po
+++ b/django/conf/locale/da/LC_MESSAGES/django.po
@@ -1,18 +1,17 @@
-# Translation of django.po to Danish
# This file is distributed under the same license as the Django package.
#
-#
msgid ""
msgstr ""
-"Project-Id-Version: Django 1.0\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:56+0100\n"
-"PO-Revision-Date: 2010-02-20 20:41+0200\n"
-"Last-Translator: Finn Gruwier Larsen<finn@gruwier.dk>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2011-02-28 17:33+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: Danish <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
@@ -60,266 +59,268 @@ msgid "English"
msgstr "Engelsk"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Engelsk"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Spansk"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Argentisk spansk"
+msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Spansk"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estisk"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Baskisk"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Persisk"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finsk"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Fransk"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Frisisk"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irsk"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galicisk"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebræisk"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Kroatisk"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Ungarsk"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Makedonsk"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandsk"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italiensk"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japansk"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Georgisk"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Koreansk"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Litauisk"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Lettisk"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Makedonsk"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Malaga"
+msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Monaghan"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Hollandsk"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norsk"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Norsk"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Norsk"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Polsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugisisk"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Brasiliansk portugisisk"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Rumænsk"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slovakisk"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slovensk"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Albansk"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Serbisk (latin)"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Svensk"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Tyrkisk"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukrainsk"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vietnamesisk"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Forenklet kinesisk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Traditionelt kinesisk"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Indtast en gyldig værdi."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Indtast en gyldig URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Denne URL henviser ikke til en gyldig side eller fil."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Indtast en gyldig URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Indtast en gyldig e-mail-adresse."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Dette felt må kun indeholde bogstaver, cifre, understreger og bindestreger."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Indtast en gyldig IPv4-adresse."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Indtast kun cifre adskilt af kommaer."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Denne værdi skal være %(limit_value)s (den er %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Denne værdi skal være mindre end eller lig %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Denne værdi skal være større end eller lig %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -328,7 +329,7 @@ msgstr ""
"Denne værdi skal mindst indeholde %(limit_value)d tegn (den indeholder %"
"(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -337,17 +338,17 @@ msgstr ""
"Denne værdi må maksimalt indeholde %(limit_value)d tegn (den har %"
"(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s skal være unik for %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s med dette %(field_label)s eksisterer allerede."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "og"
@@ -430,7 +431,7 @@ msgid "E-mail address"
msgstr "E-mail-adresse"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Sti"
@@ -478,24 +479,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML-tekst"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "En model %(model)s med primærnøgle %(pk)r eksisterer ikke."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Fremmednøgle (type bestemt af relateret felt)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "En-til-en-relation"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Mange-til-mange-relation"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -577,29 +578,29 @@ msgstr ""
"Marker en gyldigt valgmulighed; '%(value)s' er ikke en af de tilgængelige "
"valgmuligheder."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Indtast en liste af værdier."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Rækkefølge"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Slet"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ret venligst duplikerede data for %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Ret venligst de duplikerede data for %(field)s, som skal være unik."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -608,93 +609,91 @@ msgstr ""
"Ret venligst de duplikerede data for %(field_name)s, som skal være unik for %"
"(lookup)s i %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Ret venligst de duplikerede data herunder."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Den indlejrede fremmednøgle passede ikke med forælderinstansens primærnøgle."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Marker en gyldig valgmulighed. Det valg, du har foretaget, er ikke blandt de "
"tilgængelige valgmuligheder."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
"Marker et gyldigt valg. %s er ikke en af de tilgængelige valgmuligheder."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" er ikke en gyldig værdi for en primærnøgle."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Nuværende:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Ret"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Ukendt"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nej"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ja,nej,måske"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -875,134 +874,122 @@ msgstr "dec"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Jan."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Feb."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "marts"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "april"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "maj"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "juni"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "juli"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Aug."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Sept."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Okt."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Nov."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Dec."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "januar"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "februar"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "marts"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "april"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "maj"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "juni"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "juli"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "august"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "september"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "oktober"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "november"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "december"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1063,23 +1050,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j. F Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. F Y H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1097,3 +1084,55 @@ msgstr "%(verbose_name)s blev opdateret."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s blev slettet."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s blev slettet."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s blev opdateret."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo
index df415deeca..05f7225885 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.mo
+++ b/django/conf/locale/de/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po
index 740ced8170..9ed208d2db 100644
--- a/django/conf/locale/de/LC_MESSAGES/django.po
+++ b/django/conf/locale/de/LC_MESSAGES/django.po
@@ -1,22 +1,17 @@
-# Translation of django.po to German
-#
-# Copyright (C) 2005-2009,
-# This file is distributed under the same license as the django package.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:56+0100\n"
-"PO-Revision-Date: 2010-10-10 00:58+0200\n"
-"Last-Translator: Jannis Leidel <jannis@leidel.info>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2011-02-28 17:33+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: jnns <jvajen@gmail.com>\n"
+"Language-Team: German <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: German\n"
-"X-Poedit-Country: GERMANY\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
@@ -76,250 +71,259 @@ msgid "Argentinian Spanish"
msgstr "Argentinisches Spanisch"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Argentinisches Spanisch"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estnisch"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Baskisch"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Persisch"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finnisch"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Französisch"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Friesisch"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irisch"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galicisch"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebräisch"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Kroatisch"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Ungarisch"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "Indonesisch"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Isländisch"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italienisch"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japanisch"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Georgisch"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Koreanisch"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Litauisch"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Lettisch"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Mazedonisch"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "Mongolisch"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Holländisch"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norwegisch"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Norwegisch (Bokmål)"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Norwegisch (Nynorsk)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Panjabi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Polnisch"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugiesisch"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Brasilianisches Portugiesisch"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Rumänisch"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Russisch"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slowakisch"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slowenisch"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Albanisch"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Serbisch"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Serbisch (Latein)"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Schwedisch"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamilisch"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telugisch"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Thailändisch"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Türkisch"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukrainisch"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vietnamesisch"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Vereinfachtes Chinesisch"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Traditionelles Chinesisch"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Bitte einen gültigen Wert eingeben."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Bitte eine gültige Adresse eingeben."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Diese Adresse scheint nicht gültig zu sein."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Bitte eine gültige Adresse eingeben."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Bitte eine gültige E-Mail-Adresse eingeben."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Bitte ein gültiges Kürzel, bestehend aus Buchstaben, Ziffern, Unterstrichen "
"und Bindestrichen, eingeben."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Bitte eine gültige IPv4-Adresse eingeben."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Bitte nur durch Komma getrennte Ziffern eingeben."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Bitte sicherstellen, dass der Wert %(limit_value)s ist. (Er ist %(show_value)"
"s)"
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Dieser Wert muss kleiner oder gleich %(limit_value)s sein."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Dieser Wert muss größer oder gleich %(limit_value)s sein."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -328,7 +332,7 @@ msgstr ""
"Bitte sicherstellen, dass der Wert mindestens %(limit_value)d Zeichen hat. "
"(Er hat %(show_value)d)"
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -337,17 +341,17 @@ msgstr ""
"Bitte sicherstellen, dass der Wert maximal %(limit_value)d Zeichen hat. (Er "
"hat %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s muss für %(date_field)s %(lookup)s eindeutig sein."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s mit diesem %(field_label)s existiert bereits."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "und"
@@ -432,7 +436,7 @@ msgid "E-mail address"
msgstr "E-Mail-Adresse"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Dateipfad"
@@ -480,24 +484,24 @@ msgstr "Adresse (URL)"
msgid "XML text"
msgstr "XML-Text"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Modell %(model)s mit dem Primärschlüssel %(pk)r ist nicht vorhanden."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Fremdschlüssel (Typ definiert durch verknüpftes Feld)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "One-to-one-Beziehung"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Many-to-many-Beziehung"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -584,30 +588,30 @@ msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Bitte eine gültige Auswahl treffen. %(value)s ist keine gültige Auswahl."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Bitte eine Liste mit Werten eingeben."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Reihenfolge"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Löschen"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Bitte die doppelten Daten für %(field)s korrigieren."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Bitte die doppelten Daten für %(field)s korrigieren, das eindeutig sein muss."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -616,26 +620,26 @@ msgstr ""
"Bitte die doppelten Daten für %(field_name)s korrigieren, da es für %(lookup)"
"s in %(date_field)s eindeutig sein muss."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Bitte die unten aufgeführten doppelten Werte korrigieren."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Der Inline-Fremdschlüssel passt nicht zum Primärschlüssel der übergeordneten "
"Instanz."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Bitte eine gültige Auswahl treffen. Dies ist keine gültige Auswahl."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Bitte eine gültige Auswahl treffen. %s ist keine gültige Auswahl."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" ist kein gültiger Wert für einen Primärschlüssel."
@@ -652,50 +656,50 @@ msgstr "Ändern"
msgid "Clear"
msgstr "Zurücksetzen"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Unbekannt"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nein"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "Ja,Nein,Vielleicht"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d Byte"
msgstr[1] "%(size)d Bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
msgstr "%s PB"
@@ -937,73 +941,61 @@ msgid "Dec."
msgstr "Dez."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "Januar"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "Februar"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "März"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "April"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "Mai"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "Juni"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "Juli"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "August"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "September"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "Oktober"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "November"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "Dezember"
@@ -1015,7 +1007,7 @@ msgstr "oder"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1067,23 +1059,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j. N Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. N Y, H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1101,3 +1093,55 @@ msgstr "%(verbose_name)s wurde erfolgreich aktualisiert."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s wurde gelöscht."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s wurde gelöscht."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s wurde erfolgreich aktualisiert."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/el/LC_MESSAGES/django.mo b/django/conf/locale/el/LC_MESSAGES/django.mo
index 49d708152b..e24d844495 100644
--- a/django/conf/locale/el/LC_MESSAGES/django.mo
+++ b/django/conf/locale/el/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/el/LC_MESSAGES/django.po b/django/conf/locale/el/LC_MESSAGES/django.po
index 8ef180e70e..657d2927a4 100644
--- a/django/conf/locale/el/LC_MESSAGES/django.po
+++ b/django/conf/locale/el/LC_MESSAGES/django.po
@@ -1,38 +1,34 @@
-# translation of django.po to el
-# Copyright (C) 2006 and beyond
-# This file is distributed under the same license as the DJANGO package.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:57+0100\n"
-"PO-Revision-Date: 2007-09-03 04:19+0100\n"
-"Last-Translator: Dimitris Glezos <dimitris@glezos.com>\n"
-"Language-Team: el <fedora-trans-el@redhat.com>\n"
+"POT-Creation-Date: 2011-02-28 17:33+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: glezos <glezos@indifex.com>\n"
+"Language-Team: Greek <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: el\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
msgstr "Αραβικά"
#: conf/global_settings.py:45
-#, fuzzy
msgid "Bulgarian"
-msgstr "Ουγγρικά"
+msgstr "Βουλγαρικά"
#: conf/global_settings.py:46
msgid "Bengali"
msgstr "Μπενγκάλι"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "Ρουμανικά"
+msgstr "Βοσνιακά"
#: conf/global_settings.py:48
msgid "Catalan"
@@ -63,322 +59,307 @@ msgid "English"
msgstr "Αγγλικά"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Αγγλικά"
+msgstr "Αγγλικά Βρετανίας"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Ισπανικά"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "Ισπανικά Αργεντινής"
#: conf/global_settings.py:58
#, fuzzy
-msgid "Estonian"
-msgstr "Ρουμανικά"
+msgid "Mexican Spanish"
+msgstr "Ισπανικά Αργεντινής"
#: conf/global_settings.py:59
+msgid "Estonian"
+msgstr "Εσθονικά"
+
+#: conf/global_settings.py:60
msgid "Basque"
msgstr ""
-#: conf/global_settings.py:60
-#, fuzzy
+#: conf/global_settings.py:61
msgid "Persian"
-msgstr "Σερβικά"
+msgstr "Περσικά"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Φινλανδικά"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Γαλλικά"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "Βραζιλιάνικα"
+msgstr ""
-#: conf/global_settings.py:64
-#, fuzzy
+#: conf/global_settings.py:65
msgid "Irish"
-msgstr "Τουρκικά"
+msgstr "Ιρλανδικά"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr ""
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Εβραϊκά"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
-msgstr ""
+msgstr "Ινδικά"
-#: conf/global_settings.py:68
-#, fuzzy
+#: conf/global_settings.py:69
msgid "Croatian"
-msgstr "Καταλανικά"
+msgstr "Κροατικά"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Ουγγρικά"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Μακεδονικά"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Ισλανδικά"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Ιταλικά"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Γιαπωνέζικα"
-#: conf/global_settings.py:74
-#, fuzzy
-msgid "Georgian"
-msgstr "Γερμανικά"
-
#: conf/global_settings.py:75
-msgid "Khmer"
+msgid "Georgian"
msgstr ""
#: conf/global_settings.py:76
-msgid "Kannada"
+msgid "Khmer"
msgstr ""
#: conf/global_settings.py:77
-#, fuzzy
-msgid "Korean"
-msgstr "Νορβηγικά"
+msgid "Kannada"
+msgstr "Κανάντα"
#: conf/global_settings.py:78
+msgid "Korean"
+msgstr "Κορεάτικα"
+
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Μακεδονικά"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Μακεδονικά"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Ολλανδικά"
-#: conf/global_settings.py:84
-msgid "Norwegian"
-msgstr "Νορβηγικά"
-
#: conf/global_settings.py:85
-#, fuzzy
-msgid "Norwegian Bokmal"
+msgid "Norwegian"
msgstr "Νορβηγικά"
#: conf/global_settings.py:86
-#, fuzzy
-msgid "Norwegian Nynorsk"
-msgstr "Νορβηγικά"
+msgid "Norwegian Bokmal"
+msgstr ""
#: conf/global_settings.py:87
-msgid "Punjabi"
+msgid "Norwegian Nynorsk"
msgstr ""
#: conf/global_settings.py:88
+msgid "Punjabi"
+msgstr "Πουντζάμπι"
+
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Πολωνικά"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Πορτογαλικά"
-#: conf/global_settings.py:90
-#, fuzzy
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
-msgstr "Πορτογαλικά"
+msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Ρουμανικά"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Ρωσικά"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Σλοβακικά"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Σλοβενικά"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Ρουμανικά"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Σερβικά"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "Σερβικά"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Σουηδικά"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Ταμιλικά"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "Ταμιλικά"
+msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Τουρκικά"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ουκρανικά"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "όνομα"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Απλοποιημένα Κινέζικα"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Παραδοσιακά Κινέζικα"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Εισάγετε μια έγκυρη τιμή."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Εισάγετε ένα έγκυρο URL."
-
#: core/validators.py:89 forms/fields.py:575
-#, fuzzy
msgid "This URL appears to be a broken link."
-msgstr "Το URL %s είναι χαλασμένος σύνδεσμος."
+msgstr "Αυτό το URL φαίνεται να είναι ένας χαλασμένος σύνδεσμος."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Εισάγετε ένα έγκυρο URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Εισάγετε μια έγκυρη διεύθυνση ηλ. ταχυδρομείου."
-#: core/validators.py:123 forms/fields.py:958
-#, fuzzy
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"Αυτή η τιμή πρέπει να περιέχει μόνο γράμματα, αριθμούς, υπογεγραμμένες, "
-"παύλες ή καθέτους."
+"Ένα έγκυρο 'slug' αποτελείται από γράμματα, αριθμούς, παύλες ή κάτω παύλες."
-#: core/validators.py:126 forms/fields.py:951
-#, fuzzy
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
-msgstr "Εισάγετε μια έγκυρη διεύθυνση ηλ. ταχυδρομείου."
+msgstr "Εισάγετε μια έγκυρη διεύθυνση IPv4."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Εισάγετε μόνο ψηφία χωρισμένα με κόμματα."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "Βεβαιωθείτε ότι το κείμενο σας έχει μέγεθος τουλάχιστον %d χαρακτήρες."
+msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "τιμή a από."
+msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "τιμή a από."
+msgstr ""
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "Βεβαιωθείτε ότι το κείμενο σας έχει μέγεθος τουλάχιστον %d χαρακτήρες."
+msgstr ""
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "Βεβαιωθείτε ότι το κείμενο σας έχει μέγεθος το πολύ %d χαρακτήρες."
+msgstr ""
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "πεδίο πεδίο είναι τιμή"
+msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
-#, fuzzy, python-format
+#: db/models/base.py:784 db/models/base.py:792
+#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "με."
+msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "και"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "Η τιμή %r δεν είναι έγκυρη επιλογή."
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
msgstr "Αυτό το πεδίο δεν μπορεί να είναι κενό (null)."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Αυτό το πεδίο δεν μπορεί να είναι κενό (null)."
+msgstr "Το πεδίο αυτό δεν μπορεί να είναι κενό."
#: db/models/fields/__init__.py:70
#, python-format
@@ -404,9 +385,9 @@ msgid "Boolean (Either True or False)"
msgstr "Boolean (Είτε Αληθές ή Ψευδές)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
-#, fuzzy, python-format
+#, python-format
msgid "String (up to %(max_length)s)"
-msgstr "Συμβολοσειρά (μέχρι %(maxlength)s χαρακτήρες)"
+msgstr "Συμβολοσειρά (μέχρι %(max_length)s)"
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
@@ -421,23 +402,21 @@ msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "Εισάγετε μία έγκυρη ημερομηνία στη μορφή ΧΧΧΧ-MM-ΗΗ."
#: db/models/fields/__init__.py:589
-#, fuzzy, python-format
+#, python-format
msgid "Invalid date: %s"
-msgstr "Μη έγκυρο URL: %s"
+msgstr "Άκυρη ημερομηνία: %s"
#: db/models/fields/__init__.py:670
-#, fuzzy
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Εισάγετε μία έγκυρη ημερομηνία/ώρα στη μορφή ΧΧΧΧ-MM-ΗΗ ΩΩ:ΛΛ."
+msgstr ""
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
msgstr "Ημερομηνία (με την ώρα)"
#: db/models/fields/__init__.py:746
-#, fuzzy
msgid "This value must be a decimal number."
-msgstr "Αυτή η τιμή πρέπει να είναι ένας ακέραιος."
+msgstr "Η τιμή αυτή πρέπει να είναι δεκαδικός αριθμός."
#: db/models/fields/__init__.py:748
msgid "Decimal number"
@@ -448,18 +427,17 @@ msgid "E-mail address"
msgstr "Ηλεκτρονική διεύθυνση"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Τοποθεσία αρχείου"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "Αυτή η τιμή πρέπει να είναι τουλάχιστον %s."
+msgstr "Η τιμή αυτή πρέπει να είναι αριθμός κινητής υποδιαστολής."
#: db/models/fields/__init__.py:843
msgid "Floating point number"
-msgstr ""
+msgstr "Αριθμός κινητής υποδιαστολής"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
@@ -470,9 +448,8 @@ msgid "IP address"
msgstr "διεύθυνση IP"
#: db/models/fields/__init__.py:931
-#, fuzzy
msgid "This value must be either None, True or False."
-msgstr "Αυτή η τιμή πρέπει να είναι Αληθές ή Ψευδές."
+msgstr ""
#: db/models/fields/__init__.py:933
msgid "Boolean (Either True, False or None)"
@@ -487,9 +464,8 @@ msgid "Time"
msgstr "Ώρα"
#: db/models/fields/__init__.py:1044
-#, fuzzy
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Εισάγετε μία έγκυρη ώρα στη μορφή ΩΩ-ΛΛ."
+msgstr ""
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -499,28 +475,27 @@ msgstr "URL"
msgid "XML text"
msgstr "Κείμενο XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "Σχέση ένα-προς-ένα"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "Σχέση πολλά-προς-πολλά"
-#: db/models/fields/related.py:1010
-#, fuzzy
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr "Αναμονή Έλεγχος ή Εντολή ενεργό a επιλογή περισσότερα ένα."
+msgstr ""
#: forms/fields.py:66
msgid "This field is required."
@@ -531,9 +506,8 @@ msgid "Enter a whole number."
msgstr "Εισάγετε έναν ακέραιο αριθμό."
#: forms/fields.py:253 forms/fields.py:274
-#, fuzzy
msgid "Enter a number."
-msgstr "Εισάγετε έναν ακέραιο αριθμό."
+msgstr "Εισάγετε έναν αριθμό."
#: forms/fields.py:277
#, python-format
@@ -565,153 +539,147 @@ msgstr "Εισάγετε μια έγκυρη ημερομηνία/ώρα."
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
msgstr ""
+"Δεν έχει υποβληθεί κάποιο αρχείο. Ελέγξτε τον τύπο κωδικοποίησης στη φόρμα."
#: forms/fields.py:461
msgid "No file was submitted."
-msgstr ""
+msgstr "Δεν έχει υποβληθεί κάποιο αρχείο."
#: forms/fields.py:462
msgid "The submitted file is empty."
msgstr "Το αρχείο που υποβλήθηκε είναι κενό."
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "Βεβαιωθείτε ότι το κείμενο σας έχει μέγεθος το πολύ %d χαρακτήρες."
+msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
#: forms/fields.py:518
-#, fuzzy
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
-msgstr "a εικόνα αρχείο υποφαινόμενο όχι εικόνα ή a εικόνα."
+msgstr ""
#: forms/fields.py:650 forms/fields.py:725
-#, fuzzy, python-format
+#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Επιλέξτε μια έγκυρη επιλογή; Το '%(data)s' δεν είναι στα %(choices)s."
+msgstr ""
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
-#, fuzzy
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
-msgstr "Εισάγετε ένα έγκυρο όνομα αρχείου."
+msgstr "Εισάγετε μια λίστα τιμών."
-#: forms/formsets.py:308 forms/formsets.py:310
-#, fuzzy
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr "Ταξινόμηση:"
+msgstr "Ταξινόμηση"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Διαγραφή"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Παρακαλούμε διορθώστε το παρακάτω λάθος."
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "Παρακαλούμε διορθώστε το παρακάτω λάθος."
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
-#, fuzzy
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Επιλέξτε μια έγκυρη επιλογή; Το '%(data)s' δεν είναι στα %(choices)s."
+msgstr ""
-#: forms/models.py:1019
-#, fuzzy, python-format
+#: forms/models.py:984
+#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Επιλέξτε μια έγκυρη επιλογή; Το '%(data)s' δεν είναι στα %(choices)s."
+msgstr ""
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Τρέχουσα:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Επεξεργασία"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "χρόνος"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Άγνωστο"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Ναι"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Όχι"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ναι,όχι,ίσως"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr ""
+msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr ""
+msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr ""
+msgstr "%s GB"
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
-msgstr ""
+msgstr "%s TB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
-msgstr ""
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -766,36 +734,32 @@ msgid "Sunday"
msgstr "Κυριακή"
#: utils/dates.py:10
-#, fuzzy
msgid "Mon"
-msgstr "Δευτέρα"
+msgstr "Δευ"
#: utils/dates.py:10
-#, fuzzy
msgid "Tue"
-msgstr "Τρίτη"
+msgstr "Τρί"
#: utils/dates.py:10
msgid "Wed"
-msgstr ""
+msgstr "Τετ"
#: utils/dates.py:10
msgid "Thu"
-msgstr ""
+msgstr "Πέμ"
#: utils/dates.py:10
-#, fuzzy
msgid "Fri"
-msgstr "Παρασκευή"
+msgstr "Παρ"
#: utils/dates.py:11
msgid "Sat"
-msgstr ""
+msgstr "Σαβ"
#: utils/dates.py:11
-#, fuzzy
msgid "Sun"
-msgstr "Κυριακή"
+msgstr "Κυρ"
#: utils/dates.py:18
msgid "January"
@@ -896,7 +860,7 @@ msgstr "Δεκ"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Ιάν."
+msgstr "Ιαν."
#: utils/dates.py:32
msgctxt "abbrev. month"
@@ -911,7 +875,7 @@ msgstr "Μάρτιος"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Απρίλιος"
+msgstr "Απρίλ."
#: utils/dates.py:35
msgctxt "abbrev. month"
@@ -921,12 +885,12 @@ msgstr "Μάιος"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Ιούνιος"
+msgstr "Ιούν."
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Ιούλιος"
+msgstr "Ιούλ."
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -946,7 +910,7 @@ msgstr "Οκτ."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Νοέ."
+msgstr "Νοέμ."
#: utils/dates.py:42
msgctxt "abbrev. month"
@@ -1014,14 +978,13 @@ msgid "December"
msgstr "Δεκεμβρίου"
#: utils/text.py:136
-#, fuzzy
msgid "or"
-msgstr "ώρα"
+msgstr "ή"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1060,9 +1023,8 @@ msgstr[0] "λεπτό"
msgstr[1] "λεπτά"
#: utils/timesince.py:45
-#, fuzzy
msgid "minutes"
-msgstr "λεπτό"
+msgstr "λεπτά"
#: utils/timesince.py:50
#, python-format
@@ -1074,37 +1036,89 @@ msgstr ""
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j N Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j N Y, P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
#: views/generic/create_update.py:121
-#, fuzzy, python-format
+#, python-format
msgid "The %(verbose_name)s was created successfully."
-msgstr "Το %(name)s \"%(obj)s\" αλλάχτηκε με επιτυχία."
+msgstr ""
#: views/generic/create_update.py:164
-#, fuzzy, python-format
+#, python-format
msgid "The %(verbose_name)s was updated successfully."
-msgstr "Το %(name)s \"%(obj)s\" διαγράφηκε με επιτυχία."
+msgstr ""
#: views/generic/create_update.py:207
-#, fuzzy, python-format
+#, python-format
msgid "The %(verbose_name)s was deleted."
-msgstr "Το %(name)s \"%(obj)s\" διαγράφηκε με επιτυχία."
+msgstr ""
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo
index 568f46ddeb..d25437cb06 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po
index aa36b21935..2ec55012a8 100644
--- a/django/conf/locale/en/LC_MESSAGES/django.po
+++ b/django/conf/locale/en/LC_MESSAGES/django.po
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:57+0100\n"
+"POT-Creation-Date: 2011-02-28 17:33+0100\n"
"PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n"
@@ -69,270 +69,278 @@ msgid "Argentinian Spanish"
msgstr ""
#: conf/global_settings.py:58
-msgid "Estonian"
+msgid "Mexican Spanish"
msgstr ""
#: conf/global_settings.py:59
-msgid "Basque"
+msgid "Estonian"
msgstr ""
#: conf/global_settings.py:60
-msgid "Persian"
+msgid "Basque"
msgstr ""
#: conf/global_settings.py:61
-msgid "Finnish"
+msgid "Persian"
msgstr ""
#: conf/global_settings.py:62
-msgid "French"
+msgid "Finnish"
msgstr ""
#: conf/global_settings.py:63
-msgid "Frisian"
+msgid "French"
msgstr ""
#: conf/global_settings.py:64
-msgid "Irish"
+msgid "Frisian"
msgstr ""
#: conf/global_settings.py:65
-msgid "Galician"
+msgid "Irish"
msgstr ""
#: conf/global_settings.py:66
-msgid "Hebrew"
+msgid "Galician"
msgstr ""
#: conf/global_settings.py:67
-msgid "Hindi"
+msgid "Hebrew"
msgstr ""
#: conf/global_settings.py:68
-msgid "Croatian"
+msgid "Hindi"
msgstr ""
#: conf/global_settings.py:69
-msgid "Hungarian"
+msgid "Croatian"
msgstr ""
#: conf/global_settings.py:70
-msgid "Indonesian"
+msgid "Hungarian"
msgstr ""
#: conf/global_settings.py:71
-msgid "Icelandic"
+msgid "Indonesian"
msgstr ""
#: conf/global_settings.py:72
-msgid "Italian"
+msgid "Icelandic"
msgstr ""
#: conf/global_settings.py:73
-msgid "Japanese"
+msgid "Italian"
msgstr ""
#: conf/global_settings.py:74
-msgid "Georgian"
+msgid "Japanese"
msgstr ""
#: conf/global_settings.py:75
-msgid "Khmer"
+msgid "Georgian"
msgstr ""
#: conf/global_settings.py:76
-msgid "Kannada"
+msgid "Khmer"
msgstr ""
#: conf/global_settings.py:77
-msgid "Korean"
+msgid "Kannada"
msgstr ""
#: conf/global_settings.py:78
-msgid "Lithuanian"
+msgid "Korean"
msgstr ""
#: conf/global_settings.py:79
-msgid "Latvian"
+msgid "Lithuanian"
msgstr ""
#: conf/global_settings.py:80
-msgid "Macedonian"
+msgid "Latvian"
msgstr ""
#: conf/global_settings.py:81
-msgid "Malayalam"
+msgid "Macedonian"
msgstr ""
#: conf/global_settings.py:82
-msgid "Mongolian"
+msgid "Malayalam"
msgstr ""
#: conf/global_settings.py:83
-msgid "Dutch"
+msgid "Mongolian"
msgstr ""
#: conf/global_settings.py:84
-msgid "Norwegian"
+msgid "Dutch"
msgstr ""
#: conf/global_settings.py:85
-msgid "Norwegian Bokmal"
+msgid "Norwegian"
msgstr ""
#: conf/global_settings.py:86
-msgid "Norwegian Nynorsk"
+msgid "Norwegian Bokmal"
msgstr ""
#: conf/global_settings.py:87
-msgid "Punjabi"
+msgid "Norwegian Nynorsk"
msgstr ""
#: conf/global_settings.py:88
-msgid "Polish"
+msgid "Punjabi"
msgstr ""
#: conf/global_settings.py:89
-msgid "Portuguese"
+msgid "Polish"
msgstr ""
#: conf/global_settings.py:90
-msgid "Brazilian Portuguese"
+msgid "Portuguese"
msgstr ""
#: conf/global_settings.py:91
-msgid "Romanian"
+msgid "Brazilian Portuguese"
msgstr ""
#: conf/global_settings.py:92
-msgid "Russian"
+msgid "Romanian"
msgstr ""
#: conf/global_settings.py:93
-msgid "Slovak"
+msgid "Russian"
msgstr ""
#: conf/global_settings.py:94
-msgid "Slovenian"
+msgid "Slovak"
msgstr ""
#: conf/global_settings.py:95
-msgid "Albanian"
+msgid "Slovenian"
msgstr ""
#: conf/global_settings.py:96
-msgid "Serbian"
+msgid "Albanian"
msgstr ""
#: conf/global_settings.py:97
-msgid "Serbian Latin"
+msgid "Serbian"
msgstr ""
#: conf/global_settings.py:98
-msgid "Swedish"
+msgid "Serbian Latin"
msgstr ""
#: conf/global_settings.py:99
-msgid "Tamil"
+msgid "Swedish"
msgstr ""
#: conf/global_settings.py:100
-msgid "Telugu"
+msgid "Tamil"
msgstr ""
#: conf/global_settings.py:101
-msgid "Thai"
+msgid "Telugu"
msgstr ""
#: conf/global_settings.py:102
-msgid "Turkish"
+msgid "Thai"
msgstr ""
#: conf/global_settings.py:103
-msgid "Ukrainian"
+msgid "Turkish"
msgstr ""
#: conf/global_settings.py:104
-msgid "Vietnamese"
+msgid "Ukrainian"
msgstr ""
#: conf/global_settings.py:105
-msgid "Simplified Chinese"
+msgid "Urdu"
msgstr ""
#: conf/global_settings.py:106
-msgid "Traditional Chinese"
+msgid "Vietnamese"
msgstr ""
-#: core/validators.py:20 forms/fields.py:67
-msgid "Enter a valid value."
+#: conf/global_settings.py:107
+msgid "Simplified Chinese"
msgstr ""
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
+#: conf/global_settings.py:108
+msgid "Traditional Chinese"
+msgstr ""
+
+#: core/validators.py:21 forms/fields.py:67
+msgid "Enter a valid value."
msgstr ""
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr ""
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr ""
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr ""
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr ""
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr ""
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr ""
@@ -415,7 +423,7 @@ msgid "E-mail address"
msgstr ""
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr ""
@@ -463,24 +471,24 @@ msgstr ""
msgid "XML text"
msgstr ""
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -557,53 +565,53 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr ""
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr ""
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr ""
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
@@ -620,50 +628,50 @@ msgstr ""
msgid "Clear"
msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr ""
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr ""
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
msgstr ""
@@ -1023,23 +1031,23 @@ msgstr ""
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "N j, Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "N j, Y, P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
@@ -1057,3 +1065,55 @@ msgstr ""
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr ""
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr ""
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr ""
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/en_GB/LC_MESSAGES/django.mo b/django/conf/locale/en_GB/LC_MESSAGES/django.mo
index e786261b5d..f1b197c6b3 100644
--- a/django/conf/locale/en_GB/LC_MESSAGES/django.mo
+++ b/django/conf/locale/en_GB/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/en_GB/LC_MESSAGES/django.po b/django/conf/locale/en_GB/LC_MESSAGES/django.po
index 87f6c47a6a..8300ea4943 100644
--- a/django/conf/locale/en_GB/LC_MESSAGES/django.po
+++ b/django/conf/locale/en_GB/LC_MESSAGES/django.po
@@ -4,1056 +4,1131 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:57+0100\n"
-"PO-Revision-Date: 2010-03-25 08:00+1000\n"
-"Last-Translator: Simon Meers <DrMeers@gmail.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2011-02-28 17:33+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: jon_atkinson <jon@jonatkinson.co.uk>\n"
+"Language-Team: English (United Kingdom) <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
-msgstr ""
+msgstr "Arabic"
#: conf/global_settings.py:45
msgid "Bulgarian"
-msgstr ""
+msgstr "Bulgarian"
#: conf/global_settings.py:46
msgid "Bengali"
-msgstr ""
+msgstr "Bengali"
#: conf/global_settings.py:47
msgid "Bosnian"
-msgstr ""
+msgstr "Bosnian"
#: conf/global_settings.py:48
msgid "Catalan"
-msgstr ""
+msgstr "Catalan"
#: conf/global_settings.py:49
msgid "Czech"
-msgstr ""
+msgstr "Czech"
#: conf/global_settings.py:50
msgid "Welsh"
-msgstr ""
+msgstr "Welsh"
#: conf/global_settings.py:51
msgid "Danish"
-msgstr ""
+msgstr "Danish"
#: conf/global_settings.py:52
msgid "German"
-msgstr ""
+msgstr "German"
#: conf/global_settings.py:53
msgid "Greek"
-msgstr ""
+msgstr "Greek"
#: conf/global_settings.py:54
msgid "English"
-msgstr ""
+msgstr "English"
#: conf/global_settings.py:55
msgid "British English"
-msgstr ""
+msgstr "British English"
#: conf/global_settings.py:56
msgid "Spanish"
-msgstr ""
+msgstr "Spanish"
#: conf/global_settings.py:57
msgid "Argentinian Spanish"
-msgstr ""
+msgstr "Argentinian Spanish"
#: conf/global_settings.py:58
-msgid "Estonian"
-msgstr ""
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Argentinian Spanish"
#: conf/global_settings.py:59
-msgid "Basque"
-msgstr ""
+msgid "Estonian"
+msgstr "Estonian"
#: conf/global_settings.py:60
-msgid "Persian"
-msgstr ""
+msgid "Basque"
+msgstr "Basque"
#: conf/global_settings.py:61
-msgid "Finnish"
-msgstr ""
+msgid "Persian"
+msgstr "Persian"
#: conf/global_settings.py:62
-msgid "French"
-msgstr ""
+msgid "Finnish"
+msgstr "Finnish"
#: conf/global_settings.py:63
-msgid "Frisian"
-msgstr ""
+msgid "French"
+msgstr "French"
#: conf/global_settings.py:64
-msgid "Irish"
-msgstr ""
+msgid "Frisian"
+msgstr "Frisian"
#: conf/global_settings.py:65
-msgid "Galician"
-msgstr ""
+msgid "Irish"
+msgstr "Irish"
#: conf/global_settings.py:66
-msgid "Hebrew"
-msgstr ""
+msgid "Galician"
+msgstr "Galician"
#: conf/global_settings.py:67
-msgid "Hindi"
-msgstr ""
+msgid "Hebrew"
+msgstr "Hebrew"
#: conf/global_settings.py:68
-msgid "Croatian"
-msgstr ""
+msgid "Hindi"
+msgstr "Hindi"
#: conf/global_settings.py:69
-msgid "Hungarian"
-msgstr ""
+msgid "Croatian"
+msgstr "Croatian"
#: conf/global_settings.py:70
-msgid "Indonesian"
-msgstr ""
+msgid "Hungarian"
+msgstr "Hungarian"
#: conf/global_settings.py:71
-msgid "Icelandic"
-msgstr ""
+msgid "Indonesian"
+msgstr "Indonesian"
#: conf/global_settings.py:72
-msgid "Italian"
-msgstr ""
+msgid "Icelandic"
+msgstr "Icelandic"
#: conf/global_settings.py:73
-msgid "Japanese"
-msgstr ""
+msgid "Italian"
+msgstr "Italian"
#: conf/global_settings.py:74
-msgid "Georgian"
-msgstr ""
+msgid "Japanese"
+msgstr "Japanese"
#: conf/global_settings.py:75
-msgid "Khmer"
-msgstr ""
+msgid "Georgian"
+msgstr "Georgian"
#: conf/global_settings.py:76
-msgid "Kannada"
-msgstr ""
+msgid "Khmer"
+msgstr "Khmer"
#: conf/global_settings.py:77
-msgid "Korean"
-msgstr ""
+msgid "Kannada"
+msgstr "Kannada"
#: conf/global_settings.py:78
-msgid "Lithuanian"
-msgstr ""
+msgid "Korean"
+msgstr "Korean"
#: conf/global_settings.py:79
-msgid "Latvian"
-msgstr ""
+msgid "Lithuanian"
+msgstr "Lithuanian"
#: conf/global_settings.py:80
-msgid "Macedonian"
-msgstr ""
+msgid "Latvian"
+msgstr "Latvian"
#: conf/global_settings.py:81
-msgid "Malayalam"
-msgstr ""
+msgid "Macedonian"
+msgstr "Macedonian"
#: conf/global_settings.py:82
-msgid "Mongolian"
-msgstr ""
+msgid "Malayalam"
+msgstr "Malayalam"
#: conf/global_settings.py:83
-msgid "Dutch"
-msgstr ""
+msgid "Mongolian"
+msgstr "Mongolian"
#: conf/global_settings.py:84
-msgid "Norwegian"
-msgstr ""
+msgid "Dutch"
+msgstr "Dutch"
#: conf/global_settings.py:85
-msgid "Norwegian Bokmal"
-msgstr ""
+msgid "Norwegian"
+msgstr "Norwegian"
#: conf/global_settings.py:86
-msgid "Norwegian Nynorsk"
-msgstr ""
+msgid "Norwegian Bokmal"
+msgstr "Norwegian Bokmal"
#: conf/global_settings.py:87
-msgid "Punjabi"
-msgstr ""
+msgid "Norwegian Nynorsk"
+msgstr "Norwegian Nynorsk"
#: conf/global_settings.py:88
-msgid "Polish"
-msgstr ""
+msgid "Punjabi"
+msgstr "Punjabi"
#: conf/global_settings.py:89
-msgid "Portuguese"
-msgstr ""
+msgid "Polish"
+msgstr "Polish"
#: conf/global_settings.py:90
-msgid "Brazilian Portuguese"
-msgstr ""
+msgid "Portuguese"
+msgstr "Portuguese"
#: conf/global_settings.py:91
-msgid "Romanian"
-msgstr ""
+msgid "Brazilian Portuguese"
+msgstr "Brazilian Portuguese"
#: conf/global_settings.py:92
-msgid "Russian"
-msgstr ""
+msgid "Romanian"
+msgstr "Romanian"
#: conf/global_settings.py:93
-msgid "Slovak"
-msgstr ""
+msgid "Russian"
+msgstr "Russian"
#: conf/global_settings.py:94
-msgid "Slovenian"
-msgstr ""
+msgid "Slovak"
+msgstr "Slovak"
#: conf/global_settings.py:95
-msgid "Albanian"
-msgstr ""
+msgid "Slovenian"
+msgstr "Slovenian"
#: conf/global_settings.py:96
-msgid "Serbian"
-msgstr ""
+msgid "Albanian"
+msgstr "Albanian"
#: conf/global_settings.py:97
-msgid "Serbian Latin"
-msgstr ""
+msgid "Serbian"
+msgstr "Serbian"
#: conf/global_settings.py:98
-msgid "Swedish"
-msgstr ""
+msgid "Serbian Latin"
+msgstr "Serbian Latin"
#: conf/global_settings.py:99
-msgid "Tamil"
-msgstr ""
+msgid "Swedish"
+msgstr "Swedish"
#: conf/global_settings.py:100
-msgid "Telugu"
-msgstr ""
+msgid "Tamil"
+msgstr "Tamil"
#: conf/global_settings.py:101
-msgid "Thai"
-msgstr ""
+msgid "Telugu"
+msgstr "Telugu"
#: conf/global_settings.py:102
-msgid "Turkish"
-msgstr ""
+msgid "Thai"
+msgstr "Thai"
#: conf/global_settings.py:103
-msgid "Ukrainian"
-msgstr ""
+msgid "Turkish"
+msgstr "Turkish"
#: conf/global_settings.py:104
-msgid "Vietnamese"
-msgstr ""
+msgid "Ukrainian"
+msgstr "Ukrainian"
#: conf/global_settings.py:105
-msgid "Simplified Chinese"
+msgid "Urdu"
msgstr ""
#: conf/global_settings.py:106
+msgid "Vietnamese"
+msgstr "Vietnamese"
+
+#: conf/global_settings.py:107
+msgid "Simplified Chinese"
+msgstr "Simplified Chinese"
+
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
-msgstr ""
+msgstr "Traditional Chinese"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
-msgstr ""
-
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr ""
+msgstr "Enter a valid value."
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
-msgstr ""
+msgstr "This URL appears to be a broken link."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Enter a valid URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
-msgstr ""
+msgstr "Enter a valid e-mail address."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
-msgstr ""
+msgstr "Enter a valid IPv4 address."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
-msgstr ""
+msgstr "Enter only digits separated by commas."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr ""
+msgstr "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr ""
+msgstr "Ensure this value is less than or equal to %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr ""
+msgstr "Ensure this value is greater than or equal to %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
+"Ensure this value has at least %(limit_value)d characters (it has %"
+"(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
+"Ensure this value has at most %(limit_value)d characters (it has %"
+"(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
+msgstr "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr ""
+msgstr "%(model_name)s with this %(field_label)s already exists."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
-msgstr ""
+msgstr "and"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "Value %r is not a valid choice."
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
-msgstr ""
+msgstr "This field cannot be null."
#: db/models/fields/__init__.py:65
msgid "This field cannot be blank."
-msgstr ""
+msgstr "This field cannot be blank."
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "Field of type: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
#: db/models/fields/__init__.py:1018
msgid "Integer"
-msgstr ""
+msgstr "Integer"
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
msgid "This value must be an integer."
-msgstr ""
+msgstr "This value must be an integer."
#: db/models/fields/__init__.py:493
msgid "This value must be either True or False."
-msgstr ""
+msgstr "This value must be either True or False."
#: db/models/fields/__init__.py:495
msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Boolean (Either True or False)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
#, python-format
msgid "String (up to %(max_length)s)"
-msgstr ""
+msgstr "String (up to %(max_length)s)"
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
-msgstr ""
+msgstr "Comma-separated integers"
#: db/models/fields/__init__.py:584
msgid "Date (without time)"
-msgstr ""
+msgstr "Date (without time)"
#: db/models/fields/__init__.py:588
msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr ""
+msgstr "Enter a valid date in YYYY-MM-DD format."
#: db/models/fields/__init__.py:589
#, python-format
msgid "Invalid date: %s"
-msgstr ""
+msgstr "Invalid date: %s"
#: db/models/fields/__init__.py:670
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr ""
+msgstr "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
-msgstr ""
+msgstr "Date (with time)"
#: db/models/fields/__init__.py:746
msgid "This value must be a decimal number."
-msgstr ""
+msgstr "This value must be a decimal number."
#: db/models/fields/__init__.py:748
msgid "Decimal number"
-msgstr ""
+msgstr "Decimal number"
#: db/models/fields/__init__.py:803
msgid "E-mail address"
-msgstr ""
+msgstr "E-mail address"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
-msgstr ""
+msgstr "File path"
#: db/models/fields/__init__.py:841
msgid "This value must be a float."
-msgstr ""
+msgstr "This value must be a float."
#: db/models/fields/__init__.py:843
msgid "Floating point number"
-msgstr ""
+msgstr "Floating point number"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "Big (8 byte) integer"
#: db/models/fields/__init__.py:915
msgid "IP address"
-msgstr ""
+msgstr "IP address"
#: db/models/fields/__init__.py:931
msgid "This value must be either None, True or False."
-msgstr ""
+msgstr "This value must be either None, True or False."
#: db/models/fields/__init__.py:933
msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Boolean (Either True, False or None)"
#: db/models/fields/__init__.py:1024
msgid "Text"
-msgstr ""
+msgstr "Text"
#: db/models/fields/__init__.py:1040
msgid "Time"
-msgstr ""
+msgstr "Time"
#: db/models/fields/__init__.py:1044
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr ""
+msgstr "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
#: db/models/fields/__init__.py:1120
msgid "URL"
-msgstr ""
+msgstr "URL"
#: db/models/fields/__init__.py:1136
msgid "XML text"
-msgstr ""
+msgstr "XML text"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr ""
+msgstr "Model %(model)s with pk %(pk)r does not exist."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "Foreign Key (type determined by related field)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "One-to-one relationship"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "Many-to-many relationship"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
#: forms/fields.py:66
msgid "This field is required."
-msgstr ""
+msgstr "This field is required."
#: forms/fields.py:221
msgid "Enter a whole number."
-msgstr ""
+msgstr "Enter a whole number."
#: forms/fields.py:253 forms/fields.py:274
msgid "Enter a number."
-msgstr ""
+msgstr "Enter a number."
#: forms/fields.py:277
#, python-format
msgid "Ensure that there are no more than %s digits in total."
-msgstr ""
+msgstr "Ensure that there are no more than %s digits in total."
#: forms/fields.py:278
#, python-format
msgid "Ensure that there are no more than %s decimal places."
-msgstr ""
+msgstr "Ensure that there are no more than %s decimal places."
#: forms/fields.py:279
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr ""
+msgstr "Ensure that there are no more than %s digits before the decimal point."
#: forms/fields.py:342 forms/fields.py:918
msgid "Enter a valid date."
-msgstr ""
+msgstr "Enter a valid date."
#: forms/fields.py:370 forms/fields.py:919
msgid "Enter a valid time."
-msgstr ""
+msgstr "Enter a valid time."
#: forms/fields.py:396
msgid "Enter a valid date/time."
-msgstr ""
+msgstr "Enter a valid date/time."
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
-msgstr ""
+msgstr "No file was submitted. Check the encoding type on the form."
#: forms/fields.py:461
msgid "No file was submitted."
-msgstr ""
+msgstr "No file was submitted."
#: forms/fields.py:462
msgid "The submitted file is empty."
-msgstr ""
+msgstr "The submitted file is empty."
#: forms/fields.py:463
#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "Please either submit a file or check the clear checkbox, not both."
#: forms/fields.py:518
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
#: forms/fields.py:650 forms/fields.py:725
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr ""
+msgstr "Select a valid choice. %(value)s is not one of the available choices."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
-msgstr ""
+msgstr "Enter a list of values."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr ""
+msgstr "Order"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
-msgstr ""
+msgstr "Delete"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
+msgstr "Please correct the duplicate data for %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
+msgstr "Please correct the duplicate data for %(field)s, which must be unique."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr ""
+msgstr "Please correct the duplicate values below."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
+msgstr "The inline foreign key did not match the parent instance primary key."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
+"Select a valid choice. That choice is not one of the available choices."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
-msgstr ""
+msgstr "Select a valid choice. %s is not one of the available choices."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" is not a valid value for a primary key."
#: forms/widgets.py:299
msgid "Currently"
-msgstr ""
+msgstr "Currently"
#: forms/widgets.py:300
msgid "Change"
-msgstr ""
+msgstr "Change"
#: forms/widgets.py:301
msgid "Clear"
-msgstr ""
+msgstr "Clear"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
-msgstr ""
+msgstr "Unknown"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
-msgstr ""
+msgstr "Yes"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
-msgstr ""
+msgstr "No"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
-msgstr ""
+msgstr "yes,no,maybe"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(size)d byte"
+msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr ""
+msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr ""
+msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr ""
+msgstr "%s GB"
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
-msgstr ""
+msgstr "%s TB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
-msgstr ""
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
-msgstr ""
+msgstr "p.m."
#: utils/dateformat.py:43
msgid "a.m."
-msgstr ""
+msgstr "a.m."
#: utils/dateformat.py:48
msgid "PM"
-msgstr ""
+msgstr "PM"
#: utils/dateformat.py:49
msgid "AM"
-msgstr ""
+msgstr "AM"
#: utils/dateformat.py:98
msgid "midnight"
-msgstr ""
+msgstr "midnight"
#: utils/dateformat.py:100
msgid "noon"
-msgstr ""
+msgstr "noon"
#: utils/dates.py:6
msgid "Monday"
-msgstr ""
+msgstr "Monday"
#: utils/dates.py:6
msgid "Tuesday"
-msgstr ""
+msgstr "Tuesday"
#: utils/dates.py:6
msgid "Wednesday"
-msgstr ""
+msgstr "Wednesday"
#: utils/dates.py:6
msgid "Thursday"
-msgstr ""
+msgstr "Thursday"
#: utils/dates.py:6
msgid "Friday"
-msgstr ""
+msgstr "Friday"
#: utils/dates.py:7
msgid "Saturday"
-msgstr ""
+msgstr "Saturday"
#: utils/dates.py:7
msgid "Sunday"
-msgstr ""
+msgstr "Sunday"
#: utils/dates.py:10
msgid "Mon"
-msgstr ""
+msgstr "Mon"
#: utils/dates.py:10
msgid "Tue"
-msgstr ""
+msgstr "Tue"
#: utils/dates.py:10
msgid "Wed"
-msgstr ""
+msgstr "Wed"
#: utils/dates.py:10
msgid "Thu"
-msgstr ""
+msgstr "Thu"
#: utils/dates.py:10
msgid "Fri"
-msgstr ""
+msgstr "Fri"
#: utils/dates.py:11
msgid "Sat"
-msgstr ""
+msgstr "Sat"
#: utils/dates.py:11
msgid "Sun"
-msgstr ""
+msgstr "Sun"
#: utils/dates.py:18
msgid "January"
-msgstr ""
+msgstr "January"
#: utils/dates.py:18
msgid "February"
-msgstr ""
+msgstr "February"
#: utils/dates.py:18
msgid "March"
-msgstr ""
+msgstr "March"
#: utils/dates.py:18
msgid "April"
-msgstr ""
+msgstr "April"
#: utils/dates.py:18
msgid "May"
-msgstr ""
+msgstr "May"
#: utils/dates.py:18
msgid "June"
-msgstr ""
+msgstr "June"
#: utils/dates.py:19
msgid "July"
-msgstr ""
+msgstr "July"
#: utils/dates.py:19
msgid "August"
-msgstr ""
+msgstr "August"
#: utils/dates.py:19
msgid "September"
-msgstr ""
+msgstr "September"
#: utils/dates.py:19
msgid "October"
-msgstr ""
+msgstr "October"
#: utils/dates.py:19
msgid "November"
-msgstr ""
+msgstr "November"
#: utils/dates.py:20
msgid "December"
-msgstr ""
+msgstr "December"
#: utils/dates.py:23
msgid "jan"
-msgstr ""
+msgstr "jan"
#: utils/dates.py:23
msgid "feb"
-msgstr ""
+msgstr "feb"
#: utils/dates.py:23
msgid "mar"
-msgstr ""
+msgstr "mar"
#: utils/dates.py:23
msgid "apr"
-msgstr ""
+msgstr "apr"
#: utils/dates.py:23
msgid "may"
-msgstr ""
+msgstr "may"
#: utils/dates.py:23
msgid "jun"
-msgstr ""
+msgstr "jun"
#: utils/dates.py:24
msgid "jul"
-msgstr ""
+msgstr "jul"
#: utils/dates.py:24
msgid "aug"
-msgstr ""
+msgstr "aug"
#: utils/dates.py:24
msgid "sep"
-msgstr ""
+msgstr "sep"
#: utils/dates.py:24
msgid "oct"
-msgstr ""
+msgstr "oct"
#: utils/dates.py:24
msgid "nov"
-msgstr ""
+msgstr "nov"
#: utils/dates.py:24
msgid "dec"
-msgstr ""
+msgstr "dec"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr ""
+msgstr "Jan."
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr ""
+msgstr "Feb."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr ""
+msgstr "March"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr ""
+msgstr "April"
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr ""
+msgstr "May"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr ""
+msgstr "June"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr ""
+msgstr "July"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr ""
+msgstr "Aug."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr ""
+msgstr "Sept."
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr ""
+msgstr "Oct."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr ""
+msgstr "Nov."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr ""
+msgstr "Dec."
#: utils/dates.py:45
msgctxt "alt. month"
msgid "January"
-msgstr ""
+msgstr "January"
#: utils/dates.py:46
msgctxt "alt. month"
msgid "February"
-msgstr ""
+msgstr "February"
#: utils/dates.py:47
msgctxt "alt. month"
msgid "March"
-msgstr ""
+msgstr "March"
#: utils/dates.py:48
msgctxt "alt. month"
msgid "April"
-msgstr ""
+msgstr "April"
#: utils/dates.py:49
msgctxt "alt. month"
msgid "May"
-msgstr ""
+msgstr "May"
#: utils/dates.py:50
msgctxt "alt. month"
msgid "June"
-msgstr ""
+msgstr "June"
#: utils/dates.py:51
msgctxt "alt. month"
msgid "July"
-msgstr ""
+msgstr "July"
#: utils/dates.py:52
msgctxt "alt. month"
msgid "August"
-msgstr ""
+msgstr "August"
#: utils/dates.py:53
msgctxt "alt. month"
msgid "September"
-msgstr ""
+msgstr "September"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr ""
+msgstr "October"
#: utils/dates.py:55
msgctxt "alt. month"
msgid "November"
-msgstr ""
+msgstr "November"
#: utils/dates.py:56
msgctxt "alt. month"
msgid "December"
-msgstr ""
+msgstr "December"
#: utils/text.py:136
msgid "or"
-msgstr ""
+msgstr "or"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "year"
+msgstr[1] "years"
#: utils/timesince.py:22
msgid "month"
msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "month"
+msgstr[1] "months"
#: utils/timesince.py:23
msgid "week"
msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "week"
+msgstr[1] "weeks"
#: utils/timesince.py:24
msgid "day"
msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "day"
+msgstr[1] "days"
#: utils/timesince.py:25
msgid "hour"
msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "hour"
+msgstr[1] "hours"
#: utils/timesince.py:26
msgid "minute"
msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "minute"
+msgstr[1] "minutes"
#: utils/timesince.py:45
msgid "minutes"
-msgstr ""
+msgstr "minutes"
#: utils/timesince.py:50
#, python-format
msgid "%(number)d %(type)s"
-msgstr ""
+msgstr "%(number)d %(type)s"
#: utils/timesince.py:56
#, python-format
msgid ", %(number)d %(type)s"
-msgstr ""
+msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "N j, Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "N j, Y, P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
#: views/generic/create_update.py:121
#, python-format
msgid "The %(verbose_name)s was created successfully."
-msgstr ""
+msgstr "The %(verbose_name)s was created successfully."
#: views/generic/create_update.py:164
#, python-format
msgid "The %(verbose_name)s was updated successfully."
-msgstr ""
+msgstr "The %(verbose_name)s was updated successfully."
#: views/generic/create_update.py:207
#, python-format
msgid "The %(verbose_name)s was deleted."
+msgstr "The %(verbose_name)s was deleted."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "The %(verbose_name)s was deleted."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "The %(verbose_name)s was updated successfully."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
msgstr ""
diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo
index 7d1d2e2bd0..382a6a1cef 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po
index 7e35e53f9a..19a2b927df 100644
--- a/django/conf/locale/es/LC_MESSAGES/django.po
+++ b/django/conf/locale/es/LC_MESSAGES/django.po
@@ -1,18 +1,18 @@
-# Spanish translation for the django project
-# Copyright (C) 2008, The Django Project
-# This file is distributed under the same license as the django package.
+# This file is distributed under the same license as the Django package.
+#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:57+0100\n"
-"PO-Revision-Date: 2009-11-30 11:31+0100\n"
-"Last-Translator: Django Spanish Team, <django-cat@googlegroups.com>\n"
-"Language-Team: Django Spanish Team, <django-cat@googlegroups.com>\n"
+"POT-Creation-Date: 2011-02-28 17:33+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: aaloy <antoni.aloy@trespams.com>\n"
+"Language-Team: Spanish (Castilian) <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -59,270 +59,271 @@ msgid "English"
msgstr "inglés"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "inglés"
+msgstr "inglés británico"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "español"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "español de Argentina"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "español de Argentina"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "estonio"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "vasco"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "persa"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "finés"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "francés"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr ""
+msgstr "frisón"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "irlandés"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "gallego"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "hebreo"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "croata"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "húngaro"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "macedonio"
+msgstr "indonesio"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islandés"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "italiano"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "japonés"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "georgiano"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "koreano"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "lituano"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "letón"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "macedonio"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Málaga"
+msgstr "malayalam"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "macedonio"
+msgstr "mongol"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "holandés"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "noruego"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "noruego"
+msgstr "bokmål"
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "noruego"
+msgstr "nynorsk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "panyabí"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "polaco"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "portugués"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "portugués de Brasil"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "rumano"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "ruso"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "eslovaco"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "esloveno"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "albanés"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "serbio"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "serbio"
+msgstr "serbio latino"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "sueco"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "tamil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "tailandés"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "turco"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ucraniano"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "vietnamita"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "chino simplificado"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "chino tradicional"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Introduzca un valor correcto."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Introduzca una URL válida."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "La URL parece ser un enlace roto."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Introduzca una URL válida."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Introduzca una dirección de correo electrónico válida."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Introduzca un 'slug' válido, consistente en letras, números, guiones bajos o "
"medios."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Introduzca sólo dígitos separados por comas."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Asegúrese de que este valor es %(limit_value)s (actualmente es %(show_value)"
"s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor es menor o igual a %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor es mayor o igual a %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -331,7 +332,7 @@ msgstr ""
"Asegúrese de que este valor tiene al menos %(limit_value)d caracteres "
"(actualmente tiene %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -340,17 +341,17 @@ msgstr ""
"Asegúrese de que este valor tiene a lo más %(limit_value)d caracteres "
"(actualmente tiene %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "El campo %(field_name)s debe ser único para %(lookup)s %(date_field)s"
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Ya existe %(model_name)s con este %(field_label)s."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "y"
@@ -434,7 +435,7 @@ msgid "E-mail address"
msgstr "Dirección de correo electrónico"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Ruta de fichero"
@@ -482,24 +483,24 @@ msgstr "URL"
msgid "XML text"
msgstr "Texto XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "No existe ningún objeto %(model)s con la clave primaria %(pk)r."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Llave foránea (tipo determinado por el campo relacionado)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Relación uno-a-uno"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Relación muchos-a-muchos"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -570,6 +571,7 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Por favor envíe un fichero o marque la casilla de limpiar, pero no ambos."
#: forms/fields.py:518
msgid ""
@@ -585,30 +587,30 @@ msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Escoja una opción válida. %(value)s no es una de las opciones disponibles."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Orden"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Por favor, corrija el dato duplicado para %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Por favor corriga el dato duplicado para %(field)s, el cual debe ser único."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -617,91 +619,89 @@ msgstr ""
"Por favor corriga los datos duplicados para %(field_name)s el cual debe ser "
"único para %(lookup)s en %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Por favor, corrija los valores duplicados abajo."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La clave foránea en linea no coincide con la clave primaria de la instancia "
"padre."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Escoja una opción válida. Esa opción no está entre las disponibles."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Escoja una opción válida; '%s' no es una de las opciones disponibles."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" no es un valor válido para una clave primaria."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Actualmente:"
+msgstr "Actualmente"
#: forms/widgets.py:300
msgid "Change"
msgstr "Modificar"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "año"
+msgstr "Limpiar"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Desconocido"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Sí"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "sí,no,tal vez"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -892,12 +892,12 @@ msgstr "feb."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "marzo"
+msgstr "mar."
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "abril"
+msgstr "abr."
#: utils/dates.py:35
msgctxt "abbrev. month"
@@ -907,12 +907,12 @@ msgstr "mayo"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "junio"
+msgstr "jun."
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "julio"
+msgstr "jul."
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -940,73 +940,61 @@ msgid "Dec."
msgstr "dic."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "enero"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "febrero"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "marzo"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "abril"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "mayo"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "junio"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "julio"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "agosto"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "septiembre"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "octubre"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "noviembre"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "diciembre"
@@ -1018,7 +1006,7 @@ msgstr "o"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1070,23 +1058,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j N Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j N Y P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j \\de F"
@@ -1104,3 +1092,55 @@ msgstr "Se actualizó con éxito el %(verbose_name)s."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "El/La %(verbose_name)s ha sido borrado."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "El/La %(verbose_name)s ha sido borrado."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Se actualizó con éxito el %(verbose_name)s."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.mo b/django/conf/locale/es_AR/LC_MESSAGES/django.mo
index df6f0a6775..9c141f0994 100644
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/es_AR/LC_MESSAGES/django.po b/django/conf/locale/es_AR/LC_MESSAGES/django.po
index aa80bdccf9..bd222b0aaa 100644
--- a/django/conf/locale/es_AR/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_AR/LC_MESSAGES/django.po
@@ -1,21 +1,18 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:57+0100\n"
-"PO-Revision-Date: 2010-08-11 09:00-0300\n"
-"Last-Translator: Ramiro <rm0@gmx.net>\n"
-"Language-Team: Django-I18N <django-i18n@googlegroups.com>\n"
+"POT-Creation-Date: 2011-02-28 17:33+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: cramm <cramm0@gmail.com>\n"
+"Language-Team: Spanish (Argentinian) <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: es_AR\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -74,248 +71,257 @@ msgid "Argentinian Spanish"
msgstr "español de Argentina"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "español de Argentina"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "estonio"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "vasco"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "persa"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "finlandés"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "francés"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "frisón"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "irlandés"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "gallego"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "hebreo"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "croata"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "húngaro"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "indonesio"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islandés"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "italiano"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "japonés"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "georgiano"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "jémer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "canarés"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "coreano"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "lituano"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "letón"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "macedonio"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "mongol"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "holandés"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "noruego"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "bokmål"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "nynorsk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Panyabí"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "polaco"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "portugués"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "portugués de Brasil"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "rumano"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "ruso"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "eslovaco"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "esloveno"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "albanés"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "serbio"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Latín de Serbia"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "sueco"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "tamil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "tailandés"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "turco"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ucraniano"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "vietnamita"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "chino simplificado"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "chino tradicional"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Introduzca un valor válido."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Introduzca una URL válida."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "La URL parece ser un enlace roto."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Introduzca una URL válida."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Introduzca una dirección de correo electrónico válida"
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "Introduzca un 'slug' válido consistente de letras, números o guiones."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida"
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Introduzca sólo dígitos separados por comas."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Asegúrese de que este valor sea %(limit_value)s (actualmente es %(show_value)"
"s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor sea menor o igual a %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor sea mayor o igual a %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -324,7 +330,7 @@ msgstr ""
"Asegúrese de que este valor tenga al menos %(limit_value)d caracteres (tiene "
"%(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -333,19 +339,19 @@ msgstr ""
"Asegúrese de que este valor tenga como máximo %(limit_value)d caracteres "
"(tiene %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"%(field_name)s debe ser único/a para un %(lookup)s %(date_field)s "
"determinado."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Ya existe un/a %(model_name)s con este/a %(field_label)s."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "y"
@@ -430,7 +436,7 @@ msgid "E-mail address"
msgstr "Dirección de correo electrónico"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Ruta de archivo"
@@ -478,24 +484,24 @@ msgstr "URL"
msgid "XML text"
msgstr "Texto XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "No existe un modelo %(model)s con una clave primaria %(pk)r."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Clave foránea (el tipo está determinado por el campo relacionado)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Relación uno-a-uno"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Relación muchos-a-muchos"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -564,7 +570,7 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "Por favor envíe un archivo o active el checkbox, pero no ambas cosas."
#: forms/fields.py:518
msgid ""
@@ -581,30 +587,30 @@ msgstr ""
"Seleccione una opción válida. %(value)s no es una de las opciones "
"disponibles."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Ordenar"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Por favor, corrija la información duplicada en %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Por favor corrija la información duplicada en %(field)s, que debe ser única."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -613,35 +619,34 @@ msgstr ""
"Por favor corrija la información duplicada en %(field_name)s que debe ser "
"única para el %(lookup)s en %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Por favor, corrija los valores duplicados detallados mas abajo."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La clave foránea del modelo inline no coincide con la clave primaria de la "
"instancia padre."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Seleccione una opción válida. La opción seleccionada no es una de las "
"disponibles."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
"Seleccione una opción válida. %s no es una de las opciones disponibles."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" no es un valor válido para una clave primaria."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
msgstr "Actualmente"
@@ -650,57 +655,56 @@ msgid "Change"
msgstr "Modificar"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr "Eliminar"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Desconocido"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Sí"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "si,no,talvez"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -939,73 +943,61 @@ msgid "Dec."
msgstr "Dic."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "Enero"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "Febrero"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "Marzo"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "Abril"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "Mayo"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "Junio"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "Julio"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "Agosto"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "Setiembre"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "Octubre"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "Noviembre"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "Diciembre"
@@ -1017,7 +1009,7 @@ msgstr "o"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1069,23 +1061,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j N Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j N Y P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j \\de F"
@@ -1103,3 +1095,55 @@ msgstr "Se actualizó con éxito %(verbose_name)s."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "Se eliminó %(verbose_name)s."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Se eliminó %(verbose_name)s."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Se actualizó con éxito %(verbose_name)s."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/es_MX/LC_MESSAGES/django.mo b/django/conf/locale/es_MX/LC_MESSAGES/django.mo
index a59e1300f9..2c2fec599c 100644
--- a/django/conf/locale/es_MX/LC_MESSAGES/django.mo
+++ b/django/conf/locale/es_MX/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/es_MX/LC_MESSAGES/django.po b/django/conf/locale/es_MX/LC_MESSAGES/django.po
index 315b6400ed..4f80a9b70d 100644
--- a/django/conf/locale/es_MX/LC_MESSAGES/django.po
+++ b/django/conf/locale/es_MX/LC_MESSAGES/django.po
@@ -1,11 +1,11 @@
# This file is distributed under the same license as the Django package.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:57+0100\n"
-"PO-Revision-Date: 2011-02-06 05:55+0000\n"
+"POT-Creation-Date: 2011-02-28 17:34+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
"Last-Translator: AbeEstrada <abraham.estrada@gmail.com>\n"
"Language-Team: Spanish (Mexican) <None>\n"
"MIME-Version: 1.0\n"
@@ -71,265 +71,287 @@ msgid "Argentinian Spanish"
msgstr "Español de Argentina"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Español de Argentina"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estonio"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Vasco"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Persa"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finés"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Francés"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Frisón"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irlandés"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Gallego"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebreo"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Croata"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Húngaro"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "Indonesio"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandés"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japonés"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Georgiano"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Coreano"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Lituano"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Letón"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Macedonio"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "Mongol"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Holandés"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Noruego"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Noruego Bokmal"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Noruego Nynorsk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr "Punjabi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Polaco"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugués"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Portugués de Brasil"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Rumano"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Ruso"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Eslovaco"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Esloveno"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Albanés"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Serbio"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Latin Serbio"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Sueco"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Tailandés"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Turco"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ucraniano"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vietnamita"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Chino simplificado"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Chino tradicional"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Introduzca un valor válido."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Ingrese una URL válida."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Esta dirección URL que parece ser un enlace roto."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Ingrese una URL válida."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Introduzca una dirección de correo electrónico válida."
-#: core/validators.py:123 forms/fields.py:958
-msgid "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-msgstr "Introduzca un \"slug\", compuesto por letras, números, guiones bajos o medios."
+#: core/validators.py:141 forms/fields.py:958
+msgid ""
+"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
+msgstr ""
+"Introduzca un \"slug\", compuesto por letras, números, guiones bajos o "
+"medios."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Introduzca una dirección IPv4 válida."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Introduzca sólo números separados por comas."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Asegúrese de que este valor es %(limit_value)s (es %(show_value)s )."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor sea menor o igual a %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Asegúrese de que este valor sea mayor o igual a %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
-msgid "Ensure this value has at least %(limit_value)d characters (it has %(show_value)d)."
-msgstr "Asegúrese de que este valor tenga al menos %(limit_value)d caracteres (tiene %(show_value)d)."
+msgid ""
+"Ensure this value has at least %(limit_value)d characters (it has %"
+"(show_value)d)."
+msgstr ""
+"Asegúrese de que este valor tenga al menos %(limit_value)d caracteres (tiene "
+"%(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
-msgid "Ensure this value has at most %(limit_value)d characters (it has %(show_value)d)."
-msgstr "Asegúrese de que este valor tenga como máximo %(limit_value)d caracteres (tiene %(show_value)d)."
+msgid ""
+"Ensure this value has at most %(limit_value)d characters (it has %"
+"(show_value)d)."
+msgstr ""
+"Asegúrese de que este valor tenga como máximo %(limit_value)d caracteres "
+"(tiene %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field_name)s debe ser único/a para un %(lookup)s %(date_field)s determinado."
+msgstr ""
+"%(field_name)s debe ser único/a para un %(lookup)s %(date_field)s "
+"determinado."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Ya existe un/a %(model_name)s con este/a %(field_label)s."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "y"
@@ -393,7 +415,9 @@ msgstr "Fecha no válida: %s"
#: db/models/fields/__init__.py:670
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Introduzca un valor de fecha/hora válido en formato AAAA-MM-DD HH:MM[:ss[.uuuuuu]]."
+msgstr ""
+"Introduzca un valor de fecha/hora válido en formato AAAA-MM-DD HH:MM[:ss[."
+"uuuuuu]]."
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
@@ -412,7 +436,7 @@ msgid "E-mail address"
msgstr "Dirección de correo electrónico"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Ruta de archivo"
@@ -460,26 +484,29 @@ msgstr "URL"
msgid "XML text"
msgstr "Texto XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "No existe un modelo %(model)s con una clave primaria %(pk)r."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Clave foránea (el tipo está determinado por el campo relacionado)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Relación uno-a-uno"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Relación muchos-a-muchos"
-#: db/models/fields/related.py:1010
-msgid "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
-msgstr "Mantenga presionada \"Control\", o \"Command\" en una Mac, para seleccionar más de uno."
+#: db/models/fields/related.py:1023
+msgid ""
+"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
+msgstr ""
+"Mantenga presionada \"Control\", o \"Command\" en una Mac, para seleccionar "
+"más de uno."
#: forms/fields.py:66
msgid "This field is required."
@@ -522,7 +549,8 @@ msgstr "Introduzca una fecha/hora válida."
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
-msgstr "No se envió un archivo. Verifique el tipo de codificación en el formulario."
+msgstr ""
+"No se envió un archivo. Verifique el tipo de codificación en el formulario."
#: forms/fields.py:461
msgid "No file was submitted."
@@ -534,67 +562,86 @@ msgstr "El archivo enviado está vacío."
#: forms/fields.py:463
#, python-format
-msgid "Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "Asegúrese de que este nombre de archivo tenga como máximo %(max)d caracteres (tiene %(length)d)."
+msgid ""
+"Ensure this filename has at most %(max)d characters (it has %(length)d)."
+msgstr ""
+"Asegúrese de que este nombre de archivo tenga como máximo %(max)d caracteres "
+"(tiene %(length)d)."
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr "Por favor envíe un archivo o marque la casilla, no ambos."
#: forms/fields.py:518
-msgid "Upload a valid image. The file you uploaded was either not an image or a corrupted image."
-msgstr "Seleccione una imagen válida. El archivo que ha seleccionado no es una imagen o es un un archivo de imagen corrupto."
+msgid ""
+"Upload a valid image. The file you uploaded was either not an image or a "
+"corrupted image."
+msgstr ""
+"Seleccione una imagen válida. El archivo que ha seleccionado no es una "
+"imagen o es un un archivo de imagen corrupto."
#: forms/fields.py:650 forms/fields.py:725
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Seleccione una opción válida. %(value)s no es una de las opciones disponibles."
+msgstr ""
+"Seleccione una opción válida. %(value)s no es una de las opciones "
+"disponibles."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Introduzca una lista de valores."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Ordenar"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Por favor, corrija la información duplicada en %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr "Por favor corrija la información duplicada en %(field)s, que debe ser única."
+msgstr ""
+"Por favor corrija la información duplicada en %(field)s, que debe ser única."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
-msgid "Please correct the duplicate data for %(field_name)s which must be unique for the %(lookup)s in %(date_field)s."
-msgstr "Por favor corrija la información duplicada en %(field_name)s que debe ser única para el %(lookup)s en %(date_field)s."
+msgid ""
+"Please correct the duplicate data for %(field_name)s which must be unique "
+"for the %(lookup)s in %(date_field)s."
+msgstr ""
+"Por favor corrija la información duplicada en %(field_name)s que debe ser "
+"única para el %(lookup)s en %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Por favor, corrija los valores duplicados detallados mas abajo."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr "La clave foránea del modelo inline no coincide con la clave primaria de la instancia padre."
+msgstr ""
+"La clave foránea del modelo inline no coincide con la clave primaria de la "
+"instancia padre."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Seleccione una opción válida. La opción seleccionada no es una de las disponibles."
+msgstr ""
+"Seleccione una opción válida. La opción seleccionada no es una de las "
+"disponibles."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Seleccione una opción válida. %s no es una de las opciones disponibles."
+msgstr ""
+"Seleccione una opción válida. %s no es una de las opciones disponibles."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" no es un valor válido para una clave primaria."
@@ -611,50 +658,50 @@ msgstr "Modificar"
msgid "Clear"
msgstr "Borrar"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Desconocido"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Sí"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "sí, no, tal vez"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
msgstr "%s PB"
@@ -1014,23 +1061,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j N Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j N Y P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j \\de F"
@@ -1048,3 +1095,55 @@ msgstr "Se actualizó con éxito %(verbose_name)s."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "Se eliminó %(verbose_name)s."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Se eliminó %(verbose_name)s."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Se actualizó con éxito %(verbose_name)s."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/et/LC_MESSAGES/django.mo b/django/conf/locale/et/LC_MESSAGES/django.mo
index 4d373ca9e1..a94903b241 100644
--- a/django/conf/locale/et/LC_MESSAGES/django.mo
+++ b/django/conf/locale/et/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/et/LC_MESSAGES/django.po b/django/conf/locale/et/LC_MESSAGES/django.po
index e80799b053..f7924e6e95 100644
--- a/django/conf/locale/et/LC_MESSAGES/django.po
+++ b/django/conf/locale/et/LC_MESSAGES/django.po
@@ -1,18 +1,18 @@
-# Estonian translation for the Django Project.
-# Copyright (C) 2008, Django Project
-# This file is distributed under the same license as the django package.
+# This file is distributed under the same license as the Django package.
+#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:57+0100\n"
-"PO-Revision-Date: 2008-09-03 00:35+0200\n"
-"Last-Translator: Erik Allik <removethis-eallik_at_gmail-com>\n"
-"Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
+"POT-Creation-Date: 2011-02-28 17:34+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: Estonian <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -27,9 +27,8 @@ msgid "Bengali"
msgstr "bengali"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "eesti"
+msgstr ""
#: conf/global_settings.py:48
msgid "Catalan"
@@ -60,300 +59,292 @@ msgid "English"
msgstr "inglise"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "inglise"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "hispaania"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "argentiina hispaania"
+msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "hispaania"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "eesti"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "baski"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "pärsia"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "soome"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "prantsuse"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "Friisimaa"
+msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "iiri"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "galiitsia"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "heebrea"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "horvaatia"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "ungari"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "makedoonia"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islandi"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "itaalia"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "jaapani"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "gruusia"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "khmeri"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "korea"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "leedu"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "läti"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "makedoonia"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Málaga"
+msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "makedoonia"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "hollandi"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "norra"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "norra"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "norra"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "poola"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "portugali"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "brasiilia portugali"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "rumeenia"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "vene"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "slovaki"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "sloveeni"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Alicante"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "serbia"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "serbia"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "rootsi"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "tamiili"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "tai"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "türgi"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ukrania"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "Viin"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "lihtsustatud hiina"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "traditsiooniline hiina"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Sisestage korrektne väärtus."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Sisestage korrektne URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "See URL näib olevat katkine."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Sisestage korrektne URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Sisestage korrektne e-posti aadress:"
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"See väärtus võib sisaldada ainult tähti, nubmreid, alljooni ja sidekriipse."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Sisestage korrektne IPv4 aadress."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Sisestage ainult komaga eraldatud numbreid."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Veenduge, et see väärtus sisaldab vähemalt %(min)d märki (hetkel on %(length)"
-"d)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Veenduge, et see väärtus on väiksem või võrdne kui %s."
+msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Veenduge, et see väärtus on suurem või võrdne kui %s."
+msgstr ""
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Veenduge, et see väärtus sisaldab vähemalt %(min)d märki (hetkel on %(length)"
-"d)."
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Veenduge, et see väärtus sisaldab kõige rohkem %(max)d tähemärki (hetkel on %"
-"(length)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s peab olema unikaalne %(date_field)s %(lookup)s suhtes."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Sellise %(field_label)s-väljaga %(model_name)s on juba olemas."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "ja"
@@ -367,9 +358,8 @@ msgid "This field cannot be null."
msgstr "See lahter ei tohi olla tühi."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "See lahter ei tohi olla tühi."
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -438,7 +428,7 @@ msgid "E-mail address"
msgstr "E-posti aadress"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Faili asukoht"
@@ -486,24 +476,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML tekst"
-#: db/models/fields/related.py:804
-#, fuzzy, python-format
+#: db/models/fields/related.py:815
+#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr "%(name)s primaarvõtmega %(key)r ei eksisteeri."
+msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Et valida mitu, hoidke all \"Control\"-nuppu (Maci puhul \"Command\")."
@@ -584,119 +574,117 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Valige korrektne väärtus. %(value)s ei ole valitav."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Sisestage väärtuste nimekiri."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Järjestus"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Kustuta"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Palun parandage duplikaat-andmed lahtris %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Palun parandage duplikaat-andmed lahtris %(field)s, mis peab olema unikaalne."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Palun parandage allolevad duplikaat-väärtused"
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Pesastatud välisvõti ei sobi ülemobjekti primaarvõtmega."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Valige korrektne väärtus. Valitud väärtus ei ole valitav."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Valige korrektne väärtus. %s ei ole valitav."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" ei ole sobiv väärtust primaarvõtmeks."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Hetkel:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Muuda"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "aasta"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Tundmatu"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Jah"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Ei"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "jah,ei,võib-olla"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bait"
msgstr[1] "%(size)d baiti"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -877,134 +865,122 @@ msgstr "dets"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Jaan."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Veeb."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "märts"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "aprill"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "mai"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "juuni"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "juuli"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Aug."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Sept."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Okt."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Nov."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Dets."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "jaanuar"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "veebruar"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "märts"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "aprill"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "mai"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "juuni"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "juuli"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "august"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "september"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "oktoober"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "november"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "detsember"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1065,23 +1041,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "N j, Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. N Y, H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1099,3 +1075,55 @@ msgstr "%(verbose_name)s edukalt muudetud."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s kustutatud."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s kustutatud."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s edukalt muudetud."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/eu/LC_MESSAGES/django.mo b/django/conf/locale/eu/LC_MESSAGES/django.mo
index af72010c28..fe73079c03 100644
--- a/django/conf/locale/eu/LC_MESSAGES/django.mo
+++ b/django/conf/locale/eu/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/eu/LC_MESSAGES/django.po b/django/conf/locale/eu/LC_MESSAGES/django.po
index 650d860700..02c72be88a 100644
--- a/django/conf/locale/eu/LC_MESSAGES/django.po
+++ b/django/conf/locale/eu/LC_MESSAGES/django.po
@@ -1,19 +1,18 @@
-# translation of django.po to
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:57+0100\n"
-"PO-Revision-Date: 2010-07-08 12:55+0200\n"
-"Last-Translator: Aitzol Naberan <anaberan@codesyntax.com>\n"
-"Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
+"POT-Creation-Date: 2011-02-28 17:34+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: aitzol <anaberan@codesyntax.com>\n"
+"Language-Team: Basque <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: eu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -28,9 +27,8 @@ msgid "Bengali"
msgstr "Bengalera"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "Errumaniera"
+msgstr ""
#: conf/global_settings.py:48
msgid "Catalan"
@@ -61,7 +59,6 @@ msgid "English"
msgstr "Ingelesa"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
msgstr "Ingelesa"
@@ -70,320 +67,311 @@ msgid "Spanish"
msgstr "Espainola"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Argentinako espainola"
+msgstr "Espainola (Argentina)"
#: conf/global_settings.py:58
#, fuzzy
-msgid "Estonian"
-msgstr "Errumaniera"
+msgid "Mexican Spanish"
+msgstr "Espainola (Argentina)"
#: conf/global_settings.py:59
-#, fuzzy
-msgid "Basque"
-msgstr "Euskal Herria"
+msgid "Estonian"
+msgstr ""
#: conf/global_settings.py:60
+msgid "Basque"
+msgstr "Euskara"
+
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Persiera"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finlandiera"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Frantzesa"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "Persiera"
+msgstr ""
-#: conf/global_settings.py:64
-#, fuzzy
+#: conf/global_settings.py:65
msgid "Irish"
-msgstr "Turkiera"
+msgstr ""
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galiziera"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebreera"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Kroaziarra"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Hungariera"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Mazedoniera"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandiera"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italiera"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japoniera"
-#: conf/global_settings.py:74
-#, fuzzy
+#: conf/global_settings.py:75
msgid "Georgian"
-msgstr "Alemaniera"
+msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "khemerera"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kanadiera"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Koreera"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Lituaniera"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Mazedoniera"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Mazedoniera"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Holandera"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norvegiera"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Norvegiera"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Norvegiera"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Poloniera"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugalera"
-#: conf/global_settings.py:90
-#, fuzzy
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
-msgstr "Portugalera"
+msgstr "Portugalera (Brazil)"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Errumaniera"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Errusiera"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Eslovakiera"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Esloveniera"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Errumaniera"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Serbiera"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "Serbiera"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Suediera"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamilera"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telegu hizkuntza"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "Tamilera"
+msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Turkiera"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukrainera"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "izena"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Txinera (sinpletua)"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Txinera (tradizionala)"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Idatzi balio zuzena."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "URL zuzen bat idatzi."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "URL hau ez dago ondo."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "URL zuzen bat idatzi."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "e-mail helbide zuzena idatzi."
-#: core/validators.py:123 forms/fields.py:958
-#, fuzzy
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"Balore honek letrak, zenbakiak eta '_','-' karatereak bakarrik izan ditzazke."
+"Hizki, zenbaki, azpimarra edo marratxoz osatutako baleko 'slug' bat sartu."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "IPv4 zuzen bat idatzi."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Komaz bereiztutako digitoak bakarrik idatzi."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Ziurta zaitez balio honek gutxienez %(min)d karaktere dituela ,%(length)d "
-"ditu orain."
+"Ziurtatu balioak %(limit_value)s karraktere dituela gutxienez (orain %"
+"(show_value)s dauzka)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Ziurta zaitez balio hau %s baino txikiagoa edo berdina dela."
+msgstr ""
+"Ziurta zaitez balio hau %(limit_value)s baino txikiago edo berdina dela."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Ziurta zaitez balio hau %s baino handiagoa edo berdina dela."
+msgstr ""
+"Ziurta zaitez balio hau %(limit_value)s baino handiago edo berdina dela."
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Ziurta zaitez balio honek gutxienez %(min)d karaktere dituela ,%(length)d "
-"ditu orain."
+"Ziurtatu gutxienez %(limit_value)d karaktere dauzkala (orain %(show_value)d "
+"dauzka)."
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Ziurta zaitez balio honek gehienez %(max)d karaktere dituela, %(length)d "
-"ditu orain."
+"Ziurtatu gehienez %(limit_value)d dauzkala (orain %(show_value)d dauzka)."
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-"%(field)s eremuak %(value)s balioa baldin badauka, eremu hau bete behar da."
-#: db/models/base.py:782 db/models/base.py:790
-#, fuzzy, python-format
+#: db/models/base.py:784 db/models/base.py:792
+#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Badago %(optname)s izenarekin %(fieldname)s-n."
+msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "eta"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "%r balioa ez da balekoa"
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
msgstr "Eremu hau ezin daiteke hutsa izan (null)."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Eremu hau ezin daiteke hutsa izan (null)."
+msgstr "Eremu hau ezin da hutsik egon."
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "Eremuaren mota: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
@@ -426,9 +414,8 @@ msgid "Invalid date: %s"
msgstr "Data okerra: %s"
#: db/models/fields/__init__.py:670
-#, fuzzy
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Idatzi data/ordua zuzena YYYY-MM-DD HH:MM formatoan."
+msgstr "Idatzi data/ordu zuzena UUUU-HH-EE OO:MM[:ss[.uuuuu]] formatoan."
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
@@ -447,14 +434,13 @@ msgid "E-mail address"
msgstr "E-mail helbidea"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Fitxegi bidea"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "Gutxienez %s izan behar da."
+msgstr "Hemen zenbaki hamartar bat behar da."
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -462,7 +448,7 @@ msgstr "Zenbaki erreala (float)"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "Zenbaki osoa (handia 8 byte)."
#: db/models/fields/__init__.py:915
msgid "IP address"
@@ -485,9 +471,8 @@ msgid "Time"
msgstr "Ordua"
#: db/models/fields/__init__.py:1044
-#, fuzzy
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Ordu zuzena idatzi HH:MM formatoan."
+msgstr "Idatzi ordua OO:MM[:ss[.uuuuu]] formatoan."
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -497,24 +482,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML testua"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr ""
+msgstr "%(pk)r pk duen %(model)s modeloa ez da existitzen."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "Bat-bat erlazioa"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -575,16 +560,14 @@ msgid "The submitted file is empty."
msgstr "Bidalitako fitxategia hutsik dago."
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Ziurta zaitez balio honek gehienez %(max)d karaktere dituela, %(length)d "
-"ditu orain."
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "Mesedez, igo fitxategi bat edo klikatu garbitu botoia, ez biak."
#: forms/fields.py:518
msgid ""
@@ -599,120 +582,116 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Aukeratu aukera zuzen bat. %(value)s ez da zuzena."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Balio zerrenda bat idatzi ezazu."
-#: forms/formsets.py:308 forms/formsets.py:310
-#, fuzzy
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr "Ordena:"
+msgstr "Ordena"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Ezabatu"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Arren zuzendu akatsa"
+msgstr "Mesedez zuzendu bikoiztketa %(field)s eremuan."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
+msgstr "Mesedez zuzendu bikoizketa %(field)s eremuan. Bakarra izan behar da."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "Arren zuzendu akatsa"
+msgstr "Mesedez zuzendu hurrengo balio bikoiztuak."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Aukera zuzen bat aukeratu. Aukeratutakoa ez da zuzena."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Aukera zuzena aukeratu. %s ez da aukeretako bat."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" ez da balekoa gako nagusi gisa."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Orain:"
+msgstr "Orain"
#: forms/widgets.py:300
msgid "Change"
msgstr "Aldatu"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "urtea"
+msgstr "Garbitu"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Ezezaguna"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Bai"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Ez"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "bai,ez,agian"
-#: template/defaultfilters.py:805
-#, fuzzy, python-format
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
+#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d byte"
-msgstr[1] ""
+msgstr[0] "byte %(size)d "
+msgstr[1] "%(size)d byte"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -903,27 +882,27 @@ msgstr "Ots."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "Martxoa"
+msgstr "Mar."
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Apirila"
+msgstr "Api."
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "Maiatza"
+msgstr "Mai."
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Ekaina"
+msgstr "Eka."
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Uztaila"
+msgstr "Uzt."
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -951,73 +930,61 @@ msgid "Dec."
msgstr "Abe."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "Urtarrila"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "Otsaila"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "Martxoa"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "Apirila"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "Maiatza"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "Ekaina"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "Uztaila"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "Abuztua"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "Iraila"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "Urria"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "Azaroa"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "Abendua"
@@ -1029,7 +996,7 @@ msgstr "edo"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1081,23 +1048,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "DATE_FORMAT"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "DATETIME_FORMAT"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "TIME_FORMAT"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "YEAR_MONTH_FORMAT"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "MONTH_DAY_FORMAT"
@@ -1115,3 +1082,55 @@ msgstr "%(verbose_name)s arazorik gabe eguneratu da."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s ezabatu da."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s ezabatu da."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s arazorik gabe eguneratu da."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/fa/LC_MESSAGES/django.mo b/django/conf/locale/fa/LC_MESSAGES/django.mo
index 6ea25b7d6b..4f5a3cecee 100644
--- a/django/conf/locale/fa/LC_MESSAGES/django.mo
+++ b/django/conf/locale/fa/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/fa/LC_MESSAGES/django.po b/django/conf/locale/fa/LC_MESSAGES/django.po
index 8e5171735e..9e07b60ecb 100644
--- a/django/conf/locale/fa/LC_MESSAGES/django.po
+++ b/django/conf/locale/fa/LC_MESSAGES/django.po
@@ -1,20 +1,18 @@
-# Persian translation of Django.
-# Copyright (C) 2007 THE Django'S COPYRIGHT HOLDER
# This file is distributed under the same license as the Django package.
#
-#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:57+0100\n"
-"PO-Revision-Date: 2008-09-01 02:00+0430\n"
-"Last-Translator: Reza Mohammadi <reza@zeerak.ir>\n"
-"Language-Team: Persian <farsi@lists.sharif.edu>\n"
+"POT-Creation-Date: 2011-02-28 17:34+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: alinik <ali@nikneshan.com>\n"
+"Language-Team: Persian <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: fa\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -29,9 +27,8 @@ msgid "Bengali"
msgstr "بنگالی"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "استونی"
+msgstr "بوسنیایی"
#: conf/global_settings.py:48
msgid "Catalan"
@@ -62,311 +59,306 @@ msgid "English"
msgstr "انگلیسی"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "انگلیسی"
+msgstr "انگلیسی بریتیش"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "اسپانیایی"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "اسپانیاییِ آرژانتین"
+msgstr "اسپانیایی آرژانتینی"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "اسپانیایی آرژانتینی"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "استونی"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "باسکی"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "فارسی"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "فنلاندی"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "فرانسوی"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "فارسی"
+msgstr "فریزی"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "ایرلندی"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "گالیسیایی"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "عبری"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
-msgstr ""
+msgstr "هندی"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "کرواتی"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "مجاری"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "مقدونی"
+msgstr "اندونزیایی"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "ایسلندی"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "ایتالیایی"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "ژاپنی"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "گرجی"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "خمری"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "کناده‌ای"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "کره‌ای"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "لیتوانی"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "لتونیایی"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "مقدونی"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr ""
+msgstr "مالایایی"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "مقدونی"
+msgstr "مغولی"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "هلندی"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "نروژی"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "نروژی"
+msgstr "نروژی Bokmal"
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "نروژی"
+msgstr "نروژی Nynorsk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "پنجابی"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "لهستانی"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "پرتغالی"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "پرتغالیِ برزیل"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "رومانی"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "روسی"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "اسلواکی"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "اسلووِنی"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "رومانی"
+msgstr "آلبانیایی"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "صربی"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "صربی"
+msgstr "صربی لاتین"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "سوئدی"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "تامیلی"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "تلوگویی"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "تامیلی"
+msgstr "تایلندی"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "ترکی"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "اکراینی"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "نام"
+msgstr "ویتنامی"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "چینی ساده‌شده"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "چینی سنتی"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "یک مقدار معتبر وارد کنید."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "یک نشانی اینترنتی معتبر وارد کنید."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "به نظر می‌رسد این نشانی یک پیوند شکسته است."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "یک نشانی اینترنتی معتبر وارد کنید."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "یک نشانی پست الکترونیکی معتبر وارد کنید."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "یک 'slug' معتبر شامل حروف، ارقام، خط زیر و یا خط تیره وارد کنید."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "یک نشانی IPv4 معتبر وارد کنید."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "فقط ارقام جدا شده با کاما وارد کنید."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "مطمئن شوید این مقدار حداقل %(min)d نویسه دارد. (الان %(length)d دارد.)"
+msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "مطمئن شوید این مقدار کوچکتر و یا مساوی %s است."
+msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "مطمئن شوید این مقدار بزرگتر و یا مساوی %s است."
+msgstr ""
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "مطمئن شوید این مقدار حداقل %(min)d نویسه دارد. (الان %(length)d دارد.)"
+msgstr ""
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"مطمئن شوید این مقدار حداکثر %(max)d نویسه دارد. (الان %(length)d دارد.)"
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "و"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "مقدار %r معتبر نیست."
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
msgstr "این فیلد نمی تواند پوچ باشد."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "این فیلد نمی تواند پوچ باشد."
+msgstr "این فیلد نمی تواند خالی باشد."
#: db/models/fields/__init__.py:70
#, python-format
@@ -434,14 +426,13 @@ msgid "E-mail address"
msgstr "نشانی پست الکترونیکی"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "مسیر پرونده"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "این مقدار باید یک عدد صحیح باشد."
+msgstr " این مقدار باید شناور باشد."
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -449,7 +440,7 @@ msgstr "عدد اعشاری"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "بزرگ (8 بایت) عدد صحیح"
#: db/models/fields/__init__.py:915
msgid "IP address"
@@ -483,24 +474,24 @@ msgstr "نشانی اینترنتی"
msgid "XML text"
msgstr "متن XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "رابطه یک به یک "
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "رابطه چند به چند"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -559,15 +550,14 @@ msgid "The submitted file is empty."
msgstr "پروندهٔ ارسال‌شده خالیست."
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"مطمئن شوید این مقدار حداکثر %(max)d نویسه دارد. (الان %(length)d دارد.)"
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "لطفا یا فایل ارسال کنید یا دکمه clear را علامت بزنید، نه هردو."
#: forms/fields.py:518
msgid ""
@@ -582,118 +572,115 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "یک گزینهٔ معتبر انتخاب کنید. %(value)s از گزینه‌های موجود نیست."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "فهرستی از مقادیر وارد کنید."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "ترتیب:"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "حذف"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "لطفاً خطای زیر را حل کنید."
+msgstr "لطفا محتوی تکراری برای %(field)s را اصلاح کنید."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
+msgstr "لطفا محتوی تکراری برای %(field)s را که باید یکتا باشد اصلاح کنید."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "لطفاً خطای زیر را حل کنید."
+msgstr "لطفا مقدار تکراری را اصلاح کنید."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
+msgstr "کلید های درون خطی خارجی با هم مطابقت ندارند ."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "یک گزینهٔ معتبر انتخاب کنید. آن گزینه از گزینه‌های موجود نیست."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "یک گزینهٔ معتبر انتخاب کنید. %s از گزینه‌های موجود نیست."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "اکنون:"
+msgstr "در حال حاضر"
#: forms/widgets.py:300
msgid "Change"
msgstr "تغییر"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "سال"
+msgstr "واضح"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "ناشناخته"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "بله"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "خیر"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "بله،خیر،شاید"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d بایت"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr ""
+msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr ""
+msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr ""
+msgstr "%s GB"
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
-msgstr ""
+msgstr "%s TB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
-msgstr ""
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -904,7 +891,7 @@ msgstr "ژوئن"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "ژوئیه"
+msgstr "جولای"
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -932,73 +919,61 @@ msgid "Dec."
msgstr "دسامبر"
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "ژانویه"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "فوریه"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "مارس"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "آوریل"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "مه"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "ژوئن"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "ژوئیه"
+msgstr "جولای"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "اوت"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "سپتامبر"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "اکتبر"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "نوامبر"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "دسامبر"
@@ -1010,7 +985,7 @@ msgstr "یا"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr "،"
#: utils/timesince.py:21
msgid "year"
@@ -1056,25 +1031,25 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr "، %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
-msgstr ""
+msgstr "DATE_FORMAT"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
-msgstr ""
+msgstr "DATETIME_FORMAT"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
-msgstr ""
+msgstr "TIME_FORMAT"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
-msgstr ""
+msgstr "YEAR_MONTH_FORMAT"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
-msgstr ""
+msgstr "MONTH_DAY_FORMAT"
#: views/generic/create_update.py:121
#, python-format
@@ -1090,3 +1065,55 @@ msgstr "%(verbose_name)s با موفقیت به روز شد."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s حذف شد."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s حذف شد."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s با موفقیت به روز شد."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/fi/LC_MESSAGES/django.mo b/django/conf/locale/fi/LC_MESSAGES/django.mo
index 0fbf957c3e..2c9e671185 100644
--- a/django/conf/locale/fi/LC_MESSAGES/django.mo
+++ b/django/conf/locale/fi/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/fi/LC_MESSAGES/django.po b/django/conf/locale/fi/LC_MESSAGES/django.po
index be91cad2f0..c05c97b80c 100644
--- a/django/conf/locale/fi/LC_MESSAGES/django.po
+++ b/django/conf/locale/fi/LC_MESSAGES/django.po
@@ -1,22 +1,18 @@
-# Finnish translation of Django
-# Copyright (C) 2006-2007
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:57+0100\n"
-"PO-Revision-Date: 2007-09-15 00:34+0300\n"
-"Last-Translator: Aku Kotkavuo <aku.kotkavuo@norfello.com>\n"
-"Language-Team: Django I18N <Django-I18N@googlegroups.com>\n"
+"POT-Creation-Date: 2011-02-28 17:34+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: akaihola <akaihol+transifex@ambitone.com>\n"
+"Language-Team: Finnish <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Finnish\n"
-"X-Poedit-Country: FINLAND\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -71,254 +67,261 @@ msgid "Spanish"
msgstr "espanja"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "Argentiinan espanja"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Argentiinan espanja"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "viro"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "baski"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "persia"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "suomi"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "ranska"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "friisi"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "irlanti"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "galicia"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "heprea"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "kroatia"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "unkari"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "indonesia"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islanti"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "italia"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "japani"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "georgia"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "korea"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "liettua"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "latvia"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "makedonia"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Málaga"
+msgstr "malajalam"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "mongolia"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "hollanti"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "norja"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "norja (kirjanorja)"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "norja (uusnorja)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "punjabin kieli"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "puola"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "portugali"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "brasilian portugali"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "romania"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "venäjä"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "slovakia"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "slovenia"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "albaani"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "serbia"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "serbian latina"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "ruotsi"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "tamili"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "thain kieli"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "turkki"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ukraina"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "vietnam"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "kiina (yksinkertaistettu)"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "kiina (perinteinen)"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Syötä oikea arvo."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Syötä oikea URL-osoite."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Tämä URL-osoite on rikkinäinen linkki."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Syötä oikea URL-osoite."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Syötä kelvollinen sähköpostiosoite."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Tässä voidaan käyttää vain kirjaimia (a-z), numeroita (0-9) sekä ala- ja "
"tavuviivoja (_ -)."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Syötä kelvollinen IPv4-osoite."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Vain pilkulla erotetut kokonaisluvut kelpaavat tässä."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Tämän arvon on oltava %(limit_value)s (nyt %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Tämän arvon on oltava enintään %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Tämän luvun on oltava vähintään %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -327,26 +330,26 @@ msgstr ""
"Tähän tarvitaan vähintään %(limit_value)d merkkiä (nyt on vain %(show_value)"
"d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr "Tähän kelpaa enintään %(limit_value)d merkkiä (nyt on %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"\"%(field_name)s\"-kentän on oltava uniikki suhteessa: %(date_field)s %"
"(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s jolla on tämä %(field_label)s, on jo olemassa."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "ja"
@@ -429,7 +432,7 @@ msgid "E-mail address"
msgstr "Sähköpostiosoite"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Tiedostopolku"
@@ -477,24 +480,24 @@ msgstr "URL-osoite"
msgid "XML text"
msgstr "XML-teksti"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Mallia %(model)s pääavaimella %(pk)r ei ole olemassa."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Vierasavain (tyyppi määräytyy liittyvän kentän mukaan)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Yksi-yhteen relaatio"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Moni-moneen relaatio"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -562,7 +565,7 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "Voit joko lähettää tai poistaa tiedoston, muttei kumpaakin samalla."
#: forms/fields.py:518
msgid ""
@@ -576,29 +579,29 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Valitse oikea vaihtoehto. %(value)s ei ole vaihtoehtojen joukossa."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Syötä lista."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Järjestys"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Poista"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Korjaa kaksoisarvo kentälle %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Ole hyvä ja korjaa uniikin kentän %(field)s kaksoisarvo."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -607,89 +610,87 @@ msgstr ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Korjaa allaolevat kaksoisarvot."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Liittyvä perusavain ei vastannut vanhemman perusavainta."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Valitse oikea vaihtoehto. Valintasi ei löydy vaihtoehtojen joukosta."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Valitse oikea vaihtoehto. %s ei löydy vaihtoehtojen joukosta."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" ei kelpaa perusavaimeksi."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Tällä hetkellä:"
+msgstr "Tällä hetkellä"
#: forms/widgets.py:300
msgid "Change"
msgstr "Muokkaa"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr "Poista"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Tuntematon"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Kyllä"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Ei"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "kyllä,ei,ehkä"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d tavu"
msgstr[1] "%(size)d tavua"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s Kt"
+msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s Mt"
+msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s Gt"
+msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s Kt"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s Kt"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -745,31 +746,31 @@ msgstr "sunnuntai"
#: utils/dates.py:10
msgid "Mon"
-msgstr "Ma"
+msgstr "ma"
#: utils/dates.py:10
msgid "Tue"
-msgstr "Ti"
+msgstr "ti"
#: utils/dates.py:10
msgid "Wed"
-msgstr "Ke"
+msgstr "ke"
#: utils/dates.py:10
msgid "Thu"
-msgstr "To"
+msgstr "to"
#: utils/dates.py:10
msgid "Fri"
-msgstr "Pe"
+msgstr "pe"
#: utils/dates.py:11
msgid "Sat"
-msgstr "La"
+msgstr "la"
#: utils/dates.py:11
msgid "Sun"
-msgstr "Su"
+msgstr "su"
#: utils/dates.py:18
msgid "January"
@@ -880,27 +881,27 @@ msgstr "helmi"
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "maaliskuu"
+msgstr "maalis"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "huhtikuu"
+msgstr "huhti"
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "toukokuu"
+msgstr "touko"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "kesäkuu"
+msgstr "kesä"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "heinäkuu"
+msgstr "heinä"
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -994,7 +995,7 @@ msgstr "tai"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1046,23 +1047,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j.n.Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j.n.Y H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "N Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "N j, Y"
@@ -1080,3 +1081,55 @@ msgstr "%(verbose_name)s päivitettiin onnistuneesti."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s on poistettu."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s on poistettu."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s päivitettiin onnistuneesti."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.mo b/django/conf/locale/fr/LC_MESSAGES/django.mo
index c4bf86ccef..7766be0a79 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.mo
+++ b/django/conf/locale/fr/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/fr/LC_MESSAGES/django.po b/django/conf/locale/fr/LC_MESSAGES/django.po
index 866ca2aeac..5d0204e3c2 100644
--- a/django/conf/locale/fr/LC_MESSAGES/django.po
+++ b/django/conf/locale/fr/LC_MESSAGES/django.po
@@ -1,23 +1,18 @@
-# French translation of Django.
# This file is distributed under the same license as the Django package.
-# Copyright (C) 2008 Django Software Foundation and individual contributors.
-#
-# Stéphane Raimbault <stephane.raimbault@gmail.com>, 2009-2010.
-# Claude Paroz <claude@2xlibre.net>, 2009
-# David Larlet <http://larlet.fr>, 2009-2010
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:57+0100\n"
-"PO-Revision-Date: 2010-08-09 14:38+0200\n"
-"Last-Translator: Stéphane Raimbault <stephane.raimbault@gmail.com>\n"
-"Language-Team: French <http://django-fr.org>\n"
+"POT-Creation-Date: 2011-02-28 17:34+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: davidbgk <larlet@gmail.com>\n"
+"Language-Team: French <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n>1;\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -76,252 +71,261 @@ msgid "Argentinian Spanish"
msgstr "Espagnol argentin"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Espagnol argentin"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estonien"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Basque"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Perse"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finlandais"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Français"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Frise"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irlandais"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galicien"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hébreu"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Croate"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Hongrois"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "Indonésien"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandais"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italien"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japonais"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Géorgien"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Coréen"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Lituanien"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Letton"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Macédonien"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr "Malayâlam"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "Mongole"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Hollandais"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norvégien"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Norvégien Bokmal"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Norvégien Nynorsk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Penjabi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Polonais"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugais"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Portugais brésilien"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Roumain"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Russe"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slovaque"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slovène"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Albanais"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Serbe"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Serbe latin"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Suédois"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamoul"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Télougou"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Thaï"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Turc"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukrainien"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vietnamien"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Chinois simplifié"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Chinois traditionnel"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Saisissez une valeur valide."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Saisissez une URL valide."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Cette URL semble être cassée."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Saisissez une URL valide."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Entrez une adresse de courriel valide."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Ce champ ne doit contenir que des lettres, des nombres, des tirets bas _ et "
"des traits d'union."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Saisissez une adresse IPv4 valide."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Saisissez uniquement des chiffres séparés par des virgules."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Assurez-vous que cette valeur est %(limit_value)s (actuellement %(show_value)"
"s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Assurez-vous que cette valeur est inférieure ou égale à %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Assurez-vous que cette valeur est supérieure ou égale à %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -330,7 +334,7 @@ msgstr ""
"Assurez-vous que cette valeur comporte au moins %(limit_value)d caractères "
"(actuellement %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -339,18 +343,18 @@ msgstr ""
"Assurez-vous que cette valeur comporte au maximum %(limit_value)d caractères "
"(actuellement %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"%(field_name)s doit être unique pour la partie %(lookup)s de %(date_field)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Un(e) %(model_name)s avec ce %(field_label)s existe déjà."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "et"
@@ -435,7 +439,7 @@ msgid "E-mail address"
msgstr "Adresse électronique"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Chemin vers le fichier"
@@ -483,24 +487,24 @@ msgstr "URL"
msgid "XML text"
msgstr "Texte XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Le modèle %(model)s avec la clef primaire %(pk)r n'existe pas."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Clé étrangère (type défini par le champ lié)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Relation un à un"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Relation plusieurs à plusieurs"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -569,7 +573,7 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "Envoyez un fichier ou cochez la case d'effacement, mais pas les deux."
#: forms/fields.py:518
msgid ""
@@ -584,32 +588,31 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Sélectionnez un choix valide. %(value)s n'en fait pas partie."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Saisissez une liste de valeurs."
-# Si « : » est requis, créer un ticket
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Ordre"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Supprimer"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Corrigez les données à double dans %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Corrigez les données à double dans %(field)s qui doit contenir des valeurs "
"uniques."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -618,93 +621,91 @@ msgstr ""
"Corrigez les données à double dans %(field_name)s qui doit contenir des "
"valeurs uniques pour la partie %(lookup)s de %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Corrigez les valeurs à double ci-dessous."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La clé étrangère en ligne ne correspond pas à la clé primaire de l'instance "
"parente."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Sélectionnez un choix valide. Ce choix ne fait pas partie de ceux "
"disponibles."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Sélectionnez un choix valide ; %s n'en fait pas partie."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "« %s » n'est pas une valeur correcte pour une clé primaire."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Actuellement :"
+msgstr "Actuellement"
#: forms/widgets.py:300
msgid "Change"
msgstr "Modifier"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr "Effacer"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Inconnu"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Oui"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Non"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "oui, non, peut-être"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d octet"
msgstr[1] "%(size)d octets"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s Ko"
+msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s Mo"
+msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s Go"
+msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s Ko"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s Ko"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -786,8 +787,6 @@ msgstr "sam"
msgid "Sun"
msgstr "dim"
-# Les mois ne sont pas correctement traduisibles
-# http://code.djangoproject.com/ticket/9988
#: utils/dates.py:18
msgid "January"
msgstr "janvier"
@@ -902,7 +901,7 @@ msgstr "mars"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "avril"
+msgstr "avr."
#: utils/dates.py:35
msgctxt "abbrev. month"
@@ -917,7 +916,7 @@ msgstr "juin"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "juillet"
+msgstr "juil."
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -927,7 +926,7 @@ msgstr "août"
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "sept."
+msgstr "sep."
#: utils/dates.py:40
msgctxt "abbrev. month"
@@ -944,79 +943,65 @@ msgctxt "abbrev. month"
msgid "Dec."
msgstr "déc."
-# Les mois ne sont pas correctement traduisibles
-# http://code.djangoproject.com/ticket/9988
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "janvier"
+msgstr "Janvier"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "février"
+msgstr "Février"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "mars"
+msgstr "Mars"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "avril"
+msgstr "Avril"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "mai"
+msgstr "Mai"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "juin"
+msgstr "Juin"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "juillet"
+msgstr "Juillet"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "août"
+msgstr "Août"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "septembre"
+msgstr "Septembre"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "octobre"
+msgstr "Octobre"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "novembre"
+msgstr "Novembre"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "décembre"
+msgstr "Décembre"
#: utils/text.py:136
msgid "or"
@@ -1025,7 +1010,7 @@ msgstr "ou"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1077,23 +1062,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j F Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j F Y, G:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "G:i:s"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
@@ -1111,3 +1096,55 @@ msgstr "L'objet %(verbose_name)s a été mis à jour avec succès."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "L'objet %(verbose_name)s a été supprimé."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "L'objet %(verbose_name)s a été supprimé."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "L'objet %(verbose_name)s a été mis à jour avec succès."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/fy_NL/LC_MESSAGES/django.mo b/django/conf/locale/fy_NL/LC_MESSAGES/django.mo
index 08a7014af6..1cf860958f 100644
--- a/django/conf/locale/fy_NL/LC_MESSAGES/django.mo
+++ b/django/conf/locale/fy_NL/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/fy_NL/LC_MESSAGES/django.po b/django/conf/locale/fy_NL/LC_MESSAGES/django.po
index b2cee6507d..58f9e7cb89 100644
--- a/django/conf/locale/fy_NL/LC_MESSAGES/django.po
+++ b/django/conf/locale/fy_NL/LC_MESSAGES/django.po
@@ -4,14 +4,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:58+0100\n"
-"PO-Revision-Date: 2010-01-27 22:36-0700\n"
-"Last-Translator: Wim Benes <fryskefirefox@gmail.com>\n"
-"Language-Team: FRISIAN <LL@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:34+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: fy_NL\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -70,272 +71,280 @@ msgid "Argentinian Spanish"
msgstr ""
#: conf/global_settings.py:58
-msgid "Estonian"
+msgid "Mexican Spanish"
msgstr ""
#: conf/global_settings.py:59
-msgid "Basque"
+msgid "Estonian"
msgstr ""
#: conf/global_settings.py:60
-msgid "Persian"
+msgid "Basque"
msgstr ""
#: conf/global_settings.py:61
-msgid "Finnish"
+msgid "Persian"
msgstr ""
#: conf/global_settings.py:62
-msgid "French"
+msgid "Finnish"
msgstr ""
#: conf/global_settings.py:63
-msgid "Frisian"
+msgid "French"
msgstr ""
#: conf/global_settings.py:64
-msgid "Irish"
+msgid "Frisian"
msgstr ""
#: conf/global_settings.py:65
-msgid "Galician"
+msgid "Irish"
msgstr ""
#: conf/global_settings.py:66
-msgid "Hebrew"
+msgid "Galician"
msgstr ""
#: conf/global_settings.py:67
-msgid "Hindi"
+msgid "Hebrew"
msgstr ""
#: conf/global_settings.py:68
-msgid "Croatian"
+msgid "Hindi"
msgstr ""
#: conf/global_settings.py:69
-msgid "Hungarian"
+msgid "Croatian"
msgstr ""
#: conf/global_settings.py:70
-msgid "Indonesian"
+msgid "Hungarian"
msgstr ""
#: conf/global_settings.py:71
-msgid "Icelandic"
+msgid "Indonesian"
msgstr ""
#: conf/global_settings.py:72
-msgid "Italian"
+msgid "Icelandic"
msgstr ""
#: conf/global_settings.py:73
-msgid "Japanese"
+msgid "Italian"
msgstr ""
#: conf/global_settings.py:74
-msgid "Georgian"
+msgid "Japanese"
msgstr ""
#: conf/global_settings.py:75
-msgid "Khmer"
+msgid "Georgian"
msgstr ""
#: conf/global_settings.py:76
-msgid "Kannada"
+msgid "Khmer"
msgstr ""
#: conf/global_settings.py:77
-msgid "Korean"
+msgid "Kannada"
msgstr ""
#: conf/global_settings.py:78
-msgid "Lithuanian"
+msgid "Korean"
msgstr ""
#: conf/global_settings.py:79
-msgid "Latvian"
+msgid "Lithuanian"
msgstr ""
#: conf/global_settings.py:80
-msgid "Macedonian"
+msgid "Latvian"
msgstr ""
#: conf/global_settings.py:81
-msgid "Malayalam"
+msgid "Macedonian"
msgstr ""
#: conf/global_settings.py:82
-msgid "Mongolian"
+msgid "Malayalam"
msgstr ""
#: conf/global_settings.py:83
-msgid "Dutch"
+msgid "Mongolian"
msgstr ""
#: conf/global_settings.py:84
-msgid "Norwegian"
+msgid "Dutch"
msgstr ""
#: conf/global_settings.py:85
-msgid "Norwegian Bokmal"
+msgid "Norwegian"
msgstr ""
#: conf/global_settings.py:86
-msgid "Norwegian Nynorsk"
+msgid "Norwegian Bokmal"
msgstr ""
#: conf/global_settings.py:87
-msgid "Punjabi"
+msgid "Norwegian Nynorsk"
msgstr ""
#: conf/global_settings.py:88
-msgid "Polish"
+msgid "Punjabi"
msgstr ""
#: conf/global_settings.py:89
-msgid "Portuguese"
+msgid "Polish"
msgstr ""
#: conf/global_settings.py:90
-msgid "Brazilian Portuguese"
+msgid "Portuguese"
msgstr ""
#: conf/global_settings.py:91
-msgid "Romanian"
+msgid "Brazilian Portuguese"
msgstr ""
#: conf/global_settings.py:92
-msgid "Russian"
+msgid "Romanian"
msgstr ""
#: conf/global_settings.py:93
-msgid "Slovak"
+msgid "Russian"
msgstr ""
#: conf/global_settings.py:94
-msgid "Slovenian"
+msgid "Slovak"
msgstr ""
#: conf/global_settings.py:95
-msgid "Albanian"
+msgid "Slovenian"
msgstr ""
#: conf/global_settings.py:96
-msgid "Serbian"
+msgid "Albanian"
msgstr ""
#: conf/global_settings.py:97
-msgid "Serbian Latin"
+msgid "Serbian"
msgstr ""
#: conf/global_settings.py:98
-msgid "Swedish"
+msgid "Serbian Latin"
msgstr ""
#: conf/global_settings.py:99
-msgid "Tamil"
+msgid "Swedish"
msgstr ""
#: conf/global_settings.py:100
-msgid "Telugu"
+msgid "Tamil"
msgstr ""
#: conf/global_settings.py:101
-msgid "Thai"
+msgid "Telugu"
msgstr ""
#: conf/global_settings.py:102
-msgid "Turkish"
+msgid "Thai"
msgstr ""
#: conf/global_settings.py:103
-msgid "Ukrainian"
+msgid "Turkish"
msgstr ""
#: conf/global_settings.py:104
-msgid "Vietnamese"
+msgid "Ukrainian"
msgstr ""
#: conf/global_settings.py:105
-msgid "Simplified Chinese"
+msgid "Urdu"
msgstr ""
#: conf/global_settings.py:106
+msgid "Vietnamese"
+msgstr ""
+
+#: conf/global_settings.py:107
+msgid "Simplified Chinese"
+msgstr ""
+
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr ""
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Jou in falide wearde."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Jou in falide URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Dit URL liket in ferbrutsen keppeling."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Jou in falide URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr ""
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Jou in falida 'slug' gearsteld mei letters, nûmers, ûnderstreekjes of "
"koppelteken."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Jou in falide IPv4-adres."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Jou allinnich sifers, skieden troch komma's."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s mei dit %(field_label)s bestiet al."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr ""
@@ -418,7 +427,7 @@ msgid "E-mail address"
msgstr ""
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr ""
@@ -466,24 +475,24 @@ msgstr ""
msgid "XML text"
msgstr ""
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -567,54 +576,54 @@ msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Selektearje in falide kar. %(value)s is net ien fan de beskikbere karren."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Jou in list mei weardes."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Oarder"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr ""
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Selektearje in falide kar. Dizze kar is net ien fan de beskikbere karren."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Selektearje in falide kar. %s is net ien fan de beskikbere karren."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
@@ -631,50 +640,50 @@ msgstr ""
msgid "Clear"
msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr ""
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr ""
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
msgstr ""
@@ -1034,23 +1043,23 @@ msgstr ""
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "N j, Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
@@ -1068,3 +1077,55 @@ msgstr "De %(verbose_name)s is súksesfol fernijd."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "De %(verbose_name)s is fuortsmiten."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "De %(verbose_name)s is fuortsmiten."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "De %(verbose_name)s is súksesfol fernijd."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/ga/LC_MESSAGES/django.mo b/django/conf/locale/ga/LC_MESSAGES/django.mo
index 6ab61684b5..9e487dee70 100644
--- a/django/conf/locale/ga/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ga/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ga/LC_MESSAGES/django.po b/django/conf/locale/ga/LC_MESSAGES/django.po
index 55b9f24293..23f82a72f0 100644
--- a/django/conf/locale/ga/LC_MESSAGES/django.po
+++ b/django/conf/locale/ga/LC_MESSAGES/django.po
@@ -4,15 +4,16 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:58+0100\n"
-"PO-Revision-Date: 2010-05-07 17:33+0100\n"
-"Last-Translator: Michael Thornhill <michael@maithu.com>\n"
-"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2011-02-28 17:34+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: mick <michael@maithu.com>\n"
+"Language-Team: Irish <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n < 11 ? "
-"3 : 4;\n"
+"Language: ga\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
+"4)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -67,258 +68,264 @@ msgid "Spanish"
msgstr "Spáinneach"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Spáinnis Airgintín"
+msgstr "Argentinian Spáinnis"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Argentinian Spáinnis"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Eastóinis"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Bascais"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Peirsis"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Fionlainnis"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Francach"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Frisian"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Gaeilge"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Gailísis"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Eabhrach"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hiondúis"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Cróitis"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Ungáiris"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Macadóinis"
+msgstr "Indinéisis"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Mórlainnis"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Iodáilis"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Seapáinis"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Seoirseach"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Ciméiris"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Cannadais"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Cóiréis"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Liotuáinis"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Laitvis"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Macadóinis"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Málaga"
+msgstr "Mailéalaimis"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "Mongóilis"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Ollannach"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Ioruais"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Bokmal Ioruais"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Nynorsk Ioruais"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Puinseáibis"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Polainnis"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portaingéilis"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Portaingéilis Bhrasaíleach"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Rómáinis"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Rúiseach"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slóvaicis"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slóivéinis"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Albanian"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Seirbiach"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Laidin Seirbiach"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Sualainnis"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamailis"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Teileagúis"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Tamailis"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Tuircis"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Úcráinis"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vitneaimis"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Sínis"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Sínis Tradisúinta"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Cuir luach bailí isteach."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Cuir URL bailí isteach."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Dealraíonn sé gur nasc briste é an URL seo."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Cuir URL bailí isteach."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Cuir isteach seoladh ríomhphoist bhailí."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Cuir 'slug' bailí isteach atá déanta as litreacha, uimhreacha, fostríoca nó "
"fleiscíní."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Cuir seoladh bailí IPv4 isteach."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Ná cuir isteach ach digití scartha ag camóga."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Bí cinnte nach bhfuil níos lú ná %(limit_value)s (it is %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Bí cinnte go bhfuil an luach seo cothrom le nó níos lú ná %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Bí cinnte go bhfuil an luach seo cothrom le nó níos mó ná %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -327,7 +334,7 @@ msgstr ""
"Bí cinnte nach bhfuil níos lú ná %(limit_value)d carachtar sa luach seo (it "
"has %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -336,17 +343,17 @@ msgstr ""
"Bí cinnte nach bhfuil níos mó ná %(limit_value)d carachtar sa luach seo %"
"(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "Ní mór a bheith %(field_name)s uathúil don %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Tá %(model_name)s leis an %(field_label)s seo ann cheana."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "agus"
@@ -430,7 +437,7 @@ msgid "E-mail address"
msgstr "R-phost"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Conair comhaid"
@@ -478,24 +485,24 @@ msgstr "URL"
msgid "XML text"
msgstr "Téacs XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Níl %(model)s le eochair %(pk)r ann."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Eochair Eachtracha (cineál a chinnfear de réir réimse a bhaineann)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Duine-le-duine caidreamh"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Go leor le go leor caidreamh"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -564,6 +571,8 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Cuir ceachtar isteach comhad nó an ticbhosca soiléir, ní féidir an dá "
+"sheiceáil."
#: forms/fields.py:518
msgid ""
@@ -578,31 +587,31 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Déan rogha bhailí. Ní ceann de na roghanna é %(value)s."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Cuir liosta de luachanna isteach."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Ord"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Cealaigh"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Le do thoil ceartaigh an sonra dúbail le %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Ceart le do thoil na sonraí a dhúbailt le haghaidh %(field)s, chaithfidh a "
"bheith uathúil."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -611,94 +620,90 @@ msgstr ""
"Ceart le do thoil na sonraí a dhúbailt le haghaidh %(field_name)s ní mór a "
"bheith uaithúil le haghaidh an %(lookup)s i %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Le do thoil ceartaigh na luachanna dúbail thíos."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Ní raibh an eochair eachtrach comhoiriúnach leis an tuismitheoir ásc príomh-"
"eochair."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Déan rogha bhailí. Ní ceann de na roghanna é do roghasa."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Déan rogha bhailí. Ní ceann de na roghanna é %s."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "Níl \"%s\" luach bailí le príomh-eochair."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Ag an am seo."
+msgstr "Faoi láthair"
#: forms/widgets.py:300
msgid "Change"
msgstr "Athraigh"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "An Clar"
+msgstr "Glan"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Gan aithne"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Tá"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Níl"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "tá, níl, b'fhéidir"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d beart"
msgstr[1] "%(size)d bearta"
msgstr[2] "%(size)d bearta"
-msgstr[3] "%(size)d bearta"
-msgstr[4] "%(size)d bearta"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -879,17 +884,17 @@ msgstr "nol"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Ean"
+msgstr "Ean."
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Fea"
+msgstr "Fea."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "Mí Márta"
+msgstr "Márta"
#: utils/dates.py:34
msgctxt "abbrev. month"
@@ -904,109 +909,97 @@ msgstr "Bealtaine"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Mí an Mheithimh"
+msgstr "Meitheamh"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Mí Iúil"
+msgstr "Iúil"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Lún"
+msgstr "Lún."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Mea"
+msgstr "Meá."
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Dei"
+msgstr "Dei."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Sam"
+msgstr "Sam."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Nol"
+msgstr "Nol."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "Mí Eanair"
+msgstr "Eanáir"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "Mí Feabhra"
+msgstr "Feabhra"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "Mí Márta"
+msgstr "Márta"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "Aibreán"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "Bealtaine"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "Mí an Mheithimh"
+msgstr "Meitheamh"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "Mí Iúil"
+msgstr "Iúil"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "Lúnasa"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "Meán Fómhair"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "Deireadh Fómhair"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "Samhain"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "Mí na Nollag"
+msgstr "Nollaig"
#: utils/text.py:136
msgid "or"
@@ -1015,34 +1008,28 @@ msgstr "nó"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
msgid_plural "years"
msgstr[0] "blian"
-msgstr[1] "blianta"
-msgstr[2] "blianta"
-msgstr[3] "blianta"
-msgstr[4] "blianta"
+msgstr[1] "bliana"
+msgstr[2] "bliana"
#: utils/timesince.py:22
msgid "month"
msgid_plural "months"
msgstr[0] "mí"
-msgstr[1] "mhí"
-msgstr[2] "mhí"
-msgstr[3] "mhí"
-msgstr[4] "mhí"
+msgstr[1] "mí"
+msgstr[2] "mí"
#: utils/timesince.py:23
msgid "week"
msgid_plural "weeks"
msgstr[0] "seachtain"
-msgstr[1] "seachtain"
-msgstr[2] "seachtain"
-msgstr[3] "seachtain"
-msgstr[4] "seachtain"
+msgstr[1] "seachtaine"
+msgstr[2] "seachtaine"
#: utils/timesince.py:24
msgid "day"
@@ -1050,26 +1037,20 @@ msgid_plural "days"
msgstr[0] "lá"
msgstr[1] "laethanta"
msgstr[2] "laethanta"
-msgstr[3] "laethanta"
-msgstr[4] "laethanta"
#: utils/timesince.py:25
msgid "hour"
msgid_plural "hours"
msgstr[0] "uair"
-msgstr[1] "uair"
-msgstr[2] "uair"
-msgstr[3] "uair"
-msgstr[4] "uair"
+msgstr[1] "uaireanta"
+msgstr[2] "uaireanta"
#: utils/timesince.py:26
msgid "minute"
msgid_plural "minutes"
msgstr[0] "nóiméad"
-msgstr[1] "nóiméad"
-msgstr[2] "nóiméad"
-msgstr[3] "nóiméad"
-msgstr[4] "nóiméad"
+msgstr[1] "nóiméaid"
+msgstr[2] "nóiméaid"
#: utils/timesince.py:45
msgid "minutes"
@@ -1085,23 +1066,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "N j, Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "DATETIME_FORMAT"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
@@ -1119,3 +1100,55 @@ msgstr "D'éirigh le nuashonrú %(verbose_name)s."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "Scriosadh %(verbose_name)s."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Scriosadh %(verbose_name)s."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "D'éirigh le nuashonrú %(verbose_name)s."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.mo b/django/conf/locale/gl/LC_MESSAGES/django.mo
index 1eaf2ab091..efe7370a0a 100644
--- a/django/conf/locale/gl/LC_MESSAGES/django.mo
+++ b/django/conf/locale/gl/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/gl/LC_MESSAGES/django.po b/django/conf/locale/gl/LC_MESSAGES/django.po
index c55844ddf5..86b248bd70 100644
--- a/django/conf/locale/gl/LC_MESSAGES/django.po
+++ b/django/conf/locale/gl/LC_MESSAGES/django.po
@@ -1,21 +1,18 @@
-# Translation of django.po to Galego
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:58+0100\n"
-"PO-Revision-Date: 2007-05-28 17:29+0200\n"
-"Last-Translator: Afonso Fernández Nogueira <fonzzo.django@gmail.com>\n"
-"Language-Team: Galego\n"
+"POT-Creation-Date: 2011-02-28 17:34+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Galician\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -30,9 +27,8 @@ msgid "Bengali"
msgstr "bengalí"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "romanés"
+msgstr ""
#: conf/global_settings.py:48
msgid "Catalan"
@@ -63,304 +59,291 @@ msgid "English"
msgstr "inglés"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "inglés"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "español"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "español de Arxentina"
+msgstr ""
#: conf/global_settings.py:58
#, fuzzy
-msgid "Estonian"
-msgstr "romanés"
+msgid "Mexican Spanish"
+msgstr "español"
#: conf/global_settings.py:59
-msgid "Basque"
+msgid "Estonian"
msgstr ""
#: conf/global_settings.py:60
-#, fuzzy
-msgid "Persian"
-msgstr "serbio"
+msgid "Basque"
+msgstr ""
#: conf/global_settings.py:61
+msgid "Persian"
+msgstr ""
+
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "finés"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "francés"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "brasileiro"
+msgstr ""
-#: conf/global_settings.py:64
-#, fuzzy
+#: conf/global_settings.py:65
msgid "Irish"
-msgstr "turco"
+msgstr ""
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "galego"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "hebreo"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:68
-#, fuzzy
+#: conf/global_settings.py:69
msgid "Croatian"
-msgstr "catalán"
+msgstr ""
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "húngaro"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "macedonio"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islandés"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "italiano"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "xaponés"
-#: conf/global_settings.py:74
-#, fuzzy
+#: conf/global_settings.py:75
msgid "Georgian"
-msgstr "alemán"
+msgstr ""
-#: conf/global_settings.py:75
-#, fuzzy
+#: conf/global_settings.py:76
msgid "Khmer"
-msgstr "Ehime"
+msgstr ""
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "canará"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "coreano"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "letón"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "macedonio"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "macedonio"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "holandés"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "noruegués"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "noruegués"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "noruegués"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "polaco"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
-msgstr "portugués"
+msgstr ""
-#: conf/global_settings.py:90
-#, fuzzy
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
-msgstr "portugués"
+msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "romanés"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "ruso"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "eslovaco"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "esloveno"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "romanés"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "serbio"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "serbio"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "sueco"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "támil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "támil"
+msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "turco"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ucraíno"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "nome"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "chinés simplificado"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "chinés tradicional"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Insira un valor válido."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Insira un URL válido."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Semella que este URL é unha ligazón rota."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Insira un URL válido."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Insira un enderezo de correo electrónico válido."
-#: core/validators.py:123 forms/fields.py:958
-#, fuzzy
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"Este valor soamente pode conter letras, números, guións baixos (_) e guións."
-#: core/validators.py:126 forms/fields.py:951
-#, fuzzy
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
-msgstr "Insira un enderezo de correo electrónico válido."
+msgstr ""
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Insira só díxitos separados por comas."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "Asegúrese de que este valor ten polo menos %d caracteres."
+msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Asegúrese de que este valor é menor ou igual a %s."
+msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Asegúrese de que este valor é maior ou igual a %s"
+msgstr ""
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "Asegúrese de que este valor ten polo menos %d caracteres."
+msgstr ""
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "Asegúrese de que este valor ten como máximo %d caracteres."
+msgstr ""
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "Débese encher este campo se %(field)s é %(value)s"
+msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
-#, fuzzy, python-format
+#: db/models/base.py:784 db/models/base.py:792
+#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "Xa existe un/ha %(optname)s con este/a %(fieldname)s."
+msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "e"
@@ -374,9 +357,8 @@ msgid "This field cannot be null."
msgstr "Este campo non pode ser nulo."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Este campo non pode ser nulo."
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -402,9 +384,9 @@ msgid "Boolean (Either True or False)"
msgstr "Valor booleano (verdadeiro ou falso)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
-#, fuzzy, python-format
+#, python-format
msgid "String (up to %(max_length)s)"
-msgstr "Cadea (ata %(maxlength)s caracteres)"
+msgstr ""
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
@@ -424,9 +406,8 @@ msgid "Invalid date: %s"
msgstr "Data non válida: %s"
#: db/models/fields/__init__.py:670
-#, fuzzy
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Insira unha data/hora válida en formato AAAA-MM-DD HH:MM."
+msgstr ""
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
@@ -445,14 +426,13 @@ msgid "E-mail address"
msgstr "Enderezo de correo electrónico"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Ruta do ficheiro"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "Este valor ten que ser polo menos %s."
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -483,9 +463,8 @@ msgid "Time"
msgstr "Hora"
#: db/models/fields/__init__.py:1044
-#, fuzzy
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Insira unha hora válida en formato HH:MM."
+msgstr ""
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -495,24 +474,24 @@ msgstr "URL"
msgid "XML text"
msgstr "Texto XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -573,10 +552,10 @@ msgid "The submitted file is empty."
msgstr "O ficheiro enviado está baleiro."
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "Asegúrese de que este valor ten como máximo %d caracteres."
+msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
@@ -591,128 +570,123 @@ msgstr ""
"corrupta."
#: forms/fields.py:650 forms/fields.py:725
-#, fuzzy, python-format
+#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
-"Escolla unha opción válida. %s non se atopa entre as opcións dispoñíbeis."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Insira unha lista de valores."
-#: forms/formsets.py:308 forms/formsets.py:310
-#, fuzzy
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr "Orde:"
+msgstr ""
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Eliminar"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Por favor, corrixa o erro de embaixo."
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "Por favor, corrixa o erro de embaixo."
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Escolla unha opción válida. Esta opción non se atopa entre as opcións "
"dispoñíbeis"
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
"Escolla unha opción válida. %s non se atopa entre as opcións dispoñíbeis."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Agora:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Modificar"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "ano"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Descoñecido"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Si"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Non"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "si,non,quizais"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -767,38 +741,32 @@ msgid "Sunday"
msgstr "domingo"
#: utils/dates.py:10
-#, fuzzy
msgid "Mon"
-msgstr "un"
+msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Tue"
-msgstr "martes"
+msgstr ""
#: utils/dates.py:10
msgid "Wed"
msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Thu"
-msgstr "Turgovia"
+msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Fri"
-msgstr "Uri"
+msgstr ""
#: utils/dates.py:11
-#, fuzzy
msgid "Sat"
-msgstr "Saitama"
+msgstr ""
#: utils/dates.py:11
-#, fuzzy
msgid "Sun"
-msgstr "domingo"
+msgstr ""
#: utils/dates.py:18
msgid "January"
@@ -899,139 +867,126 @@ msgstr "dec"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "xan."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "feb."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "marzo"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "abril"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "maio"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "xuño"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "xullo"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "ago."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "set."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "out."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "nov."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "dec."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "xaneiro"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "febreiro"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "marzo"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "abril"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "maio"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "xuño"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "xullo"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "agosto"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "setembro"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "outubro"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "novembro"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "decembro"
+msgstr ""
#: utils/text.py:136
-#, fuzzy
msgid "or"
-msgstr "catro"
+msgstr ""
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
@@ -1075,9 +1030,8 @@ msgstr[0] "minuto"
msgstr[1] "minutos"
#: utils/timesince.py:45
-#, fuzzy
msgid "minutes"
-msgstr "minuto"
+msgstr ""
#: utils/timesince.py:50
#, python-format
@@ -1089,23 +1043,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "d-m-Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "d-m-Y H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "m Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "d m"
@@ -1123,3 +1077,55 @@ msgstr "Actualizouse correctamente o/a %(verbose_name)s."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "Eliminouse o/a %(verbose_name)s"
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Eliminouse o/a %(verbose_name)s"
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Actualizouse correctamente o/a %(verbose_name)s."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/he/LC_MESSAGES/django.mo b/django/conf/locale/he/LC_MESSAGES/django.mo
index 877fa1f27f..548b7ab0a5 100644
--- a/django/conf/locale/he/LC_MESSAGES/django.mo
+++ b/django/conf/locale/he/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/he/LC_MESSAGES/django.po b/django/conf/locale/he/LC_MESSAGES/django.po
index 82ce276a82..8701fd34ff 100644
--- a/django/conf/locale/he/LC_MESSAGES/django.po
+++ b/django/conf/locale/he/LC_MESSAGES/django.po
@@ -1,21 +1,18 @@
-# translation of Django.
-# Copyright (C) 2008 The Django Project
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:58+0100\n"
-"PO-Revision-Date: 2010-05-09 15:10-0500\n"
+"POT-Creation-Date: 2011-02-28 17:34+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
"Last-Translator: Alex <alex.gaynor@gmail.com>\n"
-"Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
+"Language-Team: Hebrew <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Bookmarks: -1,988,-1,-1,-1,-1,-1,-1,-1,-1\n"
-"X-Generator: Lokalize 1.0\n"
+"Language: he\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -70,253 +67,259 @@ msgid "Spanish"
msgstr "ספרדית"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "ספרדית ארגנטינאית"
+msgstr "ספרדית ארגנטינית"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "ספרדית ארגנטינית"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "אסטונית"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "בסקית"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "פרסית"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "פינית"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "צרפתית"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "פריזית"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "אירית"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "גאליציאנית"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "עברית"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "הינדי"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "קרואטית"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "הונגרית"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "אינדונזית"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "איסלנדית"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "איטלקית"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "יפנית"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "גיאורגית"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "חמר"
-# זו שפה הודית, אין קשר לקנדה המדינה
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "קאנאדה"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "קוריאנית"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "ליטאית"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "לטבית"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "מקדונית"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "מאלאגה"
+msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "מונגולי"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "הולנדית"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "נורווגית"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "נורבגית ספרותית"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "נורבגית חדשה"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "פולנית"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "פורטוגזית"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "פורטוגזית ברזילאית"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "רומנית"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "רוסית"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "סלובקית"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "סלובנית"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "אלבנית"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "סרבית"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "סרבית לטינית"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "שוודית"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "טמילית"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "טלגו"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "תאילנדית"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "טורקית"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "אוקראינית"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "וייטנאמית"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "סינית פשוטה"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "סינית מסורתית"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "יש להזין ערך חוקי."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "יש להזין URL חוקי."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "ה־URL הזה נראה כקישור שבור."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "יש להזין URL חוקי."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "יש להזין כתובת דוא\"ל חוקית."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "יש להזין ערך המכיל אותיות, ספרות, קווים תחתונים ומקפים בלבד."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "יש להזין כתובת IPv4 חוקית."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "יש להזין רק ספרות מופרדות בפסיקים."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "יש לוודא שערך זה הינו %(limit_value)s (כרגע %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "יש לוודא שערך זה פחות מ או שווה ל־%(limit_value)s ."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "יש לוודא שהערך גדול מ או שווה ל־%(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -324,7 +327,7 @@ msgid ""
msgstr ""
"יש לוודא שערך זה מכיל לפחות %(limit_value)d תווים (מכיל %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -332,17 +335,17 @@ msgid ""
msgstr ""
"יש לוודא שערך זה מכיל %(limit_value)d תווים לכל היותר (מכיל %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s חייב להיות ייחודי ל%(lookup)s של ה־%(date_field)s"
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s·עם·%(field_label)s·זה קיימת כבר."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "ו"
@@ -425,7 +428,7 @@ msgid "E-mail address"
msgstr "כתובת דוא\"ל"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "נתיב קובץ"
@@ -473,24 +476,24 @@ msgstr "URL"
msgid "XML text"
msgstr "טקסט XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "מודל %(model)s עם מפתח ראשי %(pk)r אינו קיים."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (הסוג נקבע לפי השדה המקושר)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "יחס של אחד לאחד"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "יחס של רבים לרבים"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -555,7 +558,7 @@ msgstr "על שם הקובץ להיות לא יותר מ־%(max)d תווים (י
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "נא לשים קובץ או סימן את התיבה לניקוי, לא שניהם."
#: forms/fields.py:518
msgid ""
@@ -568,29 +571,29 @@ msgstr "נא להעלות תמונה חוקית. הקובץ שהעלת אינו
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "יש לבחור אפשרות חוקית. %(value)s אינו בין האפשרויות הזמינות."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "יש להזין רשימת ערכים"
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "מיון"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "מחיקה"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "נא לתקן את הערכים הכפולים ל%(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "נא לתקן את הערכים הכפולים ל%(field)s, שערכים בו חייבים להיות ייחודיים."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -599,89 +602,87 @@ msgstr ""
"נא לתקן את הערכים הכפולים %(field_name)s, שחייבים להיות ייחודיים ל%(lookup)s "
"של %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "נא לתקן את הערכים הכפולים למטה."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "המפתח הזר ה־inline לא התאים למפתח הראשי של האב."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "יש לבחור אפשרות חוקית; אפשרות זו אינה אחת מהזמינות."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "יש לבחור אפשרות חוקית. %s אינו בין האפשרויות הזמינות."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" איננו חוקי כמפתח ראשי."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "הנוכחי:"
+msgstr "עכשיו"
#: forms/widgets.py:300
msgid "Change"
msgstr "שינוי"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "קלייר"
+msgstr "לסלק"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "לא ידוע"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "כן"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "לא"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "כן,לא,אולי"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "בית %(size)d "
msgstr[1] "%(size)d בתים"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr "%s ק\"ב"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr "%s מ\"ב"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr "%s ג\"ב"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s ט\"ב"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s פ\"ב"
#: utils/dateformat.py:42
msgid "p.m."
@@ -862,22 +863,22 @@ msgstr "דצמ"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "ינו'"
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "פבר'"
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "מרס"
+msgstr "מרץ"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "אפריל"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
@@ -897,96 +898,84 @@ msgstr "יולי"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "אוג'"
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "ספט'"
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "אוק'"
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "נוב'"
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "דצמ'"
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "ינואר"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "פברואר"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "מרס"
+msgstr "מרץ"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "אפריל"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "מאי"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "יוני"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "יולי"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "אוגוסט"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "ספטמבר"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "אוקטובר"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "נובמבר"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "דצמבר"
@@ -998,7 +987,7 @@ msgstr "או"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1050,23 +1039,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "d.m.Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "d.m.‏Y H:i:s"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i:s"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "m.Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "d.m"
@@ -1084,3 +1073,55 @@ msgstr "ה־%(verbose_name)s עודכן בהצלחה."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "ה־%(verbose_name)s נמחק."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "ה־%(verbose_name)s נמחק."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "ה־%(verbose_name)s עודכן בהצלחה."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/hi/LC_MESSAGES/django.mo b/django/conf/locale/hi/LC_MESSAGES/django.mo
index 8d0f4bb367..318f8afabf 100644
--- a/django/conf/locale/hi/LC_MESSAGES/django.mo
+++ b/django/conf/locale/hi/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/hi/LC_MESSAGES/django.po b/django/conf/locale/hi/LC_MESSAGES/django.po
index 1f90d12406..e6f4685d8a 100644
--- a/django/conf/locale/hi/LC_MESSAGES/django.po
+++ b/django/conf/locale/hi/LC_MESSAGES/django.po
@@ -1,22 +1,18 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
-"Project-Id-Version: Django SVN\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:58+0100\n"
-"PO-Revision-Date: 2008-11-12 08:14+0530\n"
-"Last-Translator: Thejaswi Puthraya <thejaswi.puthraya@gmail.com>\n"
-"Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2011-02-28 17:34+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Hindi\n"
-"X-Poedit-Country: INDIA\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -31,9 +27,8 @@ msgid "Bengali"
msgstr "बंगाली"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "एस्टोनियन"
+msgstr ""
#: conf/global_settings.py:48
msgid "Catalan"
@@ -64,296 +59,291 @@ msgid "English"
msgstr "अंग्रेज़ी "
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "अंग्रेज़ी "
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "स्पानिश"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "अर्जेंटीनी स्पानिश"
+msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "स्पानिश"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "एस्टोनियन"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "बास्क"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "पारसी"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "फ़िन्निश"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "फ्रेंच"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "फ्रैस्लान्ड"
+msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "आयरिश"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "गलिशियन"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "हि‍ब्रू"
-#: conf/global_settings.py:67
-#, fuzzy
+#: conf/global_settings.py:68
msgid "Hindi"
-msgstr "हैलान्ड"
+msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "क्रोयेशियन"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "हंगेरियन"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "मेसिडोनियन"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "आयिस्लान्डिक"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "इटैलियन"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "जपानी"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "ज्योर्जियन"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "ख्मेर"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "कन्‍नड़"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "कोरियन"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "लिथुवेनियन"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "लात्वियन"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "मेसिडोनियन"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "मलगा"
+msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "मेसिडोनियन"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "डच"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "नार्वेजियन"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "नार्वेजियन"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "नार्वेजियन"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "पोलिश"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
-msgstr "पुर्तगाली"
+msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "ब्रजिलियन पुर्तगाली"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "रोमानियन"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "रूसी"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "स्लोवाक"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "स्लोवेनियन"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "अलाकान्ट"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "सर्बियन"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "सर्बियन"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "स्वीडिश"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "तमिल"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "तेलुगु"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "तमिल"
+msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "तुर्किश"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "यूक्रानियन"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "वियेन्ना"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "सरल चीनी"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "पारम्परिक चीनी"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "एक मान्य मूल्य दर्ज करें"
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "वैध यू.आर.एल भरें ।"
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr ""
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "वैध यू.आर.एल भरें ।"
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "मान्य ईमेल पता भरें"
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "वैध आइ.पि वी 4 पता भरें ।"
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "अल्पविराम अंक मात्र ही भरें ।"
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "इस %(field_label)s के साथ एक %(model_name)s पहले से ही उपस्थित है ।"
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "और"
@@ -367,9 +357,8 @@ msgid "This field cannot be null."
msgstr "यह मूल्य खाली नहीं हो सकता ।"
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "यह मूल्य खाली नहीं हो सकता ।"
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -437,14 +426,13 @@ msgid "E-mail address"
msgstr "ईमेल पता"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "संचिका पथ"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "यह मूल्य पूर्णांक होना चाहिए ।"
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -486,24 +474,24 @@ msgstr "यू.आर.एल"
msgid "XML text"
msgstr "एक्स.एम.एल पाठ"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -580,119 +568,116 @@ msgstr "वैध चित्र निवेदन करें । आप क
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "मान्य इच्छा चयन करें । %(value)s लभ्य इच्छाओं में उप्लब्ध नहीं हैं ।"
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "मूल्य सूची दर्ज करें ।"
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "छाटें"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "मिटाएँ"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "कृपया नीचे पायी गयी गलती ठीक करें ।"
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "कृपया नीचे पायी गयी गलती ठीक करें ।"
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "मान्य विकल्प चयन करें । यह विकल्प उपस्थित विकल्पों में नहीं है ।"
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "मान्य विकल्प चयन करें । %s उपस्थित विकल्पों में नहीं है ।"
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "प्रचलित रूप में:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "बदलें"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "साल"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "अनजान"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "हाँ"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "नहीं"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "हाँ, नहीं, शायद"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d बाइट"
msgstr[1] "%(size)d बाइट"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s के.बी"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s एम.बी"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s जी.बी"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s के.बी"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s के.बी"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -873,134 +858,122 @@ msgstr "दिस्"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "जन."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "फ़र."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "मार्च"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "अप्रैल"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "मई"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "जून"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "जुलाई"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "अग."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "सितम्."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "अक्ट."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "नव."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "दिस्."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "जनवरी"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "फ़रवरी"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "मार्च"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "अप्रैल"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "मई"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "जून"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "जुलाई"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "अगस्त"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "सितमबर"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "अक्टूबर"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "नवमबर"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "दिसमबर"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1061,23 +1034,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "तिथि_प्रारूप"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "तिथिसमय_प्रारूप"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "समय_प्रारूप"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "वर्ष_महीना_प्रारूप"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "महीना_दिन_प्रारूप"
@@ -1095,3 +1068,55 @@ msgstr "%(verbose_name)s को कामयाबी से अद्यतन
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s को मिटाया गया हैं ।"
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s को मिटाया गया हैं ।"
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s को कामयाबी से अद्यतन किया गया हैं ।"
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/hr/LC_MESSAGES/django.mo b/django/conf/locale/hr/LC_MESSAGES/django.mo
index 223cd7bc7f..6cf33835ab 100644
--- a/django/conf/locale/hr/LC_MESSAGES/django.mo
+++ b/django/conf/locale/hr/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/hr/LC_MESSAGES/django.po b/django/conf/locale/hr/LC_MESSAGES/django.po
index 0c0f28a11a..26d7602d13 100644
--- a/django/conf/locale/hr/LC_MESSAGES/django.po
+++ b/django/conf/locale/hr/LC_MESSAGES/django.po
@@ -1,17 +1,19 @@
+# This file is distributed under the same license as the Django package.
+#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:58+0100\n"
-"PO-Revision-Date: 2010-05-10 18:56+0200\n"
-"Last-Translator: Aljosa Mohorovic <aljosa.mohorovic@gmail.com>\n"
-"Language-Team: Django i18n team <django-i18n@googlegroups.com>\n"
+"POT-Creation-Date: 2011-02-28 17:35+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: Croatian <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
-"n%100==4 ? 2 : 3);\n"
-"X-Generator: Lokalize 1.0\n"
+"Language: hr\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -66,256 +68,263 @@ msgid "Spanish"
msgstr "Španjolski"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "Argentinski španjolski"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Argentinski španjolski"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estonski"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Baskijski"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Perzijski"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finski"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Francuski"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Frizijski"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irski"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galičanski"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebrejski"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Hrvatski"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Mađarski"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "Indonezijski"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandski"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Talijanski"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japanski"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Gruzijski"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Kambođanski"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Koreanski"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Litvanski"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Latvijski"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Makedonski"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Malaga"
+msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "Mongolski"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Nizozemski"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norveški"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Norveški Bokmal"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Norveški Nynorsk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Poljski"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugalski"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Brazilski portugalski"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Rumunjski"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Ruski"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slovački"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slovenski"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Albanski"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Srpski"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Latinski srpski"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Švedski"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamilski"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Teluški"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Thai (tajlandski)"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Turski"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukrajinski"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vijetnamski"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Pojednostavljeni kineski"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Tradicionalni kineski"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Unesite ispravnu vrijednost."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Unesite ispravan URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Izgleda da je URL neispravan."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Unesite ispravan URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Unesite ispravnu e-mail adresu."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Unesite ispravan 'slug' koji se sastoji samo od slova, brojeva, povlaka ili "
"crtica."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Unesite ispravnu IPv4 adresu."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Unesite samo brojeve razdvojene zarezom."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Osigurajte da ova vrijednost ima %(limit_value)s (trenutno je %(show_value)"
"s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Osigurajte da je ova vrijednost manja ili jednaka %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Osigurajte da je ova vrijednost veća ili jednaka %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -324,7 +333,7 @@ msgstr ""
"Osigurajte da ova vrijednost ima najmanje %(limit_value)d znakova (ima %"
"(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -333,18 +342,18 @@ msgstr ""
"Osigurajte da ova vrijednost ima najviše %(limit_value)d znakova (ima %"
"(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"%(field_name)s mora biti jedinstven pojam za %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s sa navedenim %(field_label)s već postoji."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "i"
@@ -428,7 +437,7 @@ msgid "E-mail address"
msgstr "E-mail adresa"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Put do datoteke"
@@ -476,24 +485,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML tekst"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Model %(model)s sa pk %(pk)r ne postoji."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (type determined by related field)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "One-to-one relationship"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Many-to-many relationship"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -578,31 +587,31 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Odaberite iz ponuđenog. %(value)s nije ponuđen kao opcija."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Unesite listu vrijednosti."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Redoslijed:"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Izbriši"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ispravite duplicirane podatke za %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Molimo ispravite duplicirane podatke za %(field)s, koji moraju biti "
"jedinstveni."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -611,59 +620,57 @@ msgstr ""
"Molimo ispravite duplicirane podatke za %(field_name)s koji moraju biti "
"jedinstveni za %(lookup)s u %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Molimo ispravite duplicirane vrijednosti ispod."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "The inline foreign key did not match the parent instance primary key."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Izaberite ispravnu opciju. Ta opcija nije jedna od dostupnih opcija."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Odaberite iz ponuđenog. %s nije ponuđen kao opcija."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" nije ispravna vrijednost za primarni kluč."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Trenutno:"
+msgstr "Trenutno"
#: forms/widgets.py:300
msgid "Change"
msgstr "Promijeni"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Nepoznat pojam"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Da"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "da,ne,možda"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -672,30 +679,30 @@ msgstr[1] "%(size)d byte-a"
msgstr[2] "%(size)d byte-a"
msgstr[3] "%(size)d byte-a"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -886,27 +893,27 @@ msgstr "Velj."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "Ožujak"
+msgstr "Ožu."
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Travanj"
+msgstr "Tra."
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "Svibanj"
+msgstr "Svi."
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Lipanj"
+msgstr "Lip."
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Srpanj"
+msgstr "Srp."
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -1064,23 +1071,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j. N Y."
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. N Y. G:i T"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "G:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y."
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1098,3 +1105,55 @@ msgstr "%(verbose_name)s je uspješno promijenjeno."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s je izbrisano."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s je izbrisano."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s je uspješno promijenjeno."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/hu/LC_MESSAGES/django.mo b/django/conf/locale/hu/LC_MESSAGES/django.mo
index 82b85c2fd6..ae97bd33a6 100644
--- a/django/conf/locale/hu/LC_MESSAGES/django.mo
+++ b/django/conf/locale/hu/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/hu/LC_MESSAGES/django.po b/django/conf/locale/hu/LC_MESSAGES/django.po
index 8a13e34d38..d3eb7fd2d4 100644
--- a/django/conf/locale/hu/LC_MESSAGES/django.po
+++ b/django/conf/locale/hu/LC_MESSAGES/django.po
@@ -1,18 +1,18 @@
-# translation of django.po to Hungarian
-# This file is distributed under the same license as the django package.
+# This file is distributed under the same license as the Django package.
+#
msgid ""
msgstr ""
-"Project-Id-Version: django\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:58+0100\n"
-"PO-Revision-Date: 2008-08-30 01:11+0200\n"
-"Last-Translator: Szilveszter Farkas <szilveszter.farkas@gmail.com>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:35+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Hangya <transifex@hangya.net>\n"
+"Language-Team: Hungarian <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: hu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -27,9 +27,8 @@ msgid "Bengali"
msgstr "Bengáli"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "Észt"
+msgstr "Bosnyák"
#: conf/global_settings.py:48
msgid "Catalan"
@@ -60,305 +59,293 @@ msgid "English"
msgstr "Angol"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Angol"
+msgstr "Brit angol"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Spanyol"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Argentín spanyol"
+msgstr "Argentin spanyol"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Argentin spanyol"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Észt"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Baszk "
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Perzsa"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finn"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Francia"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "Friesland"
+msgstr "Fríz"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Ír"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Gall"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Héber"
-#: conf/global_settings.py:67
-#, fuzzy
+#: conf/global_settings.py:68
msgid "Hindi"
-msgstr "Highland"
+msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Horvát"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Magyar"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Macedón"
+msgstr "Indonéz"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Izlandi"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Olasz"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japán"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Grúz"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Koreai"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Litván"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Lett"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Macedón"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Malaga"
+msgstr "Malajálam"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Macedón"
+msgstr "Mongol"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Holland"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norvég"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Norvég"
+msgstr "Bokmål norvég"
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Norvég"
+msgstr "Nynorsk norvég"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Punjabi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Lengyel"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugál"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Brazíliai portugál"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Román"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Orosz"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Szlovák"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Szlovén"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Alacant"
+msgstr "Albán"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Szerb"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "Szerb"
+msgstr "Latin betűs szerb"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Svéd"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "Tamil"
+msgstr "Thai"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Török"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukrán"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "Bécs"
+msgstr "Vietnámi"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Egyszerű kínai"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Hagyományos kínai"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Adjon meg egy érvényes értéket."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Adjon meg egy érvényes URL-t."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Ez a hivatkozás törött linknek tűnik."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Adjon meg egy érvényes URL-t."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Írjon be egy érvényes e-mail címet."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Az URL barát cím csak betűket, számokat, aláhúzásokat és kötőjeleket "
"tartalmazhat."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Írjon be egy érvényes IPv4 címet."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Csak számokat adjon meg, vesszővel elválasztva."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Bizonyosodjon meg arról, hogy ez az érték legalább %(min)d karaktert "
-"tartalmaz (jelenlegi hossza: %(length)d)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Bizonyosodjon meg arról, hogy az érték %s vagy kisebb."
+msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Bizonyosodjon meg arról, hogy az érték %s vagy nagyobb."
+msgstr ""
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Bizonyosodjon meg arról, hogy ez az érték legalább %(min)d karaktert "
-"tartalmaz (jelenlegi hossza: %(length)d)."
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Bizonyosodjon meg arról, hogy ez az érték legfeljebb %(max)d karaktert "
-"tartalmaz (jelenlegi hossza: %(length)d)."
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "Ezt a mezőt meg kell adni, ha %(field)s értéke %(value)s"
+msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
-#, fuzzy, python-format
+#: db/models/base.py:784 db/models/base.py:792
+#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-"A megadott %(field)s mezőhöz már létezik %(type)s típusú %(object)s elem."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "és"
@@ -372,9 +359,8 @@ msgid "This field cannot be null."
msgstr "Ez a mező nem lehet nulla."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Ez a mező nem lehet nulla."
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -443,14 +429,13 @@ msgid "E-mail address"
msgstr "E-mail cím"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Elérési út"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "Az értéknek legalább ennyinek kell lennie: %s."
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -494,24 +479,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML szöveg"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -572,12 +557,10 @@ msgid "The submitted file is empty."
msgstr "A küldött fájl üres."
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Bizonyosodjon meg arról, hogy ez az érték legfeljebb %(max)d karaktert "
-"tartalmaz (jelenlegi hossza: %(length)d)."
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
@@ -597,121 +580,118 @@ msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Válasszon érvényes elemet. '%(value)s' nincs az elérhető lehetőségek között."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Adja meg értékek egy listáját."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Sorrend"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Törlés"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Kérem javítsa az alábbi hibát."
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "Kérem javítsa az alábbi hibát."
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Válasszon érvényes elemet. Az Ön választása nincs az elérhető lehetőségek "
"között."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Válasszon érvényes elemet. %s nincs az elérhető lehetőségek között."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Éppen:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Módosítás"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "év"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Ismeretlen"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Igen"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nem"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "igen,nem,talán"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bájt"
msgstr[1] "%(size)d bájt"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -892,134 +872,122 @@ msgstr "dec"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "jan."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "febr."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "március"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "április"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "május"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "június"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "július"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "aug."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "szept."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "okt."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "nov."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "dec."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "január"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "február"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "március"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "április"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "május"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "június"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "július"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "augusztus"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "szeptember"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "október"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "november"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "december"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1080,23 +1048,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "Y. F j."
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "Y. F j., H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "Y. F j."
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "Y. F j."
@@ -1114,3 +1082,55 @@ msgstr "%(verbose_name)s sikeresen frissítve."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s törölve."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s törölve."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s sikeresen frissítve."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/id/LC_MESSAGES/django.mo b/django/conf/locale/id/LC_MESSAGES/django.mo
index 0234803538..c442e79bd0 100644
--- a/django/conf/locale/id/LC_MESSAGES/django.mo
+++ b/django/conf/locale/id/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/id/LC_MESSAGES/django.po b/django/conf/locale/id/LC_MESSAGES/django.po
index d4dda35197..e37d59611d 100644
--- a/django/conf/locale/id/LC_MESSAGES/django.po
+++ b/django/conf/locale/id/LC_MESSAGES/django.po
@@ -1,355 +1,362 @@
-# Translation of django.po to Indonesian
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:58+0100\n"
-"PO-Revision-Date: 2010-05-08 18:39+0700\n"
-"Last-Translator: Selwin Ong <selwin@ui.co.id>\n"
-"Language-Team: Indonesian <id@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:35+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: rodin <romihardiyanto@gmail.com>\n"
+"Language-Team: Indonesian <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: id\n"
"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
msgid "Arabic"
-msgstr "Bahasa Arab"
+msgstr "Arab"
#: conf/global_settings.py:45
msgid "Bulgarian"
-msgstr "Bahasa Bulgaria"
+msgstr "Bulgaria"
#: conf/global_settings.py:46
msgid "Bengali"
-msgstr "Bahasa Bengali"
+msgstr "Bengali"
#: conf/global_settings.py:47
msgid "Bosnian"
-msgstr "Bahasa Bosnia"
+msgstr "Bosnia"
#: conf/global_settings.py:48
msgid "Catalan"
-msgstr "Bahasa Catalan"
+msgstr "Catalan"
#: conf/global_settings.py:49
msgid "Czech"
-msgstr "Bahasa Ceko"
+msgstr "Ceska"
#: conf/global_settings.py:50
msgid "Welsh"
-msgstr "Bahasa Wales"
+msgstr "Wales"
#: conf/global_settings.py:51
msgid "Danish"
-msgstr "Bahasa Denmark"
+msgstr "Denmark"
#: conf/global_settings.py:52
msgid "German"
-msgstr "Bahasa Jerman"
+msgstr "Jerman"
#: conf/global_settings.py:53
msgid "Greek"
-msgstr "Bahasa Yunani"
+msgstr "Yunani"
#: conf/global_settings.py:54
msgid "English"
-msgstr "Bahasa Inggris"
+msgstr "Inggris"
#: conf/global_settings.py:55
msgid "British English"
-msgstr "Bahasa Inggris Britania"
+msgstr "Inggris Britania"
#: conf/global_settings.py:56
msgid "Spanish"
-msgstr "Bahasa Spanyol"
+msgstr "Spanyol"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Bahasa Spanyol"
+msgstr "Spanyol Argentina"
#: conf/global_settings.py:58
-msgid "Estonian"
-msgstr "Bahasa Estonia"
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Spanyol Argentina"
#: conf/global_settings.py:59
-msgid "Basque"
-msgstr "Bahasa Basque"
+msgid "Estonian"
+msgstr "Estonia"
#: conf/global_settings.py:60
-msgid "Persian"
-msgstr "Bahasa Persia"
+msgid "Basque"
+msgstr "Basque"
#: conf/global_settings.py:61
-msgid "Finnish"
-msgstr "Bahasa Finlandia"
+msgid "Persian"
+msgstr "Persia"
#: conf/global_settings.py:62
-msgid "French"
-msgstr "Bahasa Perancis"
+msgid "Finnish"
+msgstr "Finlandia"
#: conf/global_settings.py:63
-msgid "Frisian"
-msgstr "Bahasa Frisia"
+msgid "French"
+msgstr "Perancis"
#: conf/global_settings.py:64
-msgid "Irish"
-msgstr "Bahasa Irlandia"
+msgid "Frisian"
+msgstr "Frisia"
#: conf/global_settings.py:65
-msgid "Galician"
-msgstr "Bahasa Gali"
+msgid "Irish"
+msgstr "Irlandia"
#: conf/global_settings.py:66
-msgid "Hebrew"
-msgstr "Bahasa Hebrew"
+msgid "Galician"
+msgstr "Galicia"
#: conf/global_settings.py:67
-msgid "Hindi"
-msgstr "Bahasa Hindi"
+msgid "Hebrew"
+msgstr "Ibrani"
#: conf/global_settings.py:68
-msgid "Croatian"
-msgstr "Bahasa Croasia"
+msgid "Hindi"
+msgstr "Hindi"
#: conf/global_settings.py:69
-msgid "Hungarian"
-msgstr "Bahasa Hungaria"
+msgid "Croatian"
+msgstr "Kroasia"
#: conf/global_settings.py:70
-msgid "Indonesian"
-msgstr "Bahasa Indonesia"
+msgid "Hungarian"
+msgstr "Hungaria"
#: conf/global_settings.py:71
-msgid "Icelandic"
-msgstr "Bahasa Iceland"
+msgid "Indonesian"
+msgstr "Indonesia"
#: conf/global_settings.py:72
-msgid "Italian"
-msgstr "Bahasa Italia"
+msgid "Icelandic"
+msgstr "Islandia"
#: conf/global_settings.py:73
-msgid "Japanese"
-msgstr "Bahasa Jepang"
+msgid "Italian"
+msgstr "Italia"
#: conf/global_settings.py:74
-msgid "Georgian"
-msgstr "Bahasa Georgia"
+msgid "Japanese"
+msgstr "Jepang"
#: conf/global_settings.py:75
-msgid "Khmer"
-msgstr "Bahasa Khmer"
+msgid "Georgian"
+msgstr "Georgia"
#: conf/global_settings.py:76
-msgid "Kannada"
-msgstr "Bahasa Kannada"
+msgid "Khmer"
+msgstr "Khmer"
#: conf/global_settings.py:77
-msgid "Korean"
-msgstr "Bahasa Korea"
+msgid "Kannada"
+msgstr "Kannada"
#: conf/global_settings.py:78
-msgid "Lithuanian"
-msgstr "Bahasa Lithuania"
+msgid "Korean"
+msgstr "Korea"
#: conf/global_settings.py:79
-msgid "Latvian"
-msgstr "Bahasa Latvia"
+msgid "Lithuanian"
+msgstr "Lithuania"
#: conf/global_settings.py:80
-msgid "Macedonian"
-msgstr "Bahasa Macedonia"
+msgid "Latvian"
+msgstr "Latvia"
#: conf/global_settings.py:81
-#, fuzzy
-msgid "Malayalam"
-msgstr "Malaga"
+msgid "Macedonian"
+msgstr "Makedonia"
#: conf/global_settings.py:82
-msgid "Mongolian"
-msgstr "Bahasa Mongolia"
+msgid "Malayalam"
+msgstr "Malayalam"
#: conf/global_settings.py:83
-msgid "Dutch"
-msgstr "Bahasa Belanda"
+msgid "Mongolian"
+msgstr "Mongolia"
#: conf/global_settings.py:84
-msgid "Norwegian"
-msgstr "Bahasa Norwegia"
+msgid "Dutch"
+msgstr "Belanda"
#: conf/global_settings.py:85
-msgid "Norwegian Bokmal"
-msgstr "Bahasa Norwegia Bokmal"
+msgid "Norwegian"
+msgstr "Norwegia"
#: conf/global_settings.py:86
-msgid "Norwegian Nynorsk"
-msgstr "Bahasa Norwegia Nynorsk"
+msgid "Norwegian Bokmal"
+msgstr "Norwegia Bokmal"
#: conf/global_settings.py:87
-msgid "Punjabi"
-msgstr ""
+msgid "Norwegian Nynorsk"
+msgstr "Norwegia Nynorsk"
#: conf/global_settings.py:88
-msgid "Polish"
-msgstr "Bahasa Polandia"
+msgid "Punjabi"
+msgstr "Punjabi"
#: conf/global_settings.py:89
-msgid "Portuguese"
-msgstr "Bahasa Portugal"
+msgid "Polish"
+msgstr "Polandia"
#: conf/global_settings.py:90
-msgid "Brazilian Portuguese"
-msgstr "Bahasa Portugal Brazil"
+msgid "Portuguese"
+msgstr "Portugis"
#: conf/global_settings.py:91
-msgid "Romanian"
-msgstr "Bahasa Romania"
+msgid "Brazilian Portuguese"
+msgstr "Portugis Brazil"
#: conf/global_settings.py:92
-msgid "Russian"
-msgstr "Bahasa Russia"
+msgid "Romanian"
+msgstr "Romania"
#: conf/global_settings.py:93
-msgid "Slovak"
-msgstr "Bahasa Slovakia"
+msgid "Russian"
+msgstr "Rusia"
#: conf/global_settings.py:94
-msgid "Slovenian"
-msgstr "Bahasa Slovenia"
+msgid "Slovak"
+msgstr "Slovakia"
#: conf/global_settings.py:95
-msgid "Albanian"
-msgstr "Bahasa Albania"
+msgid "Slovenian"
+msgstr "Slovenia"
#: conf/global_settings.py:96
-msgid "Serbian"
-msgstr "Bahasa Serbia"
+msgid "Albanian"
+msgstr "Albania"
#: conf/global_settings.py:97
-msgid "Serbian Latin"
-msgstr "Bahasa Serbia Latin"
+msgid "Serbian"
+msgstr "Serbia"
#: conf/global_settings.py:98
-msgid "Swedish"
-msgstr "Bahasa Swedia"
+msgid "Serbian Latin"
+msgstr "Serbia Latin"
#: conf/global_settings.py:99
-msgid "Tamil"
-msgstr "Bahasa Tamil"
+msgid "Swedish"
+msgstr "Swedia"
#: conf/global_settings.py:100
-msgid "Telugu"
-msgstr "Bahasa Telugu"
+msgid "Tamil"
+msgstr "Tamil"
#: conf/global_settings.py:101
-msgid "Thai"
-msgstr "Bahasa Thailand"
+msgid "Telugu"
+msgstr "Telugu"
#: conf/global_settings.py:102
-msgid "Turkish"
-msgstr "Bahasa Turki"
+msgid "Thai"
+msgstr "Thailand"
#: conf/global_settings.py:103
-msgid "Ukrainian"
-msgstr "Bahasa Ukrainia"
+msgid "Turkish"
+msgstr "Turki"
#: conf/global_settings.py:104
-msgid "Vietnamese"
-msgstr "Bahasa Vietnam"
+msgid "Ukrainian"
+msgstr "Ukrainia"
#: conf/global_settings.py:105
-msgid "Simplified Chinese"
-msgstr "Bahasa Cina Sederhana"
+msgid "Urdu"
+msgstr ""
#: conf/global_settings.py:106
+msgid "Vietnamese"
+msgstr "Vietnam"
+
+#: conf/global_settings.py:107
+msgid "Simplified Chinese"
+msgstr "Cina Sederhana"
+
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
-msgstr "Bahasa Cina Tradisional"
+msgstr "Cina Tradisionil"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
-msgstr "Masukkan nilai yang benar."
-
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Masukkan URL yang benar."
+msgstr "Masukkan nilai yang valid."
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
-msgstr "URL ini tampaknya tidak ada."
+msgstr "URL ini tampaknya merupakan tautan rusak."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Masukkan URL yang valid."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
-msgstr "Masukkan alamat e-mail yang benar."
+msgstr "Masukkan alamat e-mail yang valid."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"Masukkan 'slug' yang terdiri dari huruf, bilangan, garis bawah atau garis "
-"tengah."
+"Masukkan 'slug' yang terdiri dari huruf, bilangan, garis bawah, atau tanda "
+"minus."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
-msgstr "Masukkan alamat IPv4 yang benar."
+msgstr "Masukkan alamat IPv4 yang valid."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
-msgstr "Masukkan bilangan yang dipisahkan dengan koma."
+msgstr "Hanya masukkan angka yang dipisahkan dengan koma."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Pastikan nilai ini %(limit_value)s (saat ini %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Pastikan nilai ini lebih kecil dari atau sama dengan %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Pastikan nilai ini lebih besar dari atau sama dengan %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
"Pastikan nilai ini memiliki sedikitnya %(limit_value)d karakter (saat ini %"
-"(show_value)d)."
+"(show_value)d karakter)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
"Pastikan nilai ini tidak memiliki lebih dari %(limit_value)d karakter (saat "
-"ini %(show_value)d)."
+"ini %(show_value)d karakter)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s harus unik untuk %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s dengan %(field_label)s telah ada."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "dan"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr "Nilai %r bukan pilihan yang benar."
+msgstr "Nilai %r bukan pilihan yang valid."
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
@@ -368,28 +375,28 @@ msgstr "Field dengan tipe: %(field_type)s"
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
#: db/models/fields/__init__.py:1018
msgid "Integer"
-msgstr "Integer"
+msgstr "Bilangan Asli"
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
msgid "This value must be an integer."
-msgstr "Nilai ini harus berupa integer."
+msgstr "Nilai ini harus berupa bilangan asli."
#: db/models/fields/__init__.py:493
msgid "This value must be either True or False."
-msgstr "Nilai ini harus berupa True atau False"
+msgstr "Nilai ini harus salah satu dari True atau False"
#: db/models/fields/__init__.py:495
msgid "Boolean (Either True or False)"
-msgstr "Nilai Boolean (True atau False)"
+msgstr "Nilai Boolean (Salah satu dari True atau False)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
#, python-format
msgid "String (up to %(max_length)s)"
-msgstr "String (maximum %(max_length)s)"
+msgstr "String (maksimum %(max_length)s)"
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
-msgstr "Integer yang dipisahkan dengan koma"
+msgstr "Bilangan asli yang dipisahkan dengan koma"
#: db/models/fields/__init__.py:584
msgid "Date (without time)"
@@ -402,12 +409,12 @@ msgstr "Masukkan tanggal valid dalam format YYYY-MM-DD"
#: db/models/fields/__init__.py:589
#, python-format
msgid "Invalid date: %s"
-msgstr "Tanggal salah: %s"
+msgstr "Tanggal tidak valid: %s"
#: db/models/fields/__init__.py:670
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
msgstr ""
-"Masukkan tanggal/waktu yang benar dalam format YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
+"Masukkan tanggal/waktu yang valid dalam format YYYY-MM-DD HH:MM[:ss[.uuuuuu]]"
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
@@ -419,40 +426,40 @@ msgstr "Nilai ini harus berupa bilangan desimal."
#: db/models/fields/__init__.py:748
msgid "Decimal number"
-msgstr "Bilangan decimal"
+msgstr "Bilangan desimal"
#: db/models/fields/__init__.py:803
msgid "E-mail address"
-msgstr "Alamat e-mail"
+msgstr "Alamat email"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
-msgstr "Path berkas"
+msgstr "Lokasi berkas"
#: db/models/fields/__init__.py:841
msgid "This value must be a float."
-msgstr "Nilai ini harus berupa float."
+msgstr "Nilai ini harus berupa bilangan pecahan."
#: db/models/fields/__init__.py:843
msgid "Floating point number"
-msgstr "Bilangan floating point"
+msgstr "Bilangan 'floating point'"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr "Integer besar (8 byte)"
+msgstr "Bilangan asli raksasa (8 byte)"
#: db/models/fields/__init__.py:915
msgid "IP address"
-msgstr "alamat IP"
+msgstr "Alamat IP"
#: db/models/fields/__init__.py:931
msgid "This value must be either None, True or False."
-msgstr "Nilai harus berupa None, True atau False."
+msgstr "Nilai harus berupa salah satu dari None, True, atau False."
#: db/models/fields/__init__.py:933
msgid "Boolean (Either True, False or None)"
-msgstr "Boolean (True, False atau None)"
+msgstr "Boolean (Salah satu dari True, False, atau None)"
#: db/models/fields/__init__.py:1024
msgid "Text"
@@ -464,7 +471,7 @@ msgstr "Waktu"
#: db/models/fields/__init__.py:1044
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Masukkan waktu yang benar dalam bentuk HH:MM[:ss[.uuuuuu]]"
+msgstr "Masukkan waktu yang valid dalam format HH:MM[:ss[.uuuuuu]]"
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -474,36 +481,36 @@ msgstr "URL"
msgid "XML text"
msgstr "Teks XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Model %(model)s dengan pk %(pk)r tidak ada."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr "Foreign Key (tipe tergantung dari field yang berhubungan)"
+msgstr "Kunci Asing (tipe tergantung dari bidang yang berkaitan)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr "Hubungan one-to-one"
+msgstr "Hubungan satu-ke-satu"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr "Hubungan many-to-many"
+msgstr "Hubungan banyak-ke-banyak"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-"Tekan \"Control\", ata \"Command\" di Mac untuk memilih lebih dari satu."
+"Tekan \"Control\", atau \"Command\" pada Mac untuk memilih lebih dari satu."
#: forms/fields.py:66
msgid "This field is required."
-msgstr "Field ini tidak boleh kosong."
+msgstr "Bidang ini tidak boleh kosong."
#: forms/fields.py:221
msgid "Enter a whole number."
-msgstr "Masukkan bilangan penuh."
+msgstr "Masukkan keseluruhan angka bilangan."
#: forms/fields.py:253 forms/fields.py:274
msgid "Enter a number."
@@ -512,7 +519,7 @@ msgstr "Masukkan sebuah bilangan."
#: forms/fields.py:277
#, python-format
msgid "Ensure that there are no more than %s digits in total."
-msgstr "Pastikan total bilangan tidak melebihi %s angka."
+msgstr "Pastikan jumlah angka pada bilangan tidak melebihi %s angka."
#: forms/fields.py:278
#, python-format
@@ -522,23 +529,25 @@ msgstr "Pastikan bilangan tidak memiliki lebih dari %s angka desimal."
#: forms/fields.py:279
#, python-format
msgid "Ensure that there are no more than %s digits before the decimal point."
-msgstr "Pastikan bilangan tidak memiliki lebih dari %s angka sebelum desimal."
+msgstr ""
+"Pastikan jumlah angka sebelum desimal pada bilangan tidak memiliki lebih "
+"dari %s angka."
#: forms/fields.py:342 forms/fields.py:918
msgid "Enter a valid date."
-msgstr "Masukkan tanggal yang benar."
+msgstr "Masukkan tanggal yang valid."
#: forms/fields.py:370 forms/fields.py:919
msgid "Enter a valid time."
-msgstr "Masukkan waktu yang benar."
+msgstr "Masukkan waktu yang valid."
#: forms/fields.py:396
msgid "Enter a valid date/time."
-msgstr "Masukkan tanggal/waktu yang benar."
+msgstr "Masukkan tanggal/waktu yang valid."
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Tidak ada berkas yang dikirimkan. Periksa tipe encoding form."
+msgstr "Tidak ada berkas yang dikirimkan. Periksa tipe pengaksaraan formulir."
#: forms/fields.py:461
msgid "No file was submitted."
@@ -553,141 +562,145 @@ msgstr "Berkas yang dikirimkan kosong."
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Pastikan nama berkas tidak melebihi %(max)d angka (saat ini %(length)d)."
+"Pastikan nama berkas ini tidak melebihi %(max)d karakter (saat ini %(length)"
+"d karakter)."
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Pilih antara mengirimkan berkas atau menghapus tanda centang pada kotak "
+"centang"
#: forms/fields.py:518
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-"Unggah gambar yang benar. Berkas yang anda unggah bukan gambar atau gambar "
-"itu rusak."
+"Unggah gambar yang valid. Berkas yang Anda unggah bukan merupakan berkas "
+"gambar atau gambarnya rusak."
#: forms/fields.py:650 forms/fields.py:725
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Masukkan pilihan yang benar. %(value)s bukan pilihan yang valid."
+msgstr ""
+"Masukkan pilihan yang valid. %(value)s bukan salah satu dari pilihan yang "
+"tersedia."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
-msgstr "Masukkan daftar nilai."
+msgstr "Masukkan beberapa nilai."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Urutan"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Hapus"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Mohon perbaiki data duplikat untuk %(field)s."
+msgstr "Perbaiki data ganda untuk %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
-"Mohon perbaiki data duplikat untuk %(field)s yang harus memiliki nilai unik."
+msgstr "Perbaiki data ganda untuk %(field)s yang nilainya harus unik."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-"Mohon perbaiki data duplikat untuk %(field_name)s yang harus memiliki nilai "
-"unik untuk pencarian %(lookup)s di %(date_field)s."
+"Perbaiki data ganda untuk %(field_name)s yang nilainya harus unik untuk "
+"pencarian %(lookup)s pada %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "Mohon perbaiki nilai duplikat di bawah ini."
+msgstr "Perbaiki nilai ganda di bawah ini."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr "Foreign key inline tidak cocok dengan primary key milik parent."
+msgstr ""
+"Kunci asing 'inline' tidak cocok dengan kunci utama 'instance' milik induk."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-"Masukkan pilihan yang benar. Pilihan anda bukan salah satu dari pilihan yang "
-"ada."
+"Masukkan pilihan yang valid. Pilihan tersebut bukan salah satu dari pilihan "
+"yang tersedia."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "Masukkan pilihan yang benar. %s bukan salah satu pilihan yang ada."
+msgstr ""
+"Masukkan pilihan yang valid. %s bukan salah satu pilihan yang tersedia."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
-msgstr "\"%s\" bukan pilihan yang benar untuk sebuah primary key."
+msgstr "\"%s\" bukan nilai yang benar untuk kunci utama."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Saat ini:"
+msgstr "Saat ini"
#: forms/widgets.py:300
msgid "Change"
msgstr "Ubah"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr "Hapus"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Tidak diketahui"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Ya"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Tidak"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ya,tidak,mungkin"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d bytes"
+msgstr[0] "%(size)d bita"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -743,31 +756,31 @@ msgstr "Minggu"
#: utils/dates.py:10
msgid "Mon"
-msgstr "Senin"
+msgstr "Sen"
#: utils/dates.py:10
msgid "Tue"
-msgstr "Selasa"
+msgstr "Sel"
#: utils/dates.py:10
msgid "Wed"
-msgstr "Rabu"
+msgstr "Rab"
#: utils/dates.py:10
msgid "Thu"
-msgstr "Kamis"
+msgstr "Kam"
#: utils/dates.py:10
msgid "Fri"
-msgstr "Jumat"
+msgstr "Jum"
#: utils/dates.py:11
msgid "Sat"
-msgstr "Sabtu"
+msgstr "Sab"
#: utils/dates.py:11
msgid "Sun"
-msgstr "Minggu"
+msgstr "Min"
#: utils/dates.py:18
msgid "January"
@@ -819,51 +832,51 @@ msgstr "Desember"
#: utils/dates.py:23
msgid "jan"
-msgstr "Januari"
+msgstr "jan"
#: utils/dates.py:23
msgid "feb"
-msgstr "Februari"
+msgstr "feb"
#: utils/dates.py:23
msgid "mar"
-msgstr "Maret"
+msgstr "mar"
#: utils/dates.py:23
msgid "apr"
-msgstr "April"
+msgstr "apr"
#: utils/dates.py:23
msgid "may"
-msgstr "Mei"
+msgstr "mei"
#: utils/dates.py:23
msgid "jun"
-msgstr "Juni"
+msgstr "jun"
#: utils/dates.py:24
msgid "jul"
-msgstr "Juli"
+msgstr "jul"
#: utils/dates.py:24
msgid "aug"
-msgstr "Agustus"
+msgstr "agu"
#: utils/dates.py:24
msgid "sep"
-msgstr "September"
+msgstr "sep"
#: utils/dates.py:24
msgid "oct"
-msgstr "Oktober"
+msgstr "okt"
#: utils/dates.py:24
msgid "nov"
-msgstr "November"
+msgstr "nov"
#: utils/dates.py:24
msgid "dec"
-msgstr "Desember"
+msgstr "des"
#: utils/dates.py:31
msgctxt "abbrev. month"
@@ -903,12 +916,12 @@ msgstr "Juli"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Agus."
+msgstr "Agu"
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Sept."
+msgstr "Sep."
#: utils/dates.py:40
msgctxt "abbrev. month"
@@ -923,76 +936,64 @@ msgstr "Nov."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Dec."
+msgstr "Des."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "Januari"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "Februari"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "Maret"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "April"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "Mei"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "Juni"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "Juli"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "Agustus"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "September"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "Oktober"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "November"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "Desember"
@@ -1004,7 +1005,7 @@ msgstr "atau"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1050,37 +1051,89 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j N Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
-msgstr "j N Y, G:i:s"
+msgstr "j N Y, G.i.s"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
-msgstr "G:i:s"
+msgstr "G.i.s"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
#: views/generic/create_update.py:121
#, python-format
msgid "The %(verbose_name)s was created successfully."
-msgstr "%(verbose_name)s telah berhasil dibuat."
+msgstr "%(verbose_name)s berhasil dibuat."
#: views/generic/create_update.py:164
#, python-format
msgid "The %(verbose_name)s was updated successfully."
-msgstr "%(verbose_name)s telah berhasil diubah."
+msgstr "%(verbose_name)s berhasil diperbarui."
#: views/generic/create_update.py:207
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s telah dihapus."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s telah dihapus."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s berhasil diperbarui."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/is/LC_MESSAGES/django.mo b/django/conf/locale/is/LC_MESSAGES/django.mo
index 222a3f944c..ec8b76243b 100644
--- a/django/conf/locale/is/LC_MESSAGES/django.mo
+++ b/django/conf/locale/is/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/is/LC_MESSAGES/django.po b/django/conf/locale/is/LC_MESSAGES/django.po
index fa87ab8d26..20f6fe2bd9 100644
--- a/django/conf/locale/is/LC_MESSAGES/django.po
+++ b/django/conf/locale/is/LC_MESSAGES/django.po
@@ -1,18 +1,18 @@
-# Icelandic translation of Django.
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:58+0100\n"
-"PO-Revision-Date: 2008-09-09 16:34-0000\n"
-"Last-Translator: Jökull Sólberg Auðunsson <jokullsolberg@gmail.com>\n"
-"Language-Team: <dagurp@gmail.com>\n"
+"POT-Creation-Date: 2011-02-28 17:35+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -27,9 +27,8 @@ msgid "Bengali"
msgstr "Bengalska"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "Eistland"
+msgstr ""
#: conf/global_settings.py:48
msgid "Catalan"
@@ -60,293 +59,293 @@ msgid "English"
msgstr "Enska"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Enska"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Spænska"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Argentínsk Spænska"
+msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Spænska"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Eistland"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr ""
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr ""
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finnska"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Franska"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "Brasilíska"
+msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr ""
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galíska"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebreska"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr ""
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Ungverska"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Íslenska"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Ítalska"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japanska"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr ""
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr ""
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Hollenska"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norska"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Norska"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Norska"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr ""
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
-msgstr "Portúgalska"
+msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Brasilísk Portúgalska"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Rúmenska"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Rússneska"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slóvaska"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr ""
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Rúmenska"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Serbneska"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "Serbneska"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Sænska"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr ""
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr ""
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr ""
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "skírnarnafn"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Einfölduð Kínverska "
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Hefðbundin Kínverska"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Sláðu inn gilt gildi."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Sláðu inn gilt veffang (URL)."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Síðan á þessari slóð lítur út fyrir að skila villu."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Sláðu inn gilt veffang (URL)."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Sláðu inn gilt tölvupóstfang."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Settu inn gildan vefslóðartitil sem samanstendur af latneskum bókstöfum, "
"númerin, undirstrikum og bandstrikum."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Sláðu inn gilda IPv4 tölu."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Skrifaðu einungis tölur aðskildar með kommum."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "Gildið má ekki hafa færri en %(min)d stafi (gildið hefur %(length)d)."
+msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Gakktu úr skuggum um að gildið sé minna en eða jafn og %s."
+msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Gildið þarf að vera jafnt og eða hærra en %s."
+msgstr ""
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "Gildið má ekki hafa færri en %(min)d stafi (gildið hefur %(length)d)."
+msgstr ""
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "Gildið má ekki hafa fleiri en %(max)d stafi (gildið hefur %(length)d)."
+msgstr ""
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "Þessi reitur þarf að vera útfylltur ef %(field)s er %(value)s"
+msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s með þetta %(field_label)s er nú þegar til."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "og"
@@ -360,9 +359,8 @@ msgid "This field cannot be null."
msgstr "Þessi reitur getur ekki haft tómgildi (null)."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Þessi reitur getur ekki haft tómgildi (null)."
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -431,14 +429,13 @@ msgid "E-mail address"
msgstr "Tölvupóstfang"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Skjalaslóð"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "Þetta gildi verður að vera að minnsta kosti %s."
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -480,24 +477,24 @@ msgstr "Veffang"
msgid "XML text"
msgstr "XML texti"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -555,10 +552,10 @@ msgid "The submitted file is empty."
msgstr "Innsend skrá er tóm."
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "Gildið má ekki hafa fleiri en %(max)d stafi (gildið hefur %(length)d)."
+msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
@@ -578,121 +575,118 @@ msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Veldu gildan valmöguleika. %(value)s er ekki eitt af gildum valmöguleikum."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Sláðu inn lista af gildum."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Röð"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Eyða"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Vinsamlegast leiðréttu villuna hér að neðan:"
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "Vinsamlegast leiðréttu villuna hér að neðan:"
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Veldu gildan valmöguleika. Valið virðist ekki vera eitt af gildum "
"valmöguleikum."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Veldu gildan valmöguleika. %s er ekki einn af gildum valmöguleikum."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Eins og er:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Breyta"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "ár"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Óþekkt"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Já"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nei"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "já,nei,kannski"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bæti"
msgstr[1] "%(size)d bæti"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -873,134 +867,122 @@ msgstr "des"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "jan."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "feb."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "mars"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "apríl"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "maí"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "júní"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "júlí"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "ág."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "sept."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "okt."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "nóv."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "des."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "janúar"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "febrúar"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "mars"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "apríl"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "maí"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "júní"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "júlí"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "ágúst"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "september"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "október"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "nóvember"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "desember"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1061,23 +1043,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j. N Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. N Y, H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "j. N Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. N Y"
@@ -1095,3 +1077,55 @@ msgstr "%(verbose_name)s var uppfært."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s var eytt."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s var eytt."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s var uppfært."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/it/LC_MESSAGES/django.mo b/django/conf/locale/it/LC_MESSAGES/django.mo
index 279f61e720..a4930577e6 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.mo
+++ b/django/conf/locale/it/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/it/LC_MESSAGES/django.po b/django/conf/locale/it/LC_MESSAGES/django.po
index 0c20a75445..1fd9179565 100644
--- a/django/conf/locale/it/LC_MESSAGES/django.po
+++ b/django/conf/locale/it/LC_MESSAGES/django.po
@@ -1,20 +1,18 @@
-# translation of django.po to Italian
-# Italian translation of Django.
-# Copyright (C) 2006 the Lawrence Journal-World
# This file is distributed under the same license as the Django package.
+#
msgid ""
msgstr ""
-"Project-Id-Version: django\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:59+0100\n"
-"PO-Revision-Date: 2010-05-10 14:44+0200\n"
-"Last-Translator: Nicola Larosa <nico@tekNico.net>\n"
-"Language-Team: Italian <django-it@googlegroups.com>\n"
+"POT-Creation-Date: 2011-02-28 17:35+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: Italian <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -69,255 +67,262 @@ msgid "Spanish"
msgstr "spagnolo"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "spagnolo argentino"
+msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "spagnolo"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "estone"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "basco"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "persiano"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "finlandese"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "francese"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "frisio"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "irlandese"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "galiziano"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "ebraico"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "croato"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "ungherese"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "Indonesiano"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islandese"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "italiano"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "giapponese"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "georgiano"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "coreano"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "lituano"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "lettone"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "macedone"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Malaga"
+msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "Mongolo"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "olandese"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "norvegese"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "norvegese bokmal"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "norvegese nynorsk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "polacco"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "portoghese"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "brasiliano portoghese"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "rumeno"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "russo"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "slovacco"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "sloveno"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "albanese"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "serbo"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "serbo latino"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "svedese"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "tamil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "tailandese"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "turco"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ucraino"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "vietnamita"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "cinese semplificato"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "cinese tradizionale"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Inserisci un valore valido."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Inserisci una URL valida."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Questa URL non sembra funzionare."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Inserisci una URL valida."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Inserisci un indirizzo e-mail valido."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Inserisci uno 'slug' valido contenente lettere, cifre, sottolineati o "
"trattini."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Inserisci un indirizzo IPv4 valido."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Inserisci solo cifre separate da virgole."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Assicurarsi che questo valore sia %(limit_value)s (ora è %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Assicurarsi che questo valore sia minore o uguale a %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Assicurarsi che questo valore sia maggiore o uguale a %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -326,7 +331,7 @@ msgstr ""
"Assicurarsi che questo valore contenga almeno %(limit_value)d caratteri (ne "
"ha %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -335,17 +340,17 @@ msgstr ""
"Assicurarsi che questo valore non contenga più di %(limit_value)d caratteri "
"(ne ha %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s deve essere unico per %(lookup)s %(date_field)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s con questo %(field_label)s esiste già."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "e"
@@ -429,7 +434,7 @@ msgid "E-mail address"
msgstr "Indirizzo e-mail"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Percorso di file"
@@ -477,24 +482,24 @@ msgstr "URL"
msgid "XML text"
msgstr "Testo XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Il modello %(model)s con chiave primaria %(pk)r non esiste."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Foreign Key (tipo determinato dal campo collegato)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Relazione uno a uno"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Relazione molti a molti"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -577,29 +582,29 @@ msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Scegli un'opzione valida. '%(value)s non compare tra quelle disponibili."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Inserisci una lista di valori."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Ordine"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Cancella"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Correggi i dati duplicati di %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Correggi i dati duplicati di %(field)s, che deve essere unico."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -608,92 +613,90 @@ msgstr ""
"Correggi i dati duplicati di %(field_name)s che deve essere unico/a per %"
"(lookup)s in %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Correggi i dati duplicati qui sotto."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"La foreign key inline non concorda con la chiave primaria dell'istanza padre."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Scegli un'opzione valida. La scelta effettuata non compare tra quelle "
"disponibili."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Scegli un'opzione valida. %s non compare tra quelle disponibili."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" non è un valore valido per una chiave primaria."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Attualmente:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Modifica"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Sconosciuto"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Sì"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "No"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "sì,no,forse"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d byte"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -874,134 +877,122 @@ msgstr "dic"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "gen."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "feb."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "marzo"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "aprile"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "maggio"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "giugno"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "luglio"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "ago."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "set."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "ott."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "nov."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "dic."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "gennaio"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "febbraio"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "marzo"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "aprile"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "maggio"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "giugno"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "luglio"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "agosto"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "settembre"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "ottobre"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "novembre"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "dicembre"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1062,23 +1053,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j F Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j F Y, H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "Y F"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
@@ -1096,3 +1087,55 @@ msgstr "%(verbose_name)s aggiornato/a correttamente."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s cancellato/a."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s cancellato/a."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s aggiornato/a correttamente."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/ja/LC_MESSAGES/django.mo b/django/conf/locale/ja/LC_MESSAGES/django.mo
index bc1ef3e475..2d01d2adb3 100644
--- a/django/conf/locale/ja/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ja/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ja/LC_MESSAGES/django.po b/django/conf/locale/ja/LC_MESSAGES/django.po
index 36ce8a74f3..c3965a23ac 100644
--- a/django/conf/locale/ja/LC_MESSAGES/django.po
+++ b/django/conf/locale/ja/LC_MESSAGES/django.po
@@ -1,16 +1,18 @@
-# Translation of django.po to japanese.
+# This file is distributed under the same license as the Django package.
+#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:59+0100\n"
-"PO-Revision-Date: 2010-05-09 12:41+0900\n"
-"Last-Translator: Takashi Matsuo <matsuo.takashi@gmail.com>\n"
-"Language-Team: Japanese <django-ja@googlegroups.com>\n"
+"POT-Creation-Date: 2011-02-28 17:35+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: t2y <tetsuya.morimoto@gmail.com>\n"
+"Language-Team: Japanese <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: ja\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -65,255 +67,261 @@ msgid "Spanish"
msgstr "スペイン語"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "アルゼンチンスペイン語"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "アルゼンチンスペイン語"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "エストニア語"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "バスク語"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "ペルシア語"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "フィンランド語"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "フランス語"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "フリジア語"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "アイルランド語"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "ガリシア語"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "ヘブライ語"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "ヒンディー語"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "クロアチア語"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "ハンガリー語"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "マケドニア語"
+msgstr "インドネシア語"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "アイスランド語"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "イタリア語"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "日本語"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "グルジア語"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "クメール語"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "カンナダ語"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "韓国語"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "リトアニア語"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "ラトビア語"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "マケドニア語"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Malaga"
+msgstr "マラヤーラム語"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "モンゴル語"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "オランダ語"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "ノルウェー語"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "ノルウェーのブークモール"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "ノルウェーのニーノシュク"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "パンジャブ語"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "ポーランド語"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "ポルトガル語"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "ブラジルポルトガル語"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "ルーマニア語"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "ロシア語"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "スロバキア語"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "スロヴェニア語"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "アルバニア語"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "セルビア語"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "セルビア語ラテン文字"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "スウェーデン語"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "タミル語"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "テルグ語"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "タイ語"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "トルコ語"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ウクライナ語"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "ベトナム語"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "簡体字中国語"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "繁体字中国語"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "値を正しく入力してください。"
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "URLを正しく入力してください。"
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "このURLはリンクが壊れています。"
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "URLを正しく入力してください。"
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "有効なメールアドレスを入力してください。"
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "slug には半角の英数字、アンダースコア、ハイフン以外は使用できません。"
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "有効なIPアドレス (IPv4) を入力してください。"
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "カンマ区切りの数字だけを入力してください。"
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"この値は %(limit_value)s でなければなりません(実際には %(show_value)s でし"
"た) 。"
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "この値は %(limit_value)s 以下でなければなりません。"
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "この値は %(limit_value)s 以上でなければなりません。"
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -322,7 +330,7 @@ msgstr ""
"%(limit_value)d 字以上で入力してください(実際には %(show_value)d 文字でし"
"た)。"
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -331,19 +339,19 @@ msgstr ""
"%(limit_value)d 字以下で入力してください(実際には %(show_value)d 文字でし"
"た)。"
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"%(date_field)s %(lookup)s では %(field_name)s がユニークである必要がありま"
"す。"
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "この %(field_label)s を持った %(model_name)s が既に存在します。"
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "と"
@@ -426,7 +434,7 @@ msgid "E-mail address"
msgstr "メールアドレス"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "ファイルの場所"
@@ -474,24 +482,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XMLテキスト"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "主キーが %(pk)r である %(model)s モデルは存在しません。"
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "外部キー(型は関連フィールドによって決まります)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "1対1の関連"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "多対多の関連"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -561,6 +569,8 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"ファイルを投稿するか、クリアチェックボックスをチェックするかどちらかを選択し"
+"てください。両方とも行ってはいけません。"
#: forms/fields.py:518
msgid ""
@@ -575,31 +585,31 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "正しく選択してください。 %(value)s は候補にありません。"
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "リストを入力してください。"
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "並び変え"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "削除"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "%(field)s の重複したデータを修正してください。"
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"%(field)s の重複したデータを修正してください。このフィールドはユニークである"
"必要があります。"
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -608,88 +618,86 @@ msgstr ""
"%(field_name)s の重複したデータを修正してください。%(date_field)s %(lookup)s "
"では %(field_name)s がユニークである必要があります。"
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "下記の重複したデータを修正してください。"
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "インライン外部キーが親インスタンスの主キーと一致しません。"
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "正しく選択してください。選択したものは候補にありません。"
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "正しく選択してください。 %s は候補にありません。"
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" はプライマリキーとして無効な値です。"
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "現在:"
+msgstr "現在"
#: forms/widgets.py:300
msgid "Change"
msgstr "変更"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "年"
+msgstr "クリア"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "不明"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "はい"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "いいえ"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "はい,いいえ,たぶん"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d バイト"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -928,73 +936,61 @@ msgid "Dec."
msgstr "12月"
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "1月"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "2月"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "3月"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "4月"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "5月"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "6月"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "7月"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "8月"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "9月"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "10月"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "11月"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "12月"
@@ -1006,7 +1002,7 @@ msgstr "または"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1052,23 +1048,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "Y/m/d"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "Y/m/d H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "Y/m/d"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "m/d"
@@ -1086,3 +1082,55 @@ msgstr "%(verbose_name)s を更新しました。"
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr " %(verbose_name)s を削除しました。"
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr " %(verbose_name)s を削除しました。"
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s を更新しました。"
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/ka/LC_MESSAGES/django.mo b/django/conf/locale/ka/LC_MESSAGES/django.mo
index d95745a08e..89b679acfe 100644
--- a/django/conf/locale/ka/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ka/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ka/LC_MESSAGES/django.po b/django/conf/locale/ka/LC_MESSAGES/django.po
index 5a91399fb7..af01d26774 100644
--- a/django/conf/locale/ka/LC_MESSAGES/django.po
+++ b/django/conf/locale/ka/LC_MESSAGES/django.po
@@ -1,18 +1,17 @@
-# translation of django.po to Georgian
-# Django translation to Georgian language.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
-"Project-Id-Version: django\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:59+0100\n"
-"PO-Revision-Date: 2008-10-05 14:34+0400\n"
-"Last-Translator: David Avsajanishvili <avsd05@gmail.com>\n"
-"Language-Team: Georgian <ka@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:35+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: avsd05 <avsd05@gmail.com>\n"
+"Language-Team: Georgian <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ka\n"
"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
@@ -28,9 +27,8 @@ msgid "Bengali"
msgstr "ბენგალიური"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "ესტონური"
+msgstr "ბოსნიური"
#: conf/global_settings.py:48
msgid "Catalan"
@@ -61,325 +59,317 @@ msgid "English"
msgstr "ინგლისური"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "ინგლისური"
+msgstr "ბრიტანეთის ინგლისური"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "ესპანური"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "არგენტინის ესპანური"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "არგენტინის ესპანური"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "ესტონური"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "ბასკური"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "სპარსული"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "ფინური"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "ფრანგული"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "ფრისლანდია"
+msgstr "ფრისიული"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "ირლანდიური"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "გალიციური"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "ებრაული"
-#: conf/global_settings.py:67
-#, fuzzy
+#: conf/global_settings.py:68
msgid "Hindi"
-msgstr "ჰაილენდი"
+msgstr "ჰინდი"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "ხორვატიული"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "უნგრული"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "მაკედონიური"
+msgstr "ინდონეზიური"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "ისლანდიური"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "იტალიური"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "იაპონური"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "ქართული"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "ხმერული"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "კანნადა"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "კორეული"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "ლიტვური"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "ლატვიური"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "მაკედონიური"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "მალაგა"
+msgstr "მალაიზიური"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "მაკედონიური"
+msgstr "მონღოლური"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "ჰოლანდიური"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "ნორვეგიული"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "ნორვეგიული"
+msgstr "ნორვეგიული-ბოკმალი"
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "ნორვეგიული"
+msgstr "ნორვეგიული-ნინორსკი"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "პუნჯაბი"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "პოლონური"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "პორტუგალიური"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "ბრაზილიური პორტუგალიური"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "რუმინული"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "რუსული"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "სლოვაკური"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "სლოვენიური"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "ალასანტი"
+msgstr "ალბანური"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "სერბული"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "სერბული"
+msgstr "სერბული (ლათინური)"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "შვედური"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "თამილური"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "ტელუგუ"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "თამილური"
+msgstr "ტაი"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "თურქული"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "უკრაინული"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "ვენა"
+msgstr "ვიეტნამური"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "გამარტივებული ჩინური"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "ტრადიციული ჩინური"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "შეიყვანეთ სწორი მნიშვნელობა."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "შეიყვანეთ სწორი URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "როგორც ჩანს, URL არის გაწყვეტილი ბმული."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "შეიყვანეთ სწორი URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "შეიყვანეთ სწორი ელ. ფოსტის მისამართი."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"შეიყვანეთ სწორი 'slug'-მნიშვნელობა, რომელიც შეიცავს მხოლოდ ასოებს, ციფრებს, "
"ხაზგასმის ნიშნებს და დეფისებს."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "შეიყვანეთ სწორი IPv4 მისამართი."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "შეიყვანეთ მხოლოდ მძიმეებით გამოყოფილი ციფრები."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr ""
-"დარწმუნდით, რომ მნიშვნელობა შედგება არანაკლებ %(min)d სიმბოლოსაგან (ახლა "
-"მისი სიგრძეა %(length)d)."
+msgstr "მნიშვნელობა უნდა იყოს %(limit_value)s (იგი არის %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "დარწმუნდით, რომ მნიშვნელობა ნაკლებია ან ტოლია %s-ზე."
+msgstr "მნიშვნელობა უნდა იყოს %(limit_value)s-ზე ნაკლები ან ტოლი."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "დარწმუნდით, რომ მნიშვნელობა მეტია ან ტოლია %s-ზე."
+msgstr "მნიშვნელობა უნდა იყოს %(limit_value)s-ზე მეტი ან ტოლი."
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"დარწმუნდით, რომ მნიშვნელობა შედგება არანაკლებ %(min)d სიმბოლოსაგან (ახლა "
-"მისი სიგრძეა %(length)d)."
+"მნიშვნელობა უნდა შეიცავდეს სულ მცირე %(limit_value)d სიმბოლოს (იგი შეიცავს %"
+"(show_value)d-ს)."
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"დარწმუნდით, რომ მნიშვნელობა შედგება არაუმეტეს %(max)d სიმბოლოსაგან (ახლა "
-"მისი სიგრძეა %(length)d)."
+"მნიშვნელობა უნდა შეიცავდეს არაუმეტეს %(limit_value)d სიმბოლოს (იგი შეიცავს %"
+"(show_value)d-ს)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
+msgstr "%(field_name)s უნიკალური უნდა იყოს %(date_field)s-თვის %(lookup)s-ზე."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s მოცემული %(field_label)s-ით უკვე არსებობს."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "და"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "მნიშვნელობა %r არ არის დასაშვები."
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
-msgstr "ეს მნიშვნელობა არ შეიძლება იყოს null."
+msgstr "ეს ველი არ შეიძლება იყოს null."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "ეს მნიშვნელობა არ შეიძლება იყოს null."
+msgstr "ეს ველი არ შეიძლება იყოს ცარიელი."
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "ველის ტიპი: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
@@ -442,14 +432,13 @@ msgid "E-mail address"
msgstr "ელ. ფოსტის მისამართი"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "გზა ფაილისაკენ"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "ეს მნიშვნელობა უნდა იყოს მთელი."
+msgstr "მნიშვნელობა უნდა იყოს ნატურალური რიცხვი"
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -457,7 +446,7 @@ msgstr "რიცხვი მცოცავი წერტილით"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "დიდი მთელი (8-ბაიტიანი)"
#: db/models/fields/__init__.py:915
msgid "IP address"
@@ -491,24 +480,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML ტექსტი"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr ""
+msgstr "მოდელი %(model)s პირველადი გასაღებით %(pk)r არ არსებობს."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "გარე გასაღები (ტიპი განისაზღვრება დაკავშირებული ველის ტიპით)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "კავშირი ერთი-ერთტან"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "კავშირი მრავალი-მრავალთან"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -568,16 +557,16 @@ msgid "The submitted file is empty."
msgstr "გამოგზავნილი ფაილი ცარიელია."
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"დარწმუნდით, რომ მნიშვნელობა შედგება არაუმეტეს %(max)d სიმბოლოსაგან (ახლა "
-"მისი სიგრძეა %(length)d)."
+"ფაილის სახელი უნდა შედგებოდეს არაუმეტეს %(max)d სიმბოლოსაგან (იგი შეიცავს %"
+"(length)d-ს)."
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "ან გამოგზავნეთ ფაილი, ან მონიშნეთ \"წაშლის\" დროშა."
#: forms/fields.py:518
msgid ""
@@ -592,118 +581,119 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "აირჩიეთ დასაშვები მნიშვნელობა. %(value)s დასაშვები არ არის."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "შეიყვანეთ მნიშვნელობების სია."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "დალაგება"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "წავშალოთ"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "გთხოვთ, გაასწორეთ ქვემოთ მოყვანილი შეცდომა."
+msgstr "გთხოვთ, შეასწოროთ დუბლირებული მონაცემები %(field)s-თვის."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
+"გთხოვთ, შეასწოროთ დუბლირებული მნიშვნელობა %(field)s ველისთვის, რომელიც უნდა "
+"იყოს უნიკალური."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
+"გთხოვთ, შეასწოროთ დუბლირებული მნიშვნელობა %(field_name)s ველისთვის, რომელიც "
+"უნდა იყოს უნიკალური %(lookup)s-ზე, %(date_field)s-თვის."
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "გთხოვთ, გაასწორეთ ქვემოთ მოყვანილი შეცდომა."
+msgstr "გთხოვთ, შეასწოროთ დუბლირებული მნიშვნელობები."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
+msgstr "გარე გასაღების მნიშვნელობა მშობლის პირველად გასაღებს არ ემთხვევა."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "აირჩიეთ დასაშვები მნიშვნელობა. ეს არჩევანი დასაშვები არ არის."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "აირჩიეთ დასაშვები მნიშვნელობა. %s დასაშვები არ არის."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" არ არის დასაშვები მნიშვნელობა პირველადი გასაღებისათვის."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "მიმდინარე:"
+msgstr "ამჟამად"
#: forms/widgets.py:300
msgid "Change"
msgstr "შეცვლა"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "წელი"
+msgstr "წაშლა"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "გაურკვეველი"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "კი"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "არა"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "კი,არა,შესაძლოა"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d ბაიტი"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s კბაიტი"
+msgstr "%s კბ"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s მბაიტი"
+msgstr "%s მბ"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s გბაიტი"
+msgstr "%s გბ"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s კბაიტი"
+msgstr "%s ტბ"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s კბაიტი"
+msgstr "%s პბ"
#: utils/dateformat.py:42
msgid "p.m."
@@ -894,27 +884,27 @@ msgstr "თებ."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "მარტი"
+msgstr "მარ."
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "აპრილი"
+msgstr "აპრ."
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "მაისი"
+msgstr "მაი"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "ივნისი"
+msgstr "ივნ."
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "ივლისი"
+msgstr "ივლ."
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -942,73 +932,61 @@ msgid "Dec."
msgstr "დეკ."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "იანვარი"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "თებერვალი"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "მარტი"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "აპრილი"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "მაისი"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "ივნისი"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "ივლისი"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "აგვისტო"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "სექტემბერი"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "ოქტომბერი"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "ნოემბერი"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "დეკემბერი"
@@ -1020,7 +998,7 @@ msgstr "ან"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1066,23 +1044,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "d.m.Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "d.m.Y H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "d.m.Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "d.m.Y"
@@ -1100,3 +1078,55 @@ msgstr "%(verbose_name)s წარმატებით შეიცვალა
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s წაიშალა."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s წაიშალა."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s წარმატებით შეიცვალა."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/km/LC_MESSAGES/django.mo b/django/conf/locale/km/LC_MESSAGES/django.mo
index 61bfbb8fcf..c7a9d53240 100644
--- a/django/conf/locale/km/LC_MESSAGES/django.mo
+++ b/django/conf/locale/km/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/km/LC_MESSAGES/django.po b/django/conf/locale/km/LC_MESSAGES/django.po
index 1c1a28be28..e3b85722a4 100644
--- a/django/conf/locale/km/LC_MESSAGES/django.po
+++ b/django/conf/locale/km/LC_MESSAGES/django.po
@@ -1,42 +1,38 @@
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:59+0100\n"
-"PO-Revision-Date: 2007-08-10 00:21+0900\n"
-"Last-Translator: Chay Sengtha <sengtha@e-khmer.com>\n"
-"Language-Team: Chay Sengtha <sengtha@e-khmer.com>\n"
+"POT-Creation-Date: 2011-02-28 17:35+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: km\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
msgid "Arabic"
msgstr "ភាសាអារ៉ាប់"
#: conf/global_settings.py:45
-#, fuzzy
msgid "Bulgarian"
-msgstr "ភាសាហុងគ្រី"
+msgstr ""
#: conf/global_settings.py:46
msgid "Bengali"
msgstr "ភាសាបេឡារុស្ស"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "ភាសារូម៉ានី"
+msgstr ""
#: conf/global_settings.py:48
-#, fuzzy
msgid "Catalan"
-msgstr "ភាសាអ៊ីតាលី"
+msgstr ""
#: conf/global_settings.py:49
msgid "Czech"
@@ -63,306 +59,291 @@ msgid "English"
msgstr "ភាសាអង់គ្លេស"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "ភាសាអង់គ្លេស"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "ភាសាអេស្ប៉ាញ"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "ភាសាអេស្ប៉ាញ"
+msgstr ""
#: conf/global_settings.py:58
#, fuzzy
-msgid "Estonian"
-msgstr "ភាសារូម៉ានី"
+msgid "Mexican Spanish"
+msgstr "ភាសាអេស្ប៉ាញ"
#: conf/global_settings.py:59
-msgid "Basque"
+msgid "Estonian"
msgstr ""
#: conf/global_settings.py:60
-#, fuzzy
-msgid "Persian"
-msgstr "អ្នកទទួលខុសត្រូវ"
+msgid "Basque"
+msgstr ""
#: conf/global_settings.py:61
+msgid "Persian"
+msgstr ""
+
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "ភាសាហ្វាំងឡង់"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "ភាសាបារាំង"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "ភាសាប្រេស៊ីល"
+msgstr ""
-#: conf/global_settings.py:64
-#, fuzzy
+#: conf/global_settings.py:65
msgid "Irish"
-msgstr "ភាសាទួរគី"
+msgstr ""
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "ភាសាហ្កែលិគ"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "ភាសាហេប្រិ"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:68
-#, fuzzy
+#: conf/global_settings.py:69
msgid "Croatian"
-msgstr "ភាសារូម៉ានី"
+msgstr ""
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "ភាសាហុងគ្រី"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "ភាសាអ៉ីស្លង់"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "ភាសាអ៊ីតាលី"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "ភាសាជប៉ុន"
-#: conf/global_settings.py:74
-#, fuzzy
+#: conf/global_settings.py:75
msgid "Georgian"
-msgstr "ភាសាអាល្លឺម៉ង់"
+msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:76
-#, fuzzy
+#: conf/global_settings.py:77
msgid "Kannada"
-msgstr "និង"
+msgstr ""
-#: conf/global_settings.py:77
-#, fuzzy
+#: conf/global_settings.py:78
msgid "Korean"
-msgstr "ភាសាន័រវែស"
+msgstr ""
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "ភាសាហ្វាំងឡង់"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "ភាសាន័រវែស"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "ភាសាន័រវែស"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "ភាសាន័រវែស"
+msgstr ""
-#: conf/global_settings.py:87
-#, fuzzy
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr "ផ្សព្វផ្សាយ"
+msgstr ""
-#: conf/global_settings.py:88
-#, fuzzy
+#: conf/global_settings.py:89
msgid "Polish"
-msgstr "ភាសាអង់គ្លេស"
+msgstr ""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:90
-#, fuzzy
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
-msgstr "ភាសាប្រេស៊ីល"
+msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "ភាសារូម៉ានី"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "ភាសាรัរូស្ស៉ី"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "ភាសាស្លូវ៉ាគី"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "ភាសាស្លូវ៉ានី"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "ភាសារូម៉ានី"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr ""
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "ភាសាស៊ុយអែដ"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "ភាសាតាមីល"
-#: conf/global_settings.py:100
-#, fuzzy
+#: conf/global_settings.py:101
msgid "Telugu"
-msgstr "ឈ្មោះជាអក្សរឡាតាំង"
+msgstr ""
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "ភាសាតាមីល"
+msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "ភាសាទួរគី"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ភាសាអ៊ុយក្រែន"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "ឈ្មោះឯកសារ"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "ភាសាចិនសាមញ្ញ"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "ភាសាចិនបុរាណ"
-#: core/validators.py:20 forms/fields.py:67
-#, fuzzy
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
-msgstr "សូមបំពេញឈ្មោះឯកសារអោយបានត្រឹមត្រូវ។"
-
-#: core/validators.py:87 forms/fields.py:574
-#, fuzzy
-msgid "Enter a valid URL."
-msgstr "សូមបំពេញឈ្មោះឯកសារអោយបានត្រឹមត្រូវ។"
+msgstr ""
#: core/validators.py:89 forms/fields.py:575
-#, fuzzy
msgid "This URL appears to be a broken link."
-msgstr "URL​ខូច: %s"
+msgstr ""
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr ""
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "សូមបំពេញអ៊ីមែល"
-#: core/validators.py:123 forms/fields.py:958
-#, fuzzy
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-msgstr "ត្រូវបំពេញតែអក្សរឡាតាំង ចំនួនលេខ និង សញ្ញា _ សញ្ញា - ។"
+msgstr ""
-#: core/validators.py:126 forms/fields.py:951
-#, fuzzy
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
-msgstr "សូមបំពេញអ៊ីមែល"
+msgstr ""
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "បំពេញតែលេខហើយផ្តាច់ចេញពីគ្នាដោយសញ្ញាក្បៀស។"
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "អត្ថបទរបស់អ្នកត្រូវច្រើនជាង  %d អក្សរ។"
+msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "អត្ថបទរបស់អ្នកត្រូវច្រើនជាង  %d អក្សរ។"
+msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "អត្ថបទរបស់អ្នកត្រូវតិចជាង %d អក្សរ។"
+msgstr ""
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "អត្ថបទរបស់អ្នកត្រូវច្រើនជាង  %d អក្សរ។"
+msgstr ""
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "អត្ថបទរបស់អ្នកត្រូវតិចជាង %d អក្សរ។"
+msgstr ""
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "ទិន្នន័យកន្លែងនេះត្រូវបំពេញ​ប្រសិន​បើ %(field)s មានតំលៃ %(value)s"
+msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
-#, fuzzy, python-format
+#: db/models/base.py:784 db/models/base.py:792
+#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(optname)s ជាមួយឈ្មោះ %(fieldname)s នេះមានរួចរាល់ហើយ។"
+msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "និង"
@@ -376,9 +357,8 @@ msgid "This field cannot be null."
msgstr "ចាំបាច់បំពេញទិន្នន័យកន្លែងនេះ។"
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "ចាំបាច់បំពេញទិន្នន័យកន្លែងនេះ។"
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -404,9 +384,9 @@ msgid "Boolean (Either True or False)"
msgstr "Boolean (អាច​ជា True រឺ False)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
-#, fuzzy, python-format
+#, python-format
msgid "String (up to %(max_length)s)"
-msgstr "String (អាចសរសេរបានរហូតដល់ %(maxlength)s)"
+msgstr ""
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
@@ -421,23 +401,21 @@ msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "សូមបំពេញកាលបរិច្ឆេទក្នុងទំរង់ជា YYYY-MM-DD ។"
#: db/models/fields/__init__.py:589
-#, fuzzy, python-format
+#, python-format
msgid "Invalid date: %s"
-msgstr "កាលបរិច្ឆេទមិនត្រឹមត្រូវ : %s។"
+msgstr ""
#: db/models/fields/__init__.py:670
-#, fuzzy
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "សូមបំពេញកាលបរិច្ឆេទក្នុងទំរង់ជា YYYY-MM-DD HH:MM ។"
+msgstr ""
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
msgstr "កាល​បរិច្ឆេទ (Date) (មានសរសេរម៉ោង)"
#: db/models/fields/__init__.py:746
-#, fuzzy
msgid "This value must be a decimal number."
-msgstr "តំលៃនេះត្រូវតែជាចំនួនលេខ។"
+msgstr ""
#: db/models/fields/__init__.py:748
msgid "Decimal number"
@@ -448,14 +426,13 @@ msgid "E-mail address"
msgstr "អ៊ីម៉ែល"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "ផ្លូវទៅកាន់ឯកសារ"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "តំលៃនេះត្រូវតែជាចំនួនលេខ។"
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -470,9 +447,8 @@ msgid "IP address"
msgstr "លេខ IP"
#: db/models/fields/__init__.py:931
-#, fuzzy
msgid "This value must be either None, True or False."
-msgstr "តំលៃអាចជា True ឬ False។"
+msgstr ""
#: db/models/fields/__init__.py:933
msgid "Boolean (Either True, False or None)"
@@ -487,9 +463,8 @@ msgid "Time"
msgstr "ពេលវេលា"
#: db/models/fields/__init__.py:1044
-#, fuzzy
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "សូមបំពេញពេលវេលាក្នុងទំរង់ជា HH:MM ។"
+msgstr ""
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -499,25 +474,24 @@ msgstr "អាស័យដ្ឋានគេហទំព័រ(URL)"
msgid "XML text"
msgstr "អត្ថបទ XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
-#, fuzzy
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr "គ្រួសារ និង សេចក្តីស្នេហា"
+msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -532,9 +506,8 @@ msgid "Enter a whole number."
msgstr "បំពេញចំនួនទាំងអស់។"
#: forms/fields.py:253 forms/fields.py:274
-#, fuzzy
msgid "Enter a number."
-msgstr "បំពេញចំនួនទាំងអស់។"
+msgstr ""
#: forms/fields.py:277
#, python-format
@@ -552,19 +525,16 @@ msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
#: forms/fields.py:342 forms/fields.py:918
-#, fuzzy
msgid "Enter a valid date."
-msgstr "សូមបំពេញឈ្មោះឯកសារអោយបានត្រឹមត្រូវ។"
+msgstr ""
#: forms/fields.py:370 forms/fields.py:919
-#, fuzzy
msgid "Enter a valid time."
-msgstr "សូមបំពេញឈ្មោះឯកសារអោយបានត្រឹមត្រូវ។"
+msgstr ""
#: forms/fields.py:396
-#, fuzzy
msgid "Enter a valid date/time."
-msgstr "សូមបំពេញឈ្មោះឯកសារអោយបានត្រឹមត្រូវ។"
+msgstr ""
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
@@ -579,10 +549,10 @@ msgid "The submitted file is empty."
msgstr "ពុំមានឯកសារ។​"
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "អត្ថបទរបស់អ្នកត្រូវតិចជាង %d អក្សរ។"
+msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
@@ -595,122 +565,116 @@ msgid ""
msgstr "រូបភាពដែលទាញយកមិនត្រឹមត្រូវ ប្រហែលជាមិនមែនជារូបភាព ឬក៏ជា រូបភាពខូច។"
#: forms/fields.py:650 forms/fields.py:725
-#, fuzzy, python-format
+#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "សូមជ្រើសរើស ; '%(data)s' មិនមាននៅក្នុង %(choices)s"
+msgstr ""
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
-#, fuzzy
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
-msgstr "សូមបំពេញឈ្មោះឯកសារអោយបានត្រឹមត្រូវ។"
+msgstr ""
-#: forms/formsets.py:308 forms/formsets.py:310
-#, fuzzy
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr "តំរៀប"
+msgstr ""
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "លប់"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "សូមកែប្រែកំហុសខាងក្រោម ។"
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "សូមកែកំហុសដូចខាងក្រោម។"
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
-#, fuzzy
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "សូមជ្រើសរើស ; '%(data)s' មិនមាននៅក្នុង %(choices)s"
+msgstr ""
-#: forms/models.py:1019
-#, fuzzy, python-format
+#: forms/models.py:984
+#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "សូមជ្រើសរើស ; '%(data)s' មិនមាននៅក្នុង %(choices)s"
+msgstr ""
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "បច្ចុប្បន្ន"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "ផ្លាស់ប្តូរ"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "ឆ្នាំ"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "មិន​ដឹង"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "យល់ព្រម"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "មិនយល់ព្រម"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "យល់ព្រម មិនយល់ព្រម​ ប្រហែល"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
msgstr ""
@@ -768,14 +732,12 @@ msgid "Sunday"
msgstr "អាទិត្យ"
#: utils/dates.py:10
-#, fuzzy
msgid "Mon"
-msgstr "ច័ន្ទ"
+msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Tue"
-msgstr "អង្គារ"
+msgstr ""
#: utils/dates.py:10
msgid "Wed"
@@ -786,18 +748,16 @@ msgid "Thu"
msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Fri"
-msgstr "សុក្រ"
+msgstr ""
#: utils/dates.py:11
msgid "Sat"
msgstr ""
#: utils/dates.py:11
-#, fuzzy
msgid "Sun"
-msgstr "សំលេង"
+msgstr ""
#: utils/dates.py:18
msgid "January"
@@ -898,139 +858,126 @@ msgstr "ធ្នូ"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "មករា"
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "កុម្ភះ"
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "មិនា"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "មេសា"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "ឧសភា"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "មិថុនា"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "កក្កដា"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "សីហា"
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "កញ្ញា"
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "តុលា"
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "វិច្ឆិកា"
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "ធ្នូ"
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "មករា"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "កុម្ភៈ"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "មិនា"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "មេសា"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "ឧសភា"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "មិថុនា"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "កក្កដា"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "សីហា"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "កញ្ញា"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "តុលា"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "វិច្ឆិកា"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "ធ្នូ"
+msgstr ""
#: utils/text.py:136
-#, fuzzy
msgid "or"
-msgstr "អត្ថបទផ្សេងទៀត"
+msgstr ""
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
@@ -1068,9 +1015,8 @@ msgid_plural "minutes"
msgstr[0] "នាទី"
#: utils/timesince.py:45
-#, fuzzy
msgid "minutes"
-msgstr "នាទី"
+msgstr ""
#: utils/timesince.py:50
#, python-format
@@ -1082,30 +1028,30 @@ msgstr ""
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "ថ្ងៃទី j ​ខែ N ឆ្នាំ Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "ថ្ងៃទី j ​ខែ N ឆ្នាំ Y ម៉ោង P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "ម៉ោង P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "ខែ F ឆ្នាំ Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "ថ្ងៃទី​​ j ខែ F"
#: views/generic/create_update.py:121
-#, fuzzy, python-format
+#, python-format
msgid "The %(verbose_name)s was created successfully."
-msgstr "The %(verbose_name)s បានផ្លាស់ប្តូរដោយជោគជ័យ។"
+msgstr ""
#: views/generic/create_update.py:164
#, python-format
@@ -1116,3 +1062,55 @@ msgstr "The %(verbose_name)s បានផ្លាស់ប្តូរដោយ
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "The %(verbose_name)s​ បានលប់។ "
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "The %(verbose_name)s​ បានលប់។ "
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "The %(verbose_name)s បានផ្លាស់ប្តូរដោយជោគជ័យ។"
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/kn/LC_MESSAGES/django.mo b/django/conf/locale/kn/LC_MESSAGES/django.mo
index 4c6822395f..860097c98a 100644
--- a/django/conf/locale/kn/LC_MESSAGES/django.mo
+++ b/django/conf/locale/kn/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/kn/LC_MESSAGES/django.po b/django/conf/locale/kn/LC_MESSAGES/django.po
index 0fde92ecd6..fbd827989a 100644
--- a/django/conf/locale/kn/LC_MESSAGES/django.po
+++ b/django/conf/locale/kn/LC_MESSAGES/django.po
@@ -1,43 +1,38 @@
-# Kannada translation of Django.
-# Copyright (C) 2007 Translation Team <translation@sampada.info>
# This file is distributed under the same license as the Django package.
-# Kannada Localization Team <translation@sampada.info>, 2007.
-#
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:59+0100\n"
-"PO-Revision-Date: 2007-01-08 20:22+0530\n"
-"Last-Translator: Kannada Localization Team <translation@sampada.info>\n"
-"Language-Team: Kannada <translation@sampada.info>\n"
+"POT-Creation-Date: 2011-02-28 17:35+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: kn\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
msgid "Arabic"
msgstr "ಅರೇಬಿಕ್"
#: conf/global_settings.py:45
-#, fuzzy
msgid "Bulgarian"
-msgstr "ಹಂಗೇರಿಯನ್"
+msgstr ""
#: conf/global_settings.py:46
msgid "Bengali"
msgstr "ಬೆಂಗಾಲಿ"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "ರೋಮೇನಿಯನ್"
+msgstr ""
#: conf/global_settings.py:48
-#, fuzzy
msgid "Catalan"
-msgstr "ಇಟಾಲಿಯನ್"
+msgstr ""
#: conf/global_settings.py:49
msgid "Czech"
@@ -64,307 +59,291 @@ msgid "English"
msgstr "ಇಂಗ್ಲಿಷ್"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "ಇಂಗ್ಲಿಷ್"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "ಸ್ಪ್ಯಾನಿಷ್"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "ಅರ್ಜೆಂಟೈನಾದ ಸ್ಪ್ಯಾನಿಷ್"
+msgstr ""
#: conf/global_settings.py:58
#, fuzzy
-msgid "Estonian"
-msgstr "ರೋಮೇನಿಯನ್"
+msgid "Mexican Spanish"
+msgstr "ಸ್ಪ್ಯಾನಿಷ್"
#: conf/global_settings.py:59
-msgid "Basque"
+msgid "Estonian"
msgstr ""
#: conf/global_settings.py:60
-#, fuzzy
-msgid "Persian"
-msgstr "ಸೆರ್ಬಿಯನ್"
+msgid "Basque"
+msgstr ""
#: conf/global_settings.py:61
+msgid "Persian"
+msgstr ""
+
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "ಫಿನ್ನಿಶ್"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "ಫ್ರೆಂಚ್"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "ಬ್ರಾಝಿಲಿಯನ್"
+msgstr ""
-#: conf/global_settings.py:64
-#, fuzzy
+#: conf/global_settings.py:65
msgid "Irish"
-msgstr "ಟರ್ಕಿಶ್"
+msgstr ""
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "ಗ್ಯಾಲಿಶಿಯನ್"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "ಹೀಬ್ರೂ"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:68
-#, fuzzy
+#: conf/global_settings.py:69
msgid "Croatian"
-msgstr "ರೋಮೇನಿಯನ್"
+msgstr ""
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "ಹಂಗೇರಿಯನ್"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "ಐಸ್‍ಲ್ಯಾಂಡಿಕ್"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "ಇಟಾಲಿಯನ್"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "ಜಪಾನೀಸ್"
-#: conf/global_settings.py:74
-#, fuzzy
+#: conf/global_settings.py:75
msgid "Georgian"
-msgstr "ಜರ್ಮನ್"
+msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:76
-#, fuzzy
+#: conf/global_settings.py:77
msgid "Kannada"
-msgstr "ಮತ್ತು"
+msgstr ""
-#: conf/global_settings.py:77
-#, fuzzy
+#: conf/global_settings.py:78
msgid "Korean"
-msgstr "ನಾರ್ವೇಜಿಯನ್"
+msgstr ""
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "ಡಚ್"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "ನಾರ್ವೇಜಿಯನ್"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "ನಾರ್ವೇಜಿಯನ್"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "ನಾರ್ವೇಜಿಯನ್"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
-#, fuzzy
+#: conf/global_settings.py:89
msgid "Polish"
-msgstr "ಇಂಗ್ಲಿಷ್"
+msgstr ""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:90
-#, fuzzy
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
-msgstr "ಬ್ರಾಝಿಲಿಯನ್"
+msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "ರೋಮೇನಿಯನ್"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "ರಶಿಯನ್"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "ಸ್ಲೋವಾಕ್"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "ಸ್ಲೋವೇನಿಯನ್"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "ರೋಮೇನಿಯನ್"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "ಸೆರ್ಬಿಯನ್"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "ಸೆರ್ಬಿಯನ್"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "ಸ್ವೀಡಿಷ್"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "ತಮಿಳು"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "ತಮಿಳು"
+msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "ಟರ್ಕಿಶ್"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ಯುಕ್ರೇನಿಯನ್"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "ಮೊದಲ ಹೆಸರು"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "ಸರಳೀಕೃತ ಚೈನೀಸ್"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "ಸಂಪ್ರದಾಯಿಕ ಚೈನೀಸ್ "
-#: core/validators.py:20 forms/fields.py:67
-#, fuzzy
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
-msgstr "ಸರಿಯಾದ ಕಡತದ ಹೆಸರನ್ನು ಬರೆಯಿರಿ"
-
-#: core/validators.py:87 forms/fields.py:574
-#, fuzzy
-msgid "Enter a valid URL."
-msgstr "ಸರಿಯಾದ ಕಡತದ ಹೆಸರನ್ನು ಬರೆಯಿರಿ"
+msgstr ""
#: core/validators.py:89 forms/fields.py:575
-#, fuzzy
msgid "This URL appears to be a broken link."
-msgstr "%s ಈ URL ಮುರಿದ ಕೊಂಡಿಯಾಗಿದೆ."
+msgstr ""
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr ""
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "ಕ್ರಮಬದ್ಧ ವಿ-ವಿಳಾಸವೊಂದನ್ನು ಇಲ್ಲಿ ಬರೆಯಿರಿ"
-#: core/validators.py:123 forms/fields.py:958
-#, fuzzy
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"ಈ ಬೆಲೆಯು ಕೇವಲ ಅಕ್ಷರಗಳು , ಅಂಕೆಗಳು ಮತ್ತು ಅಂಡರ್ಸ್ಕೋರ್(_) ಮತ್ತು ಹೈಫನ್(-)ಗಳನ್ನು "
-"ಒಳಗೊಂಡಿರಬೇಕು"
-#: core/validators.py:126 forms/fields.py:951
-#, fuzzy
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
-msgstr "ಕ್ರಮಬದ್ಧ ವಿ-ವಿಳಾಸವೊಂದನ್ನು ಇಲ್ಲಿ ಬರೆಯಿರಿ"
+msgstr ""
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "ಅಲ್ಪವಿರಾಮ(,)ಗಳಿಂದ ಬೇರ್ಪಟ್ಟ ಅಂಕೆಗಳನ್ನು ಮಾತ್ರ ಬರೆಯಿರಿ."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr " %(field)s ಇದು %(value)s ಆಗಿದ್ದರೆ ಈ ಅಂಶವನ್ನು ಕೊಡಲೇಬೇಕು"
+msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
-#, fuzzy, python-format
+#: db/models/base.py:784 db/models/base.py:792
+#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "ಈ %(fieldname)s ಹೊಂದಿರುವ %(optname)s ಈಗಾಗಲೇ ಇದೆ."
+msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "ಮತ್ತು"
@@ -378,9 +357,8 @@ msgid "This field cannot be null."
msgstr "ಈ ಅಂಶವನ್ನು ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "ಈ ಅಂಶವನ್ನು ಖಾಲಿ ಬಿಡುವಂತಿಲ್ಲ."
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -406,9 +384,9 @@ msgid "Boolean (Either True or False)"
msgstr "ಬೂಲಿಯನ್( ನಿಜ ಅಥವಾ ಸುಳ್ಳು)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
-#, fuzzy, python-format
+#, python-format
msgid "String (up to %(max_length)s)"
-msgstr "(%(maxlength)s ವರೆಗಿನ ) ಅಕ್ಷರಪುಂಜ"
+msgstr ""
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
@@ -423,24 +401,21 @@ msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "ಸರಿಯಾದ ದಿನಾಂಕವನ್ನು ವವವವ-ತಿತಿ-ದಿದಿ ರೀತಿಗೆ ಹೊಂದುವಂತೆ ಸೂಚಿಸಿರಿ."
#: db/models/fields/__init__.py:589
-#, fuzzy, python-format
+#, python-format
msgid "Invalid date: %s"
-msgstr "ತಪ್ಪು ದಿನಾಂಕ: %s."
+msgstr ""
#: db/models/fields/__init__.py:670
-#, fuzzy
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
msgstr ""
-"ಸರಿಯಾದ ದಿನಾಂಕ/ವೇಳೆಯನ್ನು ವವವವ-ತಿತಿ-ದಿದಿ ಗಗ:ನಿನಿ ರೀತಿಗೆ ಹೊಂದುವಂತೆ ಸೂಚಿಸಿರಿ."
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
msgstr "ದಿನಾಂಕ(ಸಮಯದೊಂದಿಗೆ)"
#: db/models/fields/__init__.py:746
-#, fuzzy
msgid "This value must be a decimal number."
-msgstr "ಈ ಬೆಲೆಯು ಪೂರ್ಣ ಸಂಖ್ಯೆ ಇರಬೇಕು."
+msgstr ""
#: db/models/fields/__init__.py:748
msgid "Decimal number"
@@ -451,14 +426,13 @@ msgid "E-mail address"
msgstr "ವಿ-ಅಂಚೆ ವಿಳಾಸ"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "ಕಡತದ ಸ್ಥಾನಪಥ"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "ಈ ಬೆಲೆಯು ಪೂರ್ಣ ಸಂಖ್ಯೆ ಇರಬೇಕು."
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -473,9 +447,8 @@ msgid "IP address"
msgstr "IP ವಿಳಾಸ"
#: db/models/fields/__init__.py:931
-#, fuzzy
msgid "This value must be either None, True or False."
-msgstr "ಈ ಬೆಲೆಯು ಹೌದು ಅಥವಾ ಇಲ್ಲ ಇರಬೇಕು."
+msgstr ""
#: db/models/fields/__init__.py:933
msgid "Boolean (Either True, False or None)"
@@ -490,9 +463,8 @@ msgid "Time"
msgstr "ಸಮಯ"
#: db/models/fields/__init__.py:1044
-#, fuzzy
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "HH:MM ರೂಪದಲ್ಲಿ ಸರಿಯಾದ ಸಮಯವನ್ನು ಬರೆಯಿರಿ"
+msgstr ""
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -502,24 +474,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML ಪಠ್ಯ"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -535,9 +507,8 @@ msgid "Enter a whole number."
msgstr "ಪೂರ್ಣಾಂಕವೊಂದನ್ನು ಬರೆಯಿರಿ"
#: forms/fields.py:253 forms/fields.py:274
-#, fuzzy
msgid "Enter a number."
-msgstr "ಪೂರ್ಣಾಂಕವೊಂದನ್ನು ಬರೆಯಿರಿ"
+msgstr ""
#: forms/fields.py:277
#, python-format
@@ -555,19 +526,16 @@ msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
#: forms/fields.py:342 forms/fields.py:918
-#, fuzzy
msgid "Enter a valid date."
-msgstr "ಸರಿಯಾದ ಕಡತದ ಹೆಸರನ್ನು ಬರೆಯಿರಿ"
+msgstr ""
#: forms/fields.py:370 forms/fields.py:919
-#, fuzzy
msgid "Enter a valid time."
-msgstr "ಸರಿಯಾದ ಕಡತದ ಹೆಸರನ್ನು ಬರೆಯಿರಿ"
+msgstr ""
#: forms/fields.py:396
-#, fuzzy
msgid "Enter a valid date/time."
-msgstr "ಸರಿಯಾದ ಕಡತದ ಹೆಸರನ್ನು ಬರೆಯಿರಿ"
+msgstr ""
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
@@ -600,123 +568,116 @@ msgstr ""
"ಚಿತ್ರ. "
#: forms/fields.py:650 forms/fields.py:725
-#, fuzzy, python-format
+#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "ಸರಿಯಾದ ಆಯ್ಕೆಯನ್ನು ಆಯ್ದುಕೊಳ್ಳಿರಿ.'%(data)s' %(choices)s ನಲ್ಲಿಲ್ಲ."
+msgstr ""
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
-#, fuzzy
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
-msgstr "ಸರಿಯಾದ ಕಡತದ ಹೆಸರನ್ನು ಬರೆಯಿರಿ"
+msgstr ""
-#: forms/formsets.py:308 forms/formsets.py:310
-#, fuzzy
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr "ಅನುಕ್ರಮ:"
+msgstr ""
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "ಅಳಿಸಿಹಾಕಿ"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "ದಯಮಾಡಿ ಕೆಳಗಿನ ತಪ್ಪನ್ನು ಸರಿಪಡಿಸಿ ದಯಮಾಡಿ ಕೆಳಗಿನ ತಪ್ಪುಗಳನ್ನು ಸರಿಪಡಿಸಿ. "
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "ದಯಮಾಡಿ ಕೆಳಗಿನ ತಪ್ಪನ್ನು ಸರಿಪಡಿಸಿ ದಯಮಾಡಿ ಕೆಳಗಿನ ತಪ್ಪುಗಳನ್ನು ಸರಿಪಡಿಸಿ. "
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
-#, fuzzy
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "ಸರಿಯಾದ ಆಯ್ಕೆಯನ್ನು ಆಯ್ದುಕೊಳ್ಳಿರಿ.'%(data)s' %(choices)s ನಲ್ಲಿಲ್ಲ."
+msgstr ""
-#: forms/models.py:1019
-#, fuzzy, python-format
+#: forms/models.py:984
+#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "ಸರಿಯಾದ ಆಯ್ಕೆಯನ್ನು ಆಯ್ದುಕೊಳ್ಳಿರಿ.'%(data)s' %(choices)s ನಲ್ಲಿಲ್ಲ."
+msgstr ""
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "ಈಗ:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "ಬದಲಿಸಿ/ಬದಲಾವಣೆ"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "ವರ್ಷ"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "ಗೊತ್ತಿಲ್ಲ(ದ/ದ್ದು)"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "ಹೌದು"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "ಇಲ್ಲ"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ಹೌದು,ಇಲ್ಲ,ಇರಬಹುದು"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
-msgstr[1] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
msgstr ""
@@ -774,14 +735,12 @@ msgid "Sunday"
msgstr "ರವಿವಾರ"
#: utils/dates.py:10
-#, fuzzy
msgid "Mon"
-msgstr "ಸೋಮವಾರ"
+msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Tue"
-msgstr "ಮಂಗಳವಾರ"
+msgstr ""
#: utils/dates.py:10
msgid "Wed"
@@ -792,18 +751,16 @@ msgid "Thu"
msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Fri"
-msgstr "ಶುಕ್ರವಾರ"
+msgstr ""
#: utils/dates.py:11
msgid "Sat"
msgstr ""
#: utils/dates.py:11
-#, fuzzy
msgid "Sun"
-msgstr "ರವಿವಾರ"
+msgstr ""
#: utils/dates.py:18
msgid "January"
@@ -904,139 +861,126 @@ msgstr "ಡಿಸೆಂಬರ್"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "ಜನವರಿ."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "ಫೆಬ್ರವರಿ."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "ಮಾರ್ಚ್"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "ಎಪ್ರಿಲ್"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "ಮೇ"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "ಜೂನ್"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "ಜುಲೈ"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "ಆಗಸ್ಟ್."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "ಸೆಪ್ಟೆಂಬರ್."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "ಅಕ್ಟೋಬರ್."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "ನವೆಂಬರ್."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "ಡಿಸೆಂಬರ್."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "ಜನವರಿ"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "ಫೆಬ್ರುವರಿ"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "ಮಾರ್ಚ್"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "ಎಪ್ರಿಲ್"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "ಮೇ"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "ಜೂನ್"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "ಜುಲೈ"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "ಆಗಸ್ಟ್"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "ಸೆಪ್ಟೆಂಬರ್"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "ಅಕ್ಟೋಬರ್"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "ನವೆಂಬರ್"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "ಡಿಸೆಂಬರ್"
+msgstr ""
#: utils/text.py:136
-#, fuzzy
msgid "or"
-msgstr "ಘಂಟೆ"
+msgstr ""
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
@@ -1044,51 +988,38 @@ msgid ", "
msgstr ""
#: utils/timesince.py:21
-#, fuzzy
msgid "year"
msgid_plural "years"
-msgstr[0] "ವರ್ಷ"
-msgstr[1] "ವರ್ಷ"
+msgstr[0] ""
#: utils/timesince.py:22
-#, fuzzy
msgid "month"
msgid_plural "months"
-msgstr[0] "ತಿಂಗಳು"
-msgstr[1] "ತಿಂಗಳು"
+msgstr[0] ""
#: utils/timesince.py:23
-#, fuzzy
msgid "week"
msgid_plural "weeks"
-msgstr[0] "ವಾರ"
-msgstr[1] "ವಾರ"
+msgstr[0] ""
#: utils/timesince.py:24
-#, fuzzy
msgid "day"
msgid_plural "days"
-msgstr[0] "ದಿನ"
-msgstr[1] "ದಿನ"
+msgstr[0] ""
#: utils/timesince.py:25
-#, fuzzy
msgid "hour"
msgid_plural "hours"
-msgstr[0] "ಘಂಟೆ"
-msgstr[1] "ಘಂಟೆ"
+msgstr[0] ""
#: utils/timesince.py:26
-#, fuzzy
msgid "minute"
msgid_plural "minutes"
-msgstr[0] "ನಿಮಿಷ"
-msgstr[1] "ನಿಮಿಷ"
+msgstr[0] ""
#: utils/timesince.py:45
-#, fuzzy
msgid "minutes"
-msgstr "ನಿಮಿಷ"
+msgstr ""
#: utils/timesince.py:50
#, python-format
@@ -1100,23 +1031,23 @@ msgstr ""
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "N j, Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "N j, Y, P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
@@ -1134,3 +1065,55 @@ msgstr " %(verbose_name)s ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಮಾ
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr " %(verbose_name)s ಅನ್ನು ತೆಗೆದುಹಾಕಲಾಯಿತು"
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr " %(verbose_name)s ಅನ್ನು ತೆಗೆದುಹಾಕಲಾಯಿತು"
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr " %(verbose_name)s ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಮಾರ್ಪಡಿಸಲಾಯಿತು."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/ko/LC_MESSAGES/django.mo b/django/conf/locale/ko/LC_MESSAGES/django.mo
index 5913c15b4e..5e925f8101 100644
--- a/django/conf/locale/ko/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ko/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ko/LC_MESSAGES/django.po b/django/conf/locale/ko/LC_MESSAGES/django.po
index 7c1f81fa12..294d50f229 100644
--- a/django/conf/locale/ko/LC_MESSAGES/django.po
+++ b/django/conf/locale/ko/LC_MESSAGES/django.po
@@ -1,19 +1,17 @@
-# Django Korean Translation
-# Copyright (C) 2009
-# This file is distributed under the same license as the django package.
-# Hyun Mi Ae, Joongi Kim (me@daybreaker.info), Sung-Jin Hong (serialx.net@gmail.com)
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:59+0100\n"
-"PO-Revision-Date: 2007-04-06 11:04+0900\n"
-"Last-Translator: Joongi Kim (me@daybreaker.info)\n"
-"Language-Team: Korean\n"
+"POT-Creation-Date: 2011-02-28 17:35+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
@@ -69,254 +67,261 @@ msgid "Spanish"
msgstr "스페인어"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "아르헨티나 스페인어"
+msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "스페인어"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "에스토니아어"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "바스크어"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "페르시아어"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "핀란드어"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "프랑스어"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "프리슬란트어"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "아일랜드어"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "갈리시아어"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "히브리어"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "힌두어"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "크로아티아어"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "헝가리어"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "인도네시아어"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "아이슬란드어"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "이탈리아어"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "일본어"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "조지아어"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "크메르어"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "칸나다어"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "한국어"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "리투아니아어"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "라트비아어"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "마케도니아어"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "말라가 주"
+msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "몽고어"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "네덜란드어"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "노르웨이어"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "노르웨이어 (보크몰)"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "노르웨이어 (뉘노르스크)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "폴란드어"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "포르투갈어"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "브라질 포르투갈어"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "루마니아어"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "러시아어"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "슬로바키아어"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "슬로베니아어"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "알바니아어"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "세르비아어"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "세르비아어"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "스웨덴어"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "타밀어"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "텔루구어"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "태국어"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "터키어"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "우크라이나어"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "베트남어"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "중국어 간체"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "중국어 번체"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "올바른 값을 입력하세요."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "올바른 URL을 입력하세요."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "해당 URL의 링크가 잘못 되어 있습니다."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "올바른 URL을 입력하세요."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "올바른 이메일 주소를 입력하세요."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "문자, 숫자, '_', '-'만 가능합니다."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "올바른 IPv4 주소를 입력하세요."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "콤마로 구분된 숫자만 입력하세요."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"%(limit_value)s 안의 값을 입력해 주세요. (입력하신 값은 %(show_value)s입니"
"다.)"
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "%(limit_value)s 이하의 값을 입력해 주세요."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "%(limit_value)s 이상의 값을 입력해 주세요."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -325,7 +330,7 @@ msgstr ""
"%(limit_value)d글자 이상 입력해 주세요. (입력하신 내용은 %(show_value)d글자입"
"니다.)"
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -334,18 +339,18 @@ msgstr ""
"%(limit_value)d글자 이하로 입력해 주세요. (입력하신 내용은 %(show_value)d글자"
"입니다)"
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"%(field_name)s(은)는 반드시 %(date_field)s %(lookup)s에 대해 유일해야 합니다."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s의 %(field_label)s(은)는 이미 존재합니다."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "또한"
@@ -428,7 +433,7 @@ msgid "E-mail address"
msgstr "이메일 주소"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "파일 경로"
@@ -476,24 +481,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML 텍스트"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Primary key %(pk)r에 대한 모델 %(model)s가 존재하지 않습니다."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "외래 키 (연관 필드에 의해 형식 결정)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "일대일 관계"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "다대다 관계"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -576,29 +581,29 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "올바르게 선택해 주세요. %(value)s (이)가 선택가능항목에 없습니다."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "리스트를 입력하세요."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "순서:"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "삭제"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "%(field)s의 중복된 데이터를 고쳐주세요."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "%(field)s의 중복된 데이터를 고쳐주세요. 유일한 값이어야 합니다."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -607,88 +612,86 @@ msgstr ""
"%(field_name)s의 값은 %(date_field)s의 %(lookup)s에 대해 유일해야 합니다. 중"
"복된 데이터를 고쳐주세요."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "아래의 중복된 값들을 고쳐주세요."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "부모 오브젝트의 primary key와 inline foreign key가 맞지 않습니다."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "올바르게 선택해 주세요. 선택하신 것이 선택가능항목에 없습니다."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "올바르게 선택해 주세요. %s (이)가 선택가능항목에 없습니다."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\"은 primary key로 적합하지 않습니다."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "현재:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "변경"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "년"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "알 수 없습니다."
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "예"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "아니오"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "예,아니오,아마도"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d 바이트"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -869,134 +872,122 @@ msgstr "12월"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "1월"
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "2월"
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "3월"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "4월"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "5월"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "6월"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "7월"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "8월"
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "9월"
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "10월"
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "11월"
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "12월"
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "1월"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "2월"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "3월"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "4월"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "5월"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "6월"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "7월"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "8월"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "9월"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "10월"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "11월"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "12월"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1051,23 +1042,23 @@ msgstr "%(number)d%(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d%(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "Y년 n월 j일"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "Y년 n월 j일 H:i:s"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i:s"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "Y년 n월"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "n월 j일"
@@ -1085,3 +1076,55 @@ msgstr "%(verbose_name)s(이)가 수정되었습니다."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s(이)가 삭제되었습니다."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s(이)가 삭제되었습니다."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s(이)가 수정되었습니다."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/lt/LC_MESSAGES/django.mo b/django/conf/locale/lt/LC_MESSAGES/django.mo
index a68fb6f21c..7789d432de 100644
--- a/django/conf/locale/lt/LC_MESSAGES/django.mo
+++ b/django/conf/locale/lt/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/lt/LC_MESSAGES/django.po b/django/conf/locale/lt/LC_MESSAGES/django.po
index 9e1327ed9b..6d62279c6d 100644
--- a/django/conf/locale/lt/LC_MESSAGES/django.po
+++ b/django/conf/locale/lt/LC_MESSAGES/django.po
@@ -1,37 +1,35 @@
-# Lithuanian translation of Django.
-# Copyright (C) 2008 The Django Software Foundation
# This file is distributed under the same license as the Django package.
+#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:59+0100\n"
-"PO-Revision-Date: 2008-06-18 22:37+0200\n"
-"Last-Translator: Rapolas Kaselis <rapolas@gmail.com>\n"
-"Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
+"POT-Creation-Date: 2011-02-28 17:35+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: lt\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"100<10 || n%100>=20) ? 1 : 2)\n"
#: conf/global_settings.py:44
msgid "Arabic"
msgstr "Arabų"
#: conf/global_settings.py:45
-#, fuzzy
msgid "Bulgarian"
-msgstr "Vengrų"
+msgstr ""
#: conf/global_settings.py:46
msgid "Bengali"
msgstr "Bengalų"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "Rumunų"
+msgstr ""
#: conf/global_settings.py:48
msgid "Catalan"
@@ -62,304 +60,291 @@ msgid "English"
msgstr "Anglų"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Anglų"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Ispanų"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Argentinos Ispanų"
+msgstr ""
#: conf/global_settings.py:58
#, fuzzy
-msgid "Estonian"
-msgstr "Rumunų"
+msgid "Mexican Spanish"
+msgstr "Ispanų"
#: conf/global_settings.py:59
-msgid "Basque"
+msgid "Estonian"
msgstr ""
#: conf/global_settings.py:60
-#, fuzzy
-msgid "Persian"
-msgstr "Serbų"
+msgid "Basque"
+msgstr ""
#: conf/global_settings.py:61
+msgid "Persian"
+msgstr ""
+
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Suomių"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Prancūzų"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "Brazilų"
+msgstr ""
-#: conf/global_settings.py:64
-#, fuzzy
+#: conf/global_settings.py:65
msgid "Irish"
-msgstr "Turkų"
+msgstr ""
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galų"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebrajų"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:68
-#, fuzzy
+#: conf/global_settings.py:69
msgid "Croatian"
-msgstr "Katalonų"
+msgstr ""
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Vengrų"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Makedonų"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandų"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italų"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japonų"
-#: conf/global_settings.py:74
-#, fuzzy
+#: conf/global_settings.py:75
msgid "Georgian"
-msgstr "Vokiečių"
+msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Dravidų"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Korėjiečių"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Latvių"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Makedonų"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Makedonų"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Olandų"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norvegų"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Norvegų"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Norvegų"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Lenkų"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
-msgstr "Portugalų"
+msgstr ""
-#: conf/global_settings.py:90
-#, fuzzy
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
-msgstr "Portugalų"
+msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Rumunų"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Rusų"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slovakų"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slovėnų"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Rumunų"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Serbų"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "Serbų"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Švedų"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamilų"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telugų"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "Tamilų"
+msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Turkų"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukrainiečių"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "vardas"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Supaprastinta kinų"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Tradicinė kinų"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Įvesk tinkamą reikšmę."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Įvesk tinkamą URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Atrodo URL blogas."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Įvesk tinkamą URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Įvesk tinkamą e-mailą."
-#: core/validators.py:123 forms/fields.py:958
-#, fuzzy
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"Ši reikšmė gali būti sudaryta tik iš raidžių, skaičių, pabraukimų arba "
-"brūkšnelių."
-#: core/validators.py:126 forms/fields.py:951
-#, fuzzy
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
-msgstr "Įvesk tinkamą e-mailą."
+msgstr ""
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Įvesk skaitmenis atskirtus kableliais."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "Įsitikink, kad reikšmė mažiausiai turi %d simbolių."
+msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Įsitikink, kad ši reikšmė yra mažiau arba lygu %s."
+msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Įsitikink, kad ši reikšmė yra daugiau arba lygu %s."
+msgstr ""
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "Įsitikink, kad reikšmė mažiausiai turi %d simbolių."
+msgstr ""
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "Įsitikink, kad reikšmė daugiausiai turi %d simbolių."
+msgstr ""
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "Šis laukas turi būti užpildytas, jei %(field)s yra %(value)s"
+msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
-#, fuzzy, python-format
+#: db/models/base.py:784 db/models/base.py:792
+#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(optname)s su šiuo %(fieldname)s jau egzistuoja."
+msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "ir"
@@ -373,9 +358,8 @@ msgid "This field cannot be null."
msgstr "Šis laukas negali būti null"
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Šis laukas negali būti null"
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -401,9 +385,9 @@ msgid "Boolean (Either True or False)"
msgstr "Boolean (True arba False)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
-#, fuzzy, python-format
+#, python-format
msgid "String (up to %(max_length)s)"
-msgstr "Eilutė (iki %(maxlength)s)"
+msgstr ""
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
@@ -423,18 +407,16 @@ msgid "Invalid date: %s"
msgstr "Netinkama data: %s"
#: db/models/fields/__init__.py:670
-#, fuzzy
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Įvesk tinkamą datą/laiką YYYY-MM-DD HH:MM formatu."
+msgstr ""
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
msgstr "Data (su laiku)"
#: db/models/fields/__init__.py:746
-#, fuzzy
msgid "This value must be a decimal number."
-msgstr "Ši reikšme turi būti sveikas skaičius."
+msgstr ""
#: db/models/fields/__init__.py:748
msgid "Decimal number"
@@ -445,14 +427,13 @@ msgid "E-mail address"
msgstr "E-mailo adresas"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Kelias iki failo"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "Ši reikšme mažiausiai turi būti %s."
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -483,9 +464,8 @@ msgid "Time"
msgstr "Laikas"
#: db/models/fields/__init__.py:1044
-#, fuzzy
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Įvesk tinkamą laiką HH:MM formatu"
+msgstr ""
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -495,24 +475,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML tekstas"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -528,9 +508,8 @@ msgid "Enter a whole number."
msgstr "Įvesk sveiką skaičių."
#: forms/fields.py:253 forms/fields.py:274
-#, fuzzy
msgid "Enter a number."
-msgstr "Įvesk sveiką skaičių."
+msgstr ""
#: forms/fields.py:277
#, python-format
@@ -572,10 +551,10 @@ msgid "The submitted file is empty."
msgstr "Nurodytas failas yra tuščias"
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "Įsitikink, kad reikšmė daugiausiai turi %d simbolių."
+msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
@@ -590,145 +569,137 @@ msgstr ""
"paveiksliukas, arba sugadintas paveiksliukas"
#: forms/fields.py:650 forms/fields.py:725
-#, fuzzy, python-format
+#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Pasirink tinkamą. %s nėra vienas iš galimų."
+msgstr ""
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Įvesk reikšmių sarašą."
-#: forms/formsets.py:308 forms/formsets.py:310
-#, fuzzy
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr "Rūšiuoti:"
+msgstr ""
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Ištrinti"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Ištaisykite klaidą žemiau"
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "Ištaisykite klaidą žemiau"
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Pasirink tinkamą. Tas pasirinkimas nėra iš galimų."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Pasirink tinkamą. %s nėra vienas iš galimų."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Dabartinis:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Pakeisti"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "metai"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Nežinomas"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Taip"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "taip,ne,galbūt"
-#: template/defaultfilters.py:805
-#, fuzzy, python-format
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
+#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d baitas"
-msgstr[1] "%(size)d baitai"
+msgstr[0] ""
+msgstr[1] ""
msgstr[2] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
-#, fuzzy
msgid "p.m."
-msgstr "p.m."
+msgstr ""
#: utils/dateformat.py:43
-#, fuzzy
msgid "a.m."
-msgstr "a.m."
+msgstr ""
#: utils/dateformat.py:48
-#, fuzzy
msgid "PM"
-msgstr "PM"
+msgstr ""
#: utils/dateformat.py:49
-#, fuzzy
msgid "AM"
-msgstr "AM"
+msgstr ""
#: utils/dateformat.py:98
msgid "midnight"
@@ -767,14 +738,12 @@ msgid "Sunday"
msgstr "Sekmadienis"
#: utils/dates.py:10
-#, fuzzy
msgid "Mon"
-msgstr "vienas"
+msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Tue"
-msgstr "Antradienis"
+msgstr ""
#: utils/dates.py:10
msgid "Wed"
@@ -785,18 +754,16 @@ msgid "Thu"
msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Fri"
-msgstr "Penktadienis"
+msgstr ""
#: utils/dates.py:11
msgid "Sat"
msgstr ""
#: utils/dates.py:11
-#, fuzzy
msgid "Sun"
-msgstr "Sekmadienis"
+msgstr ""
#: utils/dates.py:18
msgid "January"
@@ -897,139 +864,126 @@ msgstr "grd"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Sau."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Vas."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "Kovas"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Balandis"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "Gegužė"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Birželis"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Liepa"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Rugp."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Rugs."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Spa."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Lap."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Grd."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "Sausis"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "Vasaris"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "Kovas"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "Balandis"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "Gegužė"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "Birželis"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "Liepa"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "Rugpjūtis"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "Rugsėjis"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "Spalis"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "Lapkritis"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "Gruodis"
+msgstr ""
#: utils/text.py:136
-#, fuzzy
msgid "or"
-msgstr "keturi"
+msgstr ""
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
@@ -1037,57 +991,50 @@ msgid ", "
msgstr ""
#: utils/timesince.py:21
-#, fuzzy
msgid "year"
msgid_plural "years"
-msgstr[0] "metai"
-msgstr[1] "metai"
+msgstr[0] ""
+msgstr[1] ""
msgstr[2] ""
#: utils/timesince.py:22
-#, fuzzy
msgid "month"
msgid_plural "months"
-msgstr[0] "mėnesis"
-msgstr[1] "mėnesiai"
+msgstr[0] ""
+msgstr[1] ""
msgstr[2] ""
#: utils/timesince.py:23
-#, fuzzy
msgid "week"
msgid_plural "weeks"
-msgstr[0] "savaitė"
-msgstr[1] "savaitės"
+msgstr[0] ""
+msgstr[1] ""
msgstr[2] ""
#: utils/timesince.py:24
-#, fuzzy
msgid "day"
msgid_plural "days"
-msgstr[0] "diena"
-msgstr[1] "dienos"
+msgstr[0] ""
+msgstr[1] ""
msgstr[2] ""
#: utils/timesince.py:25
-#, fuzzy
msgid "hour"
msgid_plural "hours"
-msgstr[0] "valanda"
-msgstr[1] "valandos"
+msgstr[0] ""
+msgstr[1] ""
msgstr[2] ""
#: utils/timesince.py:26
-#, fuzzy
msgid "minute"
msgid_plural "minutes"
-msgstr[0] "minutė"
-msgstr[1] "minutės"
+msgstr[0] ""
+msgstr[1] ""
msgstr[2] ""
#: utils/timesince.py:45
-#, fuzzy
msgid "minutes"
-msgstr "minutė"
+msgstr ""
#: utils/timesince.py:50
#, python-format
@@ -1099,23 +1046,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "DATE_FORMAT"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "DATETIME_FORMAT"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "TIME_FORMAT"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "YEAR_MONTH_FORMAT"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "MONTH_DAY_FORMAT"
@@ -1133,3 +1080,55 @@ msgstr "%(verbose_name)s sėkmingai atnaujintas."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s buvo ištrintas."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s buvo ištrintas."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s sėkmingai atnaujintas."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/lv/LC_MESSAGES/django.mo b/django/conf/locale/lv/LC_MESSAGES/django.mo
index 17bdbb8ef8..b2bd3c1692 100644
--- a/django/conf/locale/lv/LC_MESSAGES/django.mo
+++ b/django/conf/locale/lv/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/lv/LC_MESSAGES/django.po b/django/conf/locale/lv/LC_MESSAGES/django.po
index 63b3196715..789cacf174 100644
--- a/django/conf/locale/lv/LC_MESSAGES/django.po
+++ b/django/conf/locale/lv/LC_MESSAGES/django.po
@@ -1,21 +1,19 @@
-# Django Latvian translation.
-# Copyright (C) 2008 THE Django'S COPYRIGHT HOLDER
# This file is distributed under the same license as the Django package.
#
-#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:59+0100\n"
-"PO-Revision-Date: 2010-05-10 20:18+0200\n"
-"Last-Translator: Reinis Veips <reinis.veips@wot.lv>\n"
-"Language-Team: Latvian translators' team <reinis.veips@wot.lv>\n"
+"POT-Creation-Date: 2011-02-28 17:36+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: edgars <edgars.jekabsons@gmail.com>\n"
+"Language-Team: Latvian <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
-"2);\n"
+"2)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -62,267 +60,269 @@ msgid "English"
msgstr "angļu"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "angļu"
+msgstr "Lielbritānijas angļu"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "spāņu"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Argentīnas spāņu"
+msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "spāņu"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "igauņu"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "basku"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "persiešu"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "somu"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "franču"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "frīzu"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "īru"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "galīciešu"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "ebreju"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "horvātu"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "ungāru"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "maķedoniešu"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islandiešu"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "itāļu"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japāņu"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "vācu"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "khmeru"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "kannādiešu"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "korejiešu"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "lietuviešu"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "latviešu"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "maķedoniešu"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Malaga"
+msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "maķedoniešu"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "holandiešu"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "norvēģu"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "norvēģu"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "norvēģu"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "poļu"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "portugāļu"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Brazīlijas portugāļu"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "rumāņu"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "krievu"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "slovāku"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "slovēņu"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "albāņu"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "serbu"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "serbu latīņu"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "zviedru"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "tamilu"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "taizemiešu"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "turku"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ukraiņu"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "vjetnamiešu"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "vienkāršā ķīniešu"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "tradicionālā ķīniešu"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Ievadiet korektu vērtību."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Ievadiet korektu URL adresi."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Šī URL adrese šķiet bojāta."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Ievadiet korektu URL adresi."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Ievadiet korektu e-pasta adresi."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Ievadiet korektu vērtību, kas satur tikai burtus, numurus, apakšsvītras vai "
"šķērssvītras."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Ievadiet korektu IPv4 adresi."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Ievadiet tikai numurus, atdalītus ar komatiem."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Nodrošiniet, ka vērtība ir %(limit_value)s (tā satur %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Šai vērtībai jabūt mazākai vai vienādai ar %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Vērtībai jābūt lielākai vai vienādai ar %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -331,7 +331,7 @@ msgstr ""
"Vērtībai jāsatur vismaz %(limit_value)d rakstu zīmes (tā satur %(show_value)"
"d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -340,17 +340,17 @@ msgstr ""
"Vērtībai jāsatur ne vairāk kā %(limit_value)d rakstu zīmes (tā satur %"
"(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s jābūt unikālam %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s ar nosaukumu %(field_label)s jau eksistē."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "un"
@@ -433,7 +433,7 @@ msgid "E-mail address"
msgstr "E-pasta adrese"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Faila ceļš"
@@ -481,24 +481,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML teksts"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Modelis %(model)s ar primāro atslēgu %(pk)r neeksistē."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Ārējā atslēga (tipu nosaka lauks uz kuru attiecas)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Attiecība viens pret vienu"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Attiecība daudzi pret daudziem"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -581,30 +581,30 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Izvēlieties korektu izvēli. %(value)s nav pieejamo izvēļu sarakstā."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Ievadiet sarakstu ar vērtībām."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Sakārtojums"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Dzēst"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Lūdzu izlabojiet dublicētos datus priekš %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Lūdzu izlabojiet dublicētos datus laukam %(field)s, kam jābūt unikālam."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -613,59 +613,57 @@ msgstr ""
"Lūdzu izlabojiet dublicētos datus laukam %(field_name)s, kam jābūt unikālam "
"priekš %(lookup)s iekš %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Lūdzu izlabojiet dublicētās vērtības zemāk."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Iekļautā ārējā atslēga nesakrita ar vecāka elementa primāro atslēgu"
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Izvēlaties pareizu izvēli. Jūsu izvēlele neietilpst pieejamo sarakstā."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Izvēlieties pareizu izvēli. %s nav pieejamo izvēļu sarakstā."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" ir nederīga vērtība priekš primārās atslēgas."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Pašreiz:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Izmainīt"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "gads"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Nezināms"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Jā"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nē"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "jā,nē,varbūt"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -673,30 +671,30 @@ msgstr[0] "%(size)d baits"
msgstr[1] "%(size)d baiti"
msgstr[2] "%(size)d baitu"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -877,134 +875,122 @@ msgstr "dec"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Jan."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Feb."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "marts"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "aprīlis"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "maijs"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "jūnijs"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "jūlijs"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Aug."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Sept."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Okt."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Nov."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Dec."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "janvāris"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "februāris"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "marts"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "aprīlis"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "maijs"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "jūnijs"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "jūlijs"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "augusts"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "septembris"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "oktobris"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "novembris"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "decembris"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1071,23 +1057,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "d.m.Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "d.m.Y H:i:s"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i:s"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "m.Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "d.m"
@@ -1105,3 +1091,55 @@ msgstr "%(verbose_name)s tika veiksmīgi dzēsts."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s tika dzēsts."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s tika dzēsts."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s tika veiksmīgi dzēsts."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/mk/LC_MESSAGES/django.mo b/django/conf/locale/mk/LC_MESSAGES/django.mo
index f34e2d266f..13ea6e9172 100644
--- a/django/conf/locale/mk/LC_MESSAGES/django.mo
+++ b/django/conf/locale/mk/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/mk/LC_MESSAGES/django.po b/django/conf/locale/mk/LC_MESSAGES/django.po
index 4aaa02bf9d..6efb0325db 100644
--- a/django/conf/locale/mk/LC_MESSAGES/django.po
+++ b/django/conf/locale/mk/LC_MESSAGES/django.po
@@ -1,17 +1,18 @@
-# translation of django.po to Macedonian
+# This file is distributed under the same license as the Django package.
+#
msgid ""
msgstr ""
-"Project-Id-Version: django\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:59+0100\n"
-"PO-Revision-Date: 2010-04-05 15:53+0100\n"
-"Last-Translator: Vasil Vangelovski <vvangelovski@gmail.com>\n"
-"Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
+"POT-Creation-Date: 2011-02-28 17:36+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: mk\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -66,260 +67,265 @@ msgid "Spanish"
msgstr "Шпански"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Аргентиско шпански"
+msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Шпански"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Естонски"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Баскиски"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Персиски"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Фински"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Француски"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Фризиски"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Ирски"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Галски"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Еврејски"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Хинди"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Хрватски"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Унгарски"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Македонски"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Исландски"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Италијански"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Јапонски"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Грузиски"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Кмер"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Канада"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Корејски"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Литвански"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Латвиски"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Македонски"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Малага"
+msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Монаган"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Холандски"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Норвешки"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Норвешка bokmål"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Норвешки Нинорск"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Полски"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Португалкски"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Бразилско португалски"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Романски"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Руски"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Словачки"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Словенечки"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Албански"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Српски"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Српски Латиница"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Шведски"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Тамил"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Телугу"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Тајландски"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Турски"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Украински"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Виетнамски"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Упростен кинески"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Традиционален кинески"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Внесете правилна вредност."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Внесете правилна адреса."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Оваа адреса изгледа дека не е достапна."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Внесете правилна адреса."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Внесeте правилна адреса за е-пошта."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Внесете правилно кратко име (slug) кое се соддржи од букви, цифри, долна "
"црта или тире."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Внесeте правилна IPv4 адреса."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Внесете само цифри одделени со запирки."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Осигурајте се дека оваа вредност е %(limit_value)s (моментално е %"
"(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Осигурајте се дека оваа вредност е помала или еднаква со %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Осигурајте се дека оваа вредност е поголема или еднаква со %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -328,7 +334,7 @@ msgstr ""
"Осигурајте се дека оваа вредност има најмалку %(limit_value)d знаци (има %"
"(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -337,17 +343,17 @@ msgstr ""
"Осигурајте се дека оваа вредност има најмногу %(limit_value)d знаци (има %"
"(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s мора да биде уникатно за %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s со %(field_label)s веќе постои."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "и"
@@ -430,7 +436,7 @@ msgid "E-mail address"
msgstr "Адреса на е-пошта"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Патека на датотека"
@@ -478,24 +484,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML текст"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Модел %(model)s со примарен клуч %(pk)r не постои."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Надворешен клуч (типот е одреден според сврзаното поле)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Еден-према-еден релација"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Повеќе-према-повеќе релација"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -578,31 +584,31 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Внесете валиден избор. %(value)s не е еден од можните избори."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Внесете листа на вредности."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Редослед"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Избриши"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ве молам поправете ја дуплираната вредност за %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Ве молам поправете ја дуплираната вредност за %(field)s, која мора да биде "
"уникатна."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -611,91 +617,89 @@ msgstr ""
"Ве молам поправете ја дуплираната вредност за %(field_name)s која мора да "
"биде уникатна за %(lookup)s во %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Ве молам поправете ги дуплираните вредности подолу."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Надворешниот клуч на вгезденото поле не се совпаѓа со примарниот клуч на "
"родителската инстанца."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Изберете правилно. Тоа не е еден од можните избори."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Внесете правилно. %s не е еден од достапните вредности."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" не е правилна вредност за примарен клуч."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Моментално:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Измени"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Кларе"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Непознато"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Да"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Не"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "да, не, можеби"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d бајт"
msgstr[1] "%(size)d бајти"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s КБ"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s МБ"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s ГБ"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s КБ"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s КБ"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -876,134 +880,122 @@ msgstr "дек"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "јан."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "фев."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "март"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "април"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "мај"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "јуни"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "јули"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "авг."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "сеп."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "окт."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "ное."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "дек."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "јануари"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "февруари"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "март"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "април"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "мај"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "јуни"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "јули"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "август"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "септември"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "октомври"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "ноември"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "декември"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1064,23 +1056,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j M Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j M Y, P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
@@ -1098,3 +1090,55 @@ msgstr "Ставка %(verbose_name)s беше успешно ажурирана
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "Ставка %(verbose_name)s беше избришана."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Ставка %(verbose_name)s беше избришана."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Ставка %(verbose_name)s беше успешно ажурирана."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/ml/LC_MESSAGES/django.mo b/django/conf/locale/ml/LC_MESSAGES/django.mo
index d86ea4ab72..390766cfd5 100644
--- a/django/conf/locale/ml/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ml/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ml/LC_MESSAGES/django.po b/django/conf/locale/ml/LC_MESSAGES/django.po
index 37d761cb99..fa92550b56 100644
--- a/django/conf/locale/ml/LC_MESSAGES/django.po
+++ b/django/conf/locale/ml/LC_MESSAGES/django.po
@@ -1,26 +1,22 @@
-# Translation of Django to Malayalam.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# RAJEESH R NAIR <rajeeshrnair@gmail.com>, 2010.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
-"Project-Id-Version: Django SVN\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 22:59+0100\n"
-"PO-Revision-Date: 2010-05-28 15:09+0530\n"
-"Last-Translator: Rajeesh Nair <rajeeshrnair@gmail.com>\n"
-"Language-Team: MALAYALAM <ML@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:36+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: rajeesh <rajeeshrnair@gmail.com>\n"
+"Language-Team: Malayalam <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Malayalam\n"
-"X-Poedit-Country: INDIA\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
-msgstr "അറബി"
+msgstr "അറബിക്"
#: conf/global_settings.py:45
msgid "Bulgarian"
@@ -71,251 +67,259 @@ msgid "Spanish"
msgstr "സ്പാനിഷ്"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "അര്‍ജന്റീനിയന്‍ സ്പാനിഷ്"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "അര്‍ജന്റീനിയന്‍ സ്പാനിഷ്"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "എസ്ടോണിയന്‍ സ്പാനിഷ്"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "ബാസ്ക്യു"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "പേര്‍ഷ്യന്‍"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "ഫിന്നിഷ്"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "ഫ്രെഞ്ച്"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "ഫ്രിസിയന്‍"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "ഐറിഷ്"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "ഗലിഷ്യന്‍"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "ഹീബ്റു"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "ഹിന്ദി"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "ക്രൊയേഷ്യന്‍"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "ഹംഗേറിയന്‍"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "ഇന്‍ദൊനേഷ്യന്‍"
+msgstr "ഇന്തൊനേഷ്യന്‍"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "ഐസ്ലാന്‍ഡിക്"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "ഇറ്റാലിയന്‍"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "ജാപ്പനീസ്"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "ജോര്‍ജിയന്‍"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
-msgstr ""
+msgstr "ഖ്മേര്‍"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "കന്നഡ"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "കൊറിയന്‍"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "ലിത്വാനിയന്‍"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "ലാറ്റ്വിയന്‍"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "മാസിഡോണിയന്‍"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr ""
+msgstr "മലയാളം"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "മംഗോളിയന്‍"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "ഡച്ച്"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
-msgstr ""
+msgstr "നോര്‍വീജിയന്‍"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr ""
+msgstr "നോര്‍വീജിയന്‍ ബൊക്മാല്‍"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr ""
+msgstr "നോര്‍വീജിയന്‍ നിനോഷ്ക്"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "പഞ്ചാബി"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
-msgstr ""
+msgstr "പോളിഷ്"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
-msgstr ""
+msgstr "പോര്‍ചുഗീസ്"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
-msgstr ""
+msgstr "ബ്റസീലിയന്‍ പോര്‍ചുഗീസ്"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
-msgstr ""
+msgstr "റൊമാനിയന്‍"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
-msgstr ""
+msgstr "റഷ്യന്‍"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
-msgstr ""
+msgstr "സ്ളൊവാക്"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
-msgstr ""
+msgstr "സ്ളൊവേനിയന്‍"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr ""
+msgstr "അല്‍ബേനിയന്‍"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
-msgstr ""
+msgstr "സെര്‍ബിയന്‍"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr ""
+msgstr "സെര്‍ബിയന്‍ ലാറ്റിന്‍"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
-msgstr ""
+msgstr "സ്വീഡിഷ്"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
-msgstr ""
+msgstr "തമിഴ്"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
-msgstr ""
+msgstr "തെലുങ്ക്"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr ""
+msgstr "തായ്"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
-msgstr ""
+msgstr "ടര്‍ക്കിഷ്"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
+msgstr "യുക്രേനിയന്‍"
+
+#: conf/global_settings.py:105
+msgid "Urdu"
msgstr ""
-#: conf/global_settings.py:104
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr ""
+msgstr "വിയറ്റ്നാമീസ്"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
-msgstr ""
+msgstr "ലഘു ചൈനീസ്"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
-msgstr ""
+msgstr "പരമ്പരാഗത ചൈനീസ്"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "ശരിയായ മൂല്യം നല്കണം."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "ശരിയായ URL നല്കണം."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "ഈ URL നിലവില്ലാത്ത വിലാസമാണ് കാണിക്കുന്നത്."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "ശരിയായ URL നല്കണം."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "ശരിയായ ഇ-മെയില്‍ വിലാസം നല്കുക."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "ശരിയായ സ്ളഗ് നല്കുക (അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, അണ്ടര്‍സ്കോര്‍, ഹൈഫന്‍ എന്നിവ മാത്രം ചേര്‍ന്നത്)."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "ശരിയായ IPv4 വിലാസം നല്കണം"
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "അക്കങ്ങള്‍ മാത്രം (കോമയിട്ടു വേര്‍തിരിച്ചത്)"
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "ഇത് %(limit_value)s ആവണം. (ഇപ്പോള്‍ %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "ഇത് %(limit_value)s-ഓ അതില്‍ കുറവോ ആവണം"
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "ഇത് %(limit_value)s-ഓ അതില്‍ കൂടുതലോ ആവണം"
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -324,7 +328,7 @@ msgstr ""
"ഇതിനു ഏറ്റവും കുറഞ്ഞത് %(limit_value)d അക്ഷരങ്ങള്‍ വേണം. (ഇപ്പോള്‍ %(show_value)d "
"അക്ഷരങ്ങളുണ്ട്.)"
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -333,17 +337,17 @@ msgstr ""
"ഇതിനു പരമാവധി %(limit_value)d അക്ഷരങ്ങളേ ഉള്ളൂ എന്നു ഉറപ്പാക്കുക. (ഇപ്പോള്‍ %(show_value)"
"d അക്ഷരങ്ങളുണ്ട്.)"
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(date_field)s %(lookup)s-നു %(field_name)s ആവര്‍ത്തിക്കാന്‍ പാടില്ല."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(field_label)s-ഓടു കൂടിയ %(model_name)s നിലവിലുണ്ട്."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "ഉം"
@@ -354,16 +358,16 @@ msgstr "%r അനുയോജ്യമല്ല."
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
-msgstr "ഈ കള്ളി ഒഴിച്ചിടരുത്."
+msgstr "ഈ കളം (ഫീല്‍ഡ്) ഒഴിച്ചിടരുത്."
#: db/models/fields/__init__.py:65
msgid "This field cannot be blank."
-msgstr "ഈ കള്ളി ഒഴിച്ചിടരുത്."
+msgstr "ഈ കളം (ഫീല്‍ഡ്) ഒഴിച്ചിടരുത്."
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "%(field_type)s എന്ന തരത്തിലുള്ള കളം (ഫീല്‍ഡ്)"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
@@ -381,12 +385,12 @@ msgstr "ശരിയോ തെറ്റോ എന്നു മാത്രം"
#: db/models/fields/__init__.py:495
msgid "Boolean (Either True or False)"
-msgstr "ശരിയോ തെറ്റോ എന്നു മാത്രം"
+msgstr "ശരിയോ തെറ്റോ (True അഥവാ False)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
#, python-format
msgid "String (up to %(max_length)s)"
-msgstr ""
+msgstr "സ്ട്രിങ്ങ് (%(max_length)s വരെ നീളമുള്ളത്)"
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
@@ -426,7 +430,7 @@ msgid "E-mail address"
msgstr "ഇ-മെയില്‍ വിലാസം"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "ഫയല്‍ സ്ഥാനം"
@@ -452,7 +456,7 @@ msgstr "ഈ മൂല്യം None, True, False എന്നിവയില്
#: db/models/fields/__init__.py:933
msgid "Boolean (Either True, False or None)"
-msgstr "ശരിയോ തെറ്റോ എന്നു മാത്രം"
+msgstr "ശരിയോ തെറ്റോ എന്നു മാത്രം (True, False, None എന്നിവയില്‍ ഏതെങ്കിലും ഒന്ന്)"
#: db/models/fields/__init__.py:1024
msgid "Text"
@@ -472,33 +476,33 @@ msgstr "URL(വെബ്-വിലാസം)"
#: db/models/fields/__init__.py:1136
msgid "XML text"
-msgstr ""
+msgstr "XML ടെക്സ്റ്റ്"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr ""
+msgstr "%(pk)r എന്ന pk ഉള്ള %(model)s എന്ന മോഡല്‍ നിലവിലില്ല."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "ഫോറിന്‍ കീ (ടൈപ്പ് ബന്ധപ്പെട്ട ഫീല്‍ഡില്‍ നിന്നും നിര്‍ണ്ണയിക്കുന്നതാണ്)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "വണ്‍-ടു-വണ്‍ ബന്ധം"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "മെനി-ടു-മെനി ബന്ധം"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "\"Control\" എന്ന കീ അമര്‍ത്തിപ്പിടിക്കുക. (Macലാണെങ്കില്‍ \"Command\")."
#: forms/fields.py:66
msgid "This field is required."
-msgstr "ഈ കള്ളി നിര്‍ബന്ധമാണ്."
+msgstr "ഈ കള്ളി(ഫീല്‍ഡ്) നിര്‍ബന്ധമാണ്."
#: forms/fields.py:221
msgid "Enter a whole number."
@@ -537,11 +541,11 @@ msgstr "ശരിയായ തീയതിയും സമയവും നല്
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
-msgstr "ഫയലൊന്നും ലഭിച്ചില്ല. ഫോമിലെ എന്‍-കോഡിംഗ് പരിശോധിക്കുക."
+msgstr "ഫയലൊന്നും ലഭിച്ചിട്ടില്ല. ഫോമിലെ എന്‍-കോഡിംഗ് പരിശോധിക്കുക."
#: forms/fields.py:461
msgid "No file was submitted."
-msgstr "ഫയലൊന്നും ലഭിച്ചില്ല."
+msgstr "ഫയലൊന്നും ലഭിച്ചിട്ടില്ല."
#: forms/fields.py:462
msgid "The submitted file is empty."
@@ -558,6 +562,8 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"ഒന്നുകില്‍ ഫയല്‍ സമര്‍പ്പിക്കണം, അല്ലെങ്കില്‍ ക്ളിയര്‍ എന്ന ചെക്ബോക്സ് ടിക് ചെയ്യണം. ദയവായി രണ്ടും "
+"കൂടി ചെയ്യരുത്."
#: forms/fields.py:518
msgid ""
@@ -572,29 +578,29 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "യോഗ്യമായത് തെരഞ്ഞെടുക്കുക. %(value)s ലഭ്യമായവയില്‍ ഉള്‍പ്പെടുന്നില്ല."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "മൂല്യങ്ങളുടെ പട്ടിക(ലിസ്റ്റ്) നല്കുക."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "ക്രമം"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
-msgstr ""
+msgstr "ഡിലീറ്റ്"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "%(field)s-നായി നല്കുന്ന വിവരം ആവര്‍ത്തിച്ചത് ദയവായി തിരുത്തുക."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "%(field)s-നായി നല്കുന്ന വിവരം ആവര്‍ത്തിക്കാന്‍ പാടില്ല. ദയവായി തിരുത്തുക."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -603,104 +609,103 @@ msgstr ""
"%(date_field)s ലെ %(lookup)s നു വേണ്ടി %(field_name)s നു നല്കുന്ന വിവരം ആവര്‍ത്തിക്കാന്‍ "
"പാടില്ല. ദയവായി തിരുത്തുക."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "താഴെ കൊടുത്തവയില്‍ ആവര്‍ത്തനം ഒഴിവാക്കുക."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
+msgstr "ഇന്‍ലൈനായി നല്കിയ ഫോറിന്‍ കീ മാത്രു വസ്തുവിന്റെ പ്രാഥമിക കീയുമായി യോജിക്കുന്നില്ല."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "യോഗ്യമായത് തെരഞ്ഞെടുക്കുക. നിങ്ങള്‍ നല്കിയത് ലഭ്യമായവയില്‍ ഉള്‍പ്പെടുന്നില്ല."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "യോഗ്യമായത് തെരഞ്ഞെടുക്കുക. %s തന്നിരിക്കുന്നവയില്‍ ഉള്‍പ്പെടുന്നില്ല."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" പ്രാഥമിക കീ ആവാന്‍ അനുയോജ്യമായ മൂല്യമല്ല."
#: forms/widgets.py:299
msgid "Currently"
-msgstr ""
+msgstr "നിലവിലുള്ളത്"
#: forms/widgets.py:300
msgid "Change"
msgstr "മാറ്റുക"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "വര്‍ഷം"
+msgstr "കാലിയാക്കുക"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "അജ്ഞാതം"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "അതെ"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "അല്ല"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
-msgstr "ഉണ്ട്, ഇല്ല, ഉണ്ടാവാം"
+msgstr "ഉണ്ട്, ഇല്ല, ഉണ്ടായേക്കാം"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(size)d ബൈറ്റ്"
+msgstr[1] "%(size)d ബൈറ്റുകള്‍"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr ""
+msgstr "%s കെ.ബി"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr ""
+msgstr "%s എം.ബി"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr ""
+msgstr "%s ജി.ബി"
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
-msgstr ""
+msgstr "%s ടി.ബി"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
-msgstr ""
+msgstr "%s പി.ബി"
#: utils/dateformat.py:42
msgid "p.m."
-msgstr ""
+msgstr "പി. എം (ഉച്ചയ്ക്കു ശേഷം) "
#: utils/dateformat.py:43
msgid "a.m."
-msgstr ""
+msgstr "എ. എം (ഉച്ചയ്ക്കു മുമ്പ്)"
#: utils/dateformat.py:48
msgid "PM"
-msgstr "PM"
+msgstr "പി. എം (ഉച്ചയ്ക്കു ശേഷം) "
#: utils/dateformat.py:49
msgid "AM"
-msgstr "AM"
+msgstr "എ. എം (ഉച്ചയ്ക്കു മുമ്പ്)"
#: utils/dateformat.py:98
msgid "midnight"
@@ -900,12 +905,12 @@ msgstr "ജൂലൈ"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "ആഗസ്ത്"
+msgstr "ആഗ."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "സെപ്ടം."
+msgstr "സെപ്തം."
#: utils/dates.py:40
msgctxt "abbrev. month"
@@ -923,73 +928,61 @@ msgid "Dec."
msgstr "ഡിസം."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "ജനുവരി"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "ഫെബ്രുവരി"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "മാര്‍ച്ച്"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "ഏപ്രില്‍"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "മേയ്"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "ജൂണ്‍"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "ജൂലൈ"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "ആഗസ്ത്"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "സെപ്തംബര്‍"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "ഒക്ടോബര്‍"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "നവംബര്‍"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "ഡിസംബര്‍"
@@ -1001,7 +994,7 @@ msgstr "അഥവാ"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1046,32 +1039,32 @@ msgstr "മിനുട്ടുകള്‍"
#: utils/timesince.py:50
#, python-format
msgid "%(number)d %(type)s"
-msgstr ""
+msgstr "%(number)d %(type)s"
#: utils/timesince.py:56
#, python-format
msgid ", %(number)d %(type)s"
-msgstr ""
+msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
-msgstr ""
+msgstr "തീയതിയുടെ മാത്രുക"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
-msgstr ""
+msgstr "തീയതിയും സമയവും ചേര്‍ന്ന മാത്രുക"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
-msgstr ""
+msgstr "സമയത്തിന്റെ മാത്രുക"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
-msgstr ""
+msgstr "വര്‍ഷം-മാസം എന്ന മാത്രുക"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
-msgstr ""
+msgstr "മാസം-ദിവസം എന്ന മാത്രുക"
#: views/generic/create_update.py:121
#, python-format
@@ -1087,3 +1080,55 @@ msgstr "%(verbose_name)s നെ മെച്ചപ്പെടുത്തി."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s ഡിലീറ്റ് ചെയ്യപ്പെട്ടു."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s ഡിലീറ്റ് ചെയ്യപ്പെട്ടു."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s നെ മെച്ചപ്പെടുത്തി."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/mn/LC_MESSAGES/django.mo b/django/conf/locale/mn/LC_MESSAGES/django.mo
index cb4d9c577a..deba356cac 100644
--- a/django/conf/locale/mn/LC_MESSAGES/django.mo
+++ b/django/conf/locale/mn/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/mn/LC_MESSAGES/django.po b/django/conf/locale/mn/LC_MESSAGES/django.po
index 294fae08c5..65f2ec274c 100644
--- a/django/conf/locale/mn/LC_MESSAGES/django.po
+++ b/django/conf/locale/mn/LC_MESSAGES/django.po
@@ -1,18 +1,18 @@
# This file is distributed under the same license as the Django package.
#
-# Urangua <urangua@adsolux.com>, 2010, 2002, 2010.
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:00+0100\n"
-"PO-Revision-Date: 2010-03-11 17:23+0800\n"
-"Last-Translator: Urangua <urangua@adsolux.com>\n"
-"Language-Team: mn <translate@opensource.com>\n"
+"POT-Creation-Date: 2011-02-28 17:36+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Ankhbayar <l.ankhbayar@gmail.com>\n"
+"Language-Team: Mongolian <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: mn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -27,9 +27,8 @@ msgid "Bengali"
msgstr "Бенгал"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "Эстони"
+msgstr "Босни"
#: conf/global_settings.py:48
msgid "Catalan"
@@ -60,323 +59,319 @@ msgid "English"
msgstr "Англи"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Англи"
+msgstr "Британи Англи"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Испани"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "Аргентинийн Испани"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Аргентинийн Испани"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Эстони"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Баск"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Перс"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Финлянд"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Франц"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "Фраисланд"
+msgstr "Фриз"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Ирланд"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Галици"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Еврэй"
-#: conf/global_settings.py:67
-#, fuzzy
+#: conf/global_settings.py:68
msgid "Hindi"
-msgstr "Хайланд"
+msgstr "Хинди"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Хорват"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Унгар"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Македон"
+msgstr "Индонези"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Исланд"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Итали"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Япон"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Гүрж"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Кхмер"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
-msgstr "Каннада"
+msgstr "Канад"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Солонгос"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Литва"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Латви"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Македон"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Малага"
+msgstr "Малайз"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Македон"
+msgstr "Монгол"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Голланд"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Норвеги"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Норвеги"
+msgstr "Норвеги бокмал"
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Норвеги"
+msgstr "Норвегийн нюнорск"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Панжаби"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Польш"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
-msgstr "Португали"
+msgstr "Португал"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Бразилийн Португали"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Румын"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Орос"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Словак"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Словен"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Алакант"
+msgstr "Альбани"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Серби"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "Серби"
+msgstr "Серби латин"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Щвед"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Тамил"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Тэлүгү"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "Тамил"
+msgstr "Тайланд"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Турк"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Украйн"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "Венн"
+msgstr "Вьетнам"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Хятад (хялбаршуулсан) "
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Хятад (уламжлалт)"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
-msgstr "Өгөгдхүүнээ оруулна уу."
-
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "URL оруулна уу."
+msgstr "Зөв утга оруулна уу."
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
-msgstr "Энэ URL холбоос гэмтсэн юм шиг байна."
+msgstr "Энэ URL холбоос хүчингүй эсвэл буруу байна."
+
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Зөв, хүчинтэй хаяг (URL) оруулна уу."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
-msgstr "Хүчинтэй цахим шуудангийн хаяг оруул"
+msgstr "Зөв мэйл хаяг оруулна уу"
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-msgstr "Үсэг, тоо, нэмэлт тэмдэг, зурааснаас бүрдэх `slug`-аа оруулна уу."
+msgstr ""
+"Үсэг, тоо, доогуур зураас, дундуур зурааснаас бүрдэх зөв 'slug' оруулна уу."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
-msgstr "IPv4 хаягаа оруулна уу. "
+msgstr "Зөв IPv4 хаяг оруулна уу. "
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Зөвхөн таслалаар тусгаарлагдсан цифр оруулна уу."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Энэ өгөгдхүүн хамгийн багадаа %(min)d тэмдэгттэй байх ёстой (%(length)d "
-"урттай)."
+"Энэ утга хамгийн ихдээ %(limit_value)s байх ёстой. (одоо %(show_value)s "
+"байна)"
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Энэ өгөгдхүүн %s буюу үүнээс бага байх ёстой."
+msgstr "Энэ утга %(limit_value)s -с бага эсвэл тэнцүү байх ёстой."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Энэ өгөгдхүүн %s буюу үүнээс их байх ёстой."
+msgstr "Энэ утга %(limit_value)s -с их эсвэл тэнцүү байх нөхцлийг хангана уу."
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Энэ өгөгдхүүн хамгийн багадаа %(min)d тэмдэгттэй байх ёстой (%(length)d "
-"урттай)."
+"Энэ утгын тэмдэгтийн тоо %(limit_value)d -с бага байх ёстой. (одоо %"
+"(show_value)d байна)"
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Энэ өгөгдхүүн хамгийн ихдээ %(max)d тэмдэгттэй байх ёстой (%(length)d "
-"урттай)."
+"Энэ утгын тэмдэгтийн тоо %(limit_value)d -с их байх ёстой. (одоо %"
+"(show_value)d байна)"
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
+"%(field_name)s талбарт давхардахгүй %(date_field)s %(lookup)s оруулна."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(field_label)s-тэй %(model_name)s-ийг аль хэдийнэ оруулсан байна."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "ба"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "Энэ утга %r буруу сонголт байна."
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
msgstr "Энэ хэсгийг хоосон орхиж болохгүй."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Энэ хэсгийг хоосон орхиж болохгүй."
+msgstr "Энэ хэсэг хоосон байж болохгүй."
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "Талбарийн төрөл нь : %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
@@ -386,11 +381,11 @@ msgstr "Бүхэл тоо"
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
msgid "This value must be an integer."
-msgstr "Энэ бүхэл тоо байх ёстой."
+msgstr "Энэ бүхэл тоон утга байх ёстой."
#: db/models/fields/__init__.py:493
msgid "This value must be either True or False."
-msgstr "Энэ True, False-ийн аль аль нь байх ёстой. "
+msgstr "Энэ True, False-ийн аль нэг нь байх ёстой. "
#: db/models/fields/__init__.py:495
msgid "Boolean (Either True or False)"
@@ -411,7 +406,7 @@ msgstr "Огноо (цаггүй)"
#: db/models/fields/__init__.py:588
msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "Огноогоо ЖЖЖЖ-СС-ӨӨ гэсэн хэлбэрээр оруулна уу."
+msgstr "Огноогоо YYYY-MM-DD гэсэн хэлбэрээр оруулна уу."
#: db/models/fields/__init__.py:589
#, python-format
@@ -439,22 +434,21 @@ msgid "E-mail address"
msgstr "Цахим шуудангийн хаяг"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Файлын зам "
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "Энэ бүхэл тоо байх ёстой."
+msgstr "Энэ хэсэгт бутархай тоо оруулна"
#: db/models/fields/__init__.py:843
msgid "Floating point number"
-msgstr ""
+msgstr "Хөвөгч таслалтай тоо"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "Том (8 байт) бүхэл тоо"
#: db/models/fields/__init__.py:915
msgid "IP address"
@@ -462,7 +456,7 @@ msgstr "IP хаяг"
#: db/models/fields/__init__.py:931
msgid "This value must be either None, True or False."
-msgstr "Энэ None, True, False-ийн аль аль нь байх ёстой."
+msgstr "Энэ утга None, True, False-ийн аль нэг байх ёстой."
#: db/models/fields/__init__.py:933
msgid "Boolean (Either True, False or None)"
@@ -470,15 +464,15 @@ msgstr "Boolean (Үнэн, худал, эсвэл юу ч биш)"
#: db/models/fields/__init__.py:1024
msgid "Text"
-msgstr "Бичвэр"
+msgstr "Текст"
#: db/models/fields/__init__.py:1040
msgid "Time"
-msgstr "Хугацаа"
+msgstr "Цаг"
#: db/models/fields/__init__.py:1044
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Цагаа ЦЦ:ММ[:сс[.uuuuuu]] гэсэн хэлбэрээр оруулна уу. "
+msgstr "Цагийг HH:MM[:ss[.uuuuuu]] гэсэн хэлбэрээр оруулна уу. "
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -486,42 +480,42 @@ msgstr "URL"
#: db/models/fields/__init__.py:1136
msgid "XML text"
-msgstr "XML бичвэр"
+msgstr "XML текст"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr ""
+msgstr " pk %(pk)r-тай %(model)s модель байхгүй байна."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "Гадаад түлхүүр (тодорхой төрлийн холбоос талбар)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "Нэг-нэг холбоос"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "Олон-олон холбоос"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
-"Нэгээс олныг сонгохын тулд Мак дээрх \"Control\", \"Command\"-ийг дарна уу."
+"Олон утга сонгохын тулд \"Control\" (Mac дээр \"Command\") товчыг ашиглана."
#: forms/fields.py:66
msgid "This field is required."
-msgstr "Энэ хэсгийг бөглөх шаардлагатай."
+msgstr "Энэ талбарыг бөглөх шаардлагатай."
#: forms/fields.py:221
msgid "Enter a whole number."
-msgstr "Дугаараа бүхлээр нь оруулна уу."
+msgstr "Бүхэл тоон утга оруулна уу."
#: forms/fields.py:253 forms/fields.py:274
msgid "Enter a number."
-msgstr "Дугаараа оруулна уу."
+msgstr "Тоон утга оруулна уу."
#: forms/fields.py:277
#, python-format
@@ -540,15 +534,15 @@ msgstr "Энд бутархайн таслалаас өмнө %s-аас олон
#: forms/fields.py:342 forms/fields.py:918
msgid "Enter a valid date."
-msgstr "Огноо оруулна уу."
+msgstr "Зөв огноо оруулна уу."
#: forms/fields.py:370 forms/fields.py:919
msgid "Enter a valid time."
-msgstr "Цаг оруулна уу."
+msgstr "Зөв цаг оруулна уу."
#: forms/fields.py:396
msgid "Enter a valid date/time."
-msgstr "Огноо/цаг оруулна уу."
+msgstr "Огноо/цаг-ыг зөв оруулна уу."
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
@@ -563,143 +557,147 @@ msgid "The submitted file is empty."
msgstr "Оруулсан файл хоосон байна. "
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Энэ өгөгдхүүн хамгийн ихдээ %(max)d тэмдэгттэй байх ёстой (%(length)d "
-"урттай)."
+"Энэ файлын нэрний урт %(length)d байна. Файлын нэр хамгийн ихдээ %(max)d "
+"тэмдэгтээс бүрдэх нөхцлийг хангана уу."
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Нэг бол сонголтын чягтыг авах эсвэл файл оруулна уу. Зэрэг хэрэгжих "
+"боломжгүй."
#: forms/fields.py:518
msgid ""
"Upload a valid image. The file you uploaded was either not an image or a "
"corrupted image."
msgstr ""
-"Зөв зураг оруулна уу. Таны оруулсан файл зүгээр зураг, гэмтсэн зургийн аль "
-"нь ч биш байна."
+"Зөв зураг оруулна уу. Таны оруулсан файл нэг бол зургийн файл биш эсвэл "
+"гэмтсэн зураг байна."
#: forms/fields.py:650 forms/fields.py:725
#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "Зөв сонголт хийгээрэй. %(value)s гэсэн сонголт байхгүй байна."
+msgstr "Зөв сонголт хийнэ үү. %(value)s гэсэн сонголт байхгүй байна."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Өгөгдхүүний жагсаалтаа оруулна уу."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr "Дараалал"
+msgstr "Эрэмбэлэх"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Устгах"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Доорх алдааг засна уу."
+msgstr "%(field)s хэсэг дэх давхардсан утгыг засварлана уу. "
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
+"%(field)s хэсэг дэх давхардсан утгыг засварлана уу. Түүний утгууд "
+"давхардахгүй байх ёстой."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
+"%(field_name)s хэсэг дэх давхардсан утгыг засварлана уу. %(date_field)s-н %"
+"(lookup)s хувьд давхардахгүй байх ёстой."
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "Доорх алдааг засна уу."
+msgstr "Доорх давхардсан утгуудыг засна уу."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
+"Inline обектийн гадаад түлхүүр Эцэг обектийн түлхүүртэй таарахгүй байна. "
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "Зөв сонголт хийгээрэй. Энэ сонголт байхгүй байна."
+msgstr "Зөв сонголт хийнэ үү. Энэ утга сонголтонд алга."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Зөв сонголт хийгээрэй. %s гэсэн сонголт байхгүй байна."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" нь primary key талбарт тохирохгүй утга байна."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Одоогоор:"
+msgstr "Одоогийн"
#: forms/widgets.py:300
msgid "Change"
-msgstr "Өөрчлөх"
+msgstr "Засах"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Касерес"
+msgstr "Цэвэрлэх"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Тодорхойгүй"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Тийм"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Үгүй"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
-msgstr "тийм, үгүй, магадгүй"
+msgstr "тийм,үгүй,магадгүй"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d байт"
msgstr[1] "%(size)d байт"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -719,11 +717,11 @@ msgstr "AM"
#: utils/dateformat.py:98
msgid "midnight"
-msgstr "шөнө"
+msgstr "шөнө дунд"
#: utils/dateformat.py:100
msgid "noon"
-msgstr "үд"
+msgstr "үд дунд"
#: utils/dates.py:6
msgid "Monday"
@@ -880,134 +878,122 @@ msgstr "12-р сар"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "1-р сар"
+msgstr "1-р сар."
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "2-р сар"
+msgstr "2-р сар."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "3-р сар"
+msgstr "3-р сар."
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "4-р сар"
+msgstr "4-р сар."
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "5-р сар"
+msgstr "5-р сар."
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "6-р сар"
+msgstr "6-р сар."
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "7-р сар"
+msgstr "7-р сар."
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "8-р сар"
+msgstr "8-р сар."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "9-р сар"
+msgstr "9-р сар."
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "10-р сар"
+msgstr "10-р сар."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "11-р сар"
+msgstr "11-р сар."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "12-р сар"
+msgstr "12-р сар."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "1-р сар"
+msgstr "Хулгана"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "2-р сар"
+msgstr "Үхэр"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "3-р сар"
+msgstr "Бар"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "4-р сар"
+msgstr "Туулай"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "5-р сар"
+msgstr "Луу"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "6-р сар"
+msgstr "Могой"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "7-р сар"
+msgstr "Морь"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "8-р сар"
+msgstr "Хонь"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "9-р сар"
+msgstr "Бич"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "10-р сар"
+msgstr "Тахиа"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "11-р сар"
+msgstr "Нохой"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "12-р сар"
+msgstr "Гахай"
#: utils/text.py:136
msgid "or"
@@ -1016,7 +1002,7 @@ msgstr "буюу"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1068,23 +1054,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
-msgstr "N j, Y"
+msgstr "Y-m-d"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
-msgstr ""
+msgstr "Y-m-d, H:i:s"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
-msgstr "P"
+msgstr "TIME_FORMAT"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
-msgstr "F Y"
+msgstr "Y F"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
@@ -1102,3 +1088,55 @@ msgstr " %(verbose_name)s амжилттай шинэчлэгдлээ."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s устлаа."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s устлаа."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr " %(verbose_name)s амжилттай шинэчлэгдлээ."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/nb/LC_MESSAGES/django.mo b/django/conf/locale/nb/LC_MESSAGES/django.mo
index dbdae510c9..386bf032b3 100644
--- a/django/conf/locale/nb/LC_MESSAGES/django.mo
+++ b/django/conf/locale/nb/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/nb/LC_MESSAGES/django.po b/django/conf/locale/nb/LC_MESSAGES/django.po
index a334546b4f..cebbb2728f 100644
--- a/django/conf/locale/nb/LC_MESSAGES/django.po
+++ b/django/conf/locale/nb/LC_MESSAGES/django.po
@@ -1,19 +1,18 @@
-# Norwegian (Bokmål) translation of Django
-# Copyright (C) 2005-2010
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:00+0100\n"
-"PO-Revision-Date: 2010-05-14 21:43+0200\n"
-"Last-Translator: Christian Mikalsen and Jon Lønne\n"
-"Language-Team: Norsk <no@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:36+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: jonklo <jonklo@gmail.com>\n"
+"Language-Team: Norwegian Bokmål <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: nb\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -68,278 +67,285 @@ msgid "Spanish"
msgstr "Spansk"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "Argentinsk spansk"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Argentinsk spansk"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estisk"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Baskisk"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Persisk"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finsk"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Fransk"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Frisisk"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irsk"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galisisk"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebraisk"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Kroatisk"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Ungarsk"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "Indonesisk"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandsk"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italiensk"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japansk"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Georgisk"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Koreansk"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Litauisk"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Latvisk"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Makedonsk"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Málaga"
+msgstr "Malayalam"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "Mongolsk"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Nederlandsk"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norsk"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Norsk (bokmål)"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Norsk (nynorsk)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Panjabi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Polsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugisisk"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Brasiliansk portugisisk"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Rumensk"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slovakisk"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slovensk"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Albansk"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Serbisk latin"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Svensk"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Tyrkisk"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukrainsk"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vietnamesisk"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Forenklet kinesisk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Tradisjonell kinesisk"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Oppgi en gyldig verdi."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Oppgi en gyldig nettadresse."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Nettadressen fører til en side som ikke eksisterer."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Oppgi en gyldig nettadresse."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Oppgi en gyldig e-postadresse."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Oppgi en gyldig 'slug' bestående av bokstaver, nummer, understreker eller "
"bindestreker."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Oppgi en gyldig IPv4-adresse."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Oppgi kun tall adskilt med komma."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Verdien må være %(limit_value)s (den er %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Verdien må være mindre enn eller lik som %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Verdien må være større enn eller lik som %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr "Verdien må minimum ha %(limit_value)d tegn (den har %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr "Verdien kan maksimalt ha %(limit_value)d tegn (den er %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s må være unik for %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s med %(field_label)s finnes allerede."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "og"
@@ -422,7 +428,7 @@ msgid "E-mail address"
msgstr "E-postadresse"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Filsti"
@@ -470,24 +476,24 @@ msgstr "Nettadresse"
msgid "XML text"
msgstr "XML-tekst"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Modell %(model)s med primærnøkkelen %(pk)r finnes ikke."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Fremmednøkkel (type bestemmes av relatert felt)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "En-til-en-relasjon"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Mange-til-mange-relasjon"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -552,7 +558,7 @@ msgstr "Filnavnet kan maksimalt ha %(max)d tegn (det har %(length)d)."
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "Vennligst last opp en ny fil eller marker fjern-boksen, ikke begge."
#: forms/fields.py:518
msgid ""
@@ -567,29 +573,29 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Velg et gyldig valg. %(value)s er ikke et av de tilgjengelige valgene."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Oppgi en liste med verdier."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Rekkefølge"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Slett"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Vennligst korriger duplisert data for %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Vennligst korriger duplisert data for %(field)s, som må være unik."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -598,89 +604,87 @@ msgstr ""
"Vennligst korriger duplisert data for %(field_name)s, som må være unik for %"
"(lookup)s i %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Vennligst korriger de dupliserte verdiene nedenfor."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Primærnøkkelen er ikke den samme som foreldreinstansens primærnøkkel."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Velg et gyldig valg. Valget er ikke et av de tilgjengelige valgene."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Velg et gyldig valg. %s er ikke et av de tilgjengelige valgene."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" er ikke en gyldig verdi for en primærnøkkel."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Nå:"
+msgstr "Nå"
#: forms/widgets.py:300
msgid "Change"
msgstr "Endre"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Cáceres"
+msgstr "Fjern"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Ukjent"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nei"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ja,nei,kanskje"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -764,7 +768,7 @@ msgstr "søn"
#: utils/dates.py:18
msgid "January"
-msgstr "januar"
+msgstr "Januar"
#: utils/dates.py:18
msgid "February"
@@ -871,12 +875,12 @@ msgstr "feb."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "mars"
+msgstr "mar."
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "april"
+msgstr "apr."
#: utils/dates.py:35
msgctxt "abbrev. month"
@@ -886,12 +890,12 @@ msgstr "mai"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "juni"
+msgstr "jun."
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "juli"
+msgstr "jul."
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -919,76 +923,64 @@ msgid "Dec."
msgstr "des."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "januar"
+msgstr "Januar"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "februar"
+msgstr "Februar"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "mars"
+msgstr "Mars"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "april"
+msgstr "April"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "mai"
+msgstr "Mai"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "juni"
+msgstr "Juni"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "juli"
+msgstr "Juli"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "august"
+msgstr "August"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "september"
+msgstr "September"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "oktober"
+msgstr "Oktober"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "november"
+msgstr "November"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "desember"
+msgstr "Desember"
#: utils/text.py:136
msgid "or"
@@ -997,7 +989,7 @@ msgstr "eller"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ","
#: utils/timesince.py:21
msgid "year"
@@ -1049,23 +1041,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j. F Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. F Y H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1083,3 +1075,55 @@ msgstr "%(verbose_name)s ble oppdatert."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s ble slettet."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s ble slettet."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s ble oppdatert."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/nl/LC_MESSAGES/django.mo b/django/conf/locale/nl/LC_MESSAGES/django.mo
index aae7aa123d..4db0d04367 100644
--- a/django/conf/locale/nl/LC_MESSAGES/django.mo
+++ b/django/conf/locale/nl/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/nl/LC_MESSAGES/django.po b/django/conf/locale/nl/LC_MESSAGES/django.po
index 798bde04d2..6c73261df4 100644
--- a/django/conf/locale/nl/LC_MESSAGES/django.po
+++ b/django/conf/locale/nl/LC_MESSAGES/django.po
@@ -1,19 +1,18 @@
-# Dutch translation for Django.
-# Copyright (C) 2008, Django Software Foundation
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:00+0100\n"
-"PO-Revision-Date: 2008-08-28 13:58+0100\n"
-"Last-Translator: Rudolph Froger <rudolphfroger@estrate.nl>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2011-02-28 17:36+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: jeffrey <jeffrey@noppo.pro>\n"
+"Language-Team: Dutch <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -28,9 +27,8 @@ msgid "Bengali"
msgstr "Bengaals"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "Ests"
+msgstr "Bosnisch"
#: conf/global_settings.py:48
msgid "Catalan"
@@ -61,322 +59,319 @@ msgid "English"
msgstr "Engels"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Engels"
+msgstr "Brits-Engels"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Spaans"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Argentijns Spaans"
+msgstr "Argentijns-Spaans"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Argentijns-Spaans"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Ests"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Baskisch"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Perzisch"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Fins"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Frans"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "Friesland"
+msgstr "Fries"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Iers"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galicisch"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebreews"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Kroatisch"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Hongaars"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Macedonisch"
+msgstr "Indonesisch"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "IJslands"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italiaans"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japans"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Georgisch"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Koreaans"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Litouws"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Lets"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Macedonisch"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Malaga"
+msgstr "Malayalam"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Macedonisch"
+msgstr "Mongolisch"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Nederlands"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Noors"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Noors"
+msgstr "Noorse Bokmål"
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Noors"
+msgstr "Noorse Nynorsk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Punjabi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Pools"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugees"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Braziliaans Portugees"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Roemeens"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Russisch"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slovaaks"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Sloveens"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Alacant"
+msgstr "Albanisch"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Servisch"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "Servisch"
+msgstr "Servisch Latijn"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Zweeds"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telegu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Thais"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Turks"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Oekraïens"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "Wenen"
+msgstr "Vietnamees"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Vereenvoudigd Chinees"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Traditioneel Chinees"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Geef een geldige waarde."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Geef een geldige URL op."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Deze URL lijkt niet te werken."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Geef een geldige URL op."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Geef een geldig e-mailadres op."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Vul een geldigde 'slug' in, bestaande uit letters, cijfers, liggende "
"streepjes en verbindingsstreepjes."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Geef een geldig IPv4-adres op."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Geef alleen cijfers op, gescheiden door komma's."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Zorg ervoor dat deze tekst langer is dan %(min)d tekens (huidige lengte %"
-"(length)d)."
+"Zorg ervoor dat deze waarde gelijk is aan %(limit_value)s (het is nu %"
+"(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Zorg ervoor dat de waarde kleiner of gelijk is aan %s."
+msgstr "Zorg ervoor dat deze waarde hoogstens %(limit_value)s is."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Zorg ervoor de waarde groter of gelijk is aan %s."
+msgstr "Zorg ervoor dat deze waarde minstens %(limit_value)s is."
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Zorg ervoor dat deze tekst langer is dan %(min)d tekens (huidige lengte %"
-"(length)d)."
+"Zorg ervoor dat deze waarde minstens %(limit_value)d karakters bevat (hij "
+"heeft er %(show_value)d)."
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Zorg ervoor dat waarde korter is dan %(max)d tekens (huidige lengte %(length)"
-"d)."
+"Zorg ervoor dat deze waarde hoogstens %(limit_value)d karakters bevat (hij "
+"heeft er %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s moet uniek zijn voor %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Er bestaat al een %(model_name)s met eenzelfde %(field_label)s."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "en"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "Waarde %r is geen geldige keuze."
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
msgstr "Dit veld mag niet leeg zijn."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Dit veld mag niet leeg zijn."
+msgstr "Dit veld kan niet leeg zijn"
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "Veld van type: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
@@ -439,11 +434,10 @@ msgid "E-mail address"
msgstr "E-mailadres"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Bestandspad"
-# Choose 'kommagetal' because it's user input.
#: db/models/fields/__init__.py:841
msgid "This value must be a float."
msgstr "De waarde moet een kommagetal zijn."
@@ -454,7 +448,7 @@ msgstr "Decimaal getal"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "Groot (8 byte) geheel getal"
#: db/models/fields/__init__.py:915
msgid "IP address"
@@ -488,24 +482,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML-tekst"
-#: db/models/fields/related.py:804
-#, fuzzy, python-format
+#: db/models/fields/related.py:815
+#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr "%(name)s object met primaire sleutel %(key)r bestaat niet."
+msgstr "Model %(model)s met pk %(pk)r bestaat niet."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "Refererende sleutel (type wordt bepaalde door gerelateerde veld)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "Één-op-één relatie"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "Veel-op-veel relatie"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -575,7 +569,7 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "Upload a.u.b. een bestand of vink de verwijder vink, niet allebei."
#: forms/fields.py:518
msgid ""
@@ -590,29 +584,29 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Selecteer een geldige keuze. %(value)s is geen beschikbare keuze."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Geef een lijst op met waardes."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Volgorde"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Verwijderen"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Verbeter de dubbele gegevens voor %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Verbeter de dubbele gegevens voor %(field)s, welke uniek moet zijn."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -621,91 +615,89 @@ msgstr ""
"Verbeter de dubbele gegevens voor %(field_name)s, welke uniek moet zijn voor "
"de %(lookup)s in %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Verbeter de dubbele waarden hieronder."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"De secundaire sleutel komt niet overeen met de primaire sleutel van de "
"bovenliggende instantie."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Selecteer een geldige keuze. Deze keuze is niet beschikbaar."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Selecteer een geldige keuze. %s is geen beschikbare keuze."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" is geen geldige waarde voor een primaire sleutel."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Huidige:"
+msgstr "Huidige"
#: forms/widgets.py:300
msgid "Change"
msgstr "Wijzigen"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "jaar"
+msgstr "Verwijder"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Onbekend"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nee"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ja,nee,misschien"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -886,22 +878,22 @@ msgstr "dec"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "jan."
+msgstr "jan"
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "feb."
+msgstr "feb"
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "maart"
+msgstr "mrt"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "april"
+msgstr "apr"
#: utils/dates.py:35
msgctxt "abbrev. month"
@@ -911,106 +903,94 @@ msgstr "mei"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "juni"
+msgstr "jun"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "juli"
+msgstr "jul"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "aug."
+msgstr "aug"
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "sept."
+msgstr "sep"
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "okt."
+msgstr "okt"
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "nov."
+msgstr "nov"
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "dec."
+msgstr "dec"
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "januari"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "februari"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "maart"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "april"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "mei"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "juni"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "juli"
+msgstr "july"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "augustus"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "september"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "oktober"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "november"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "december"
@@ -1022,7 +1002,7 @@ msgstr "of"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ","
#: utils/timesince.py:21
msgid "year"
@@ -1048,7 +1028,6 @@ msgid_plural "days"
msgstr[0] "dag"
msgstr[1] "dagen"
-# In the timesince context it is stilistically wrong to use the plural for hour in Dutch.
#: utils/timesince.py:25
msgid "hour"
msgid_plural "hours"
@@ -1075,23 +1054,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j-n-Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j-n-Y H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
@@ -1109,3 +1088,55 @@ msgstr "De %(verbose_name)s is succesvol aangepast."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "De %(verbose_name)s is verwijderd."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "De %(verbose_name)s is verwijderd."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "De %(verbose_name)s is succesvol aangepast."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/nn/LC_MESSAGES/django.mo b/django/conf/locale/nn/LC_MESSAGES/django.mo
index 5467fc49e2..b3633dfd9b 100644
--- a/django/conf/locale/nn/LC_MESSAGES/django.mo
+++ b/django/conf/locale/nn/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/nn/LC_MESSAGES/django.po b/django/conf/locale/nn/LC_MESSAGES/django.po
index 7255b681fd..707e594d59 100644
--- a/django/conf/locale/nn/LC_MESSAGES/django.po
+++ b/django/conf/locale/nn/LC_MESSAGES/django.po
@@ -1,19 +1,18 @@
-# translation of django.po to norwegian nynorsk
-# Copyright (C) 2005 and beyond
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:00+0100\n"
-"PO-Revision-Date: 2010-03-04 12:13+0200\n"
-"Last-Translator: Håvard Grimelid\n"
-"Language-Team: Norsk nynorsk <nn@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:36+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: Norwegian Nynorsk <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: nn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -72,255 +71,264 @@ msgid "Argentinian Spanish"
msgstr "Argentinsk spansk"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Argentinsk spansk"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estisk"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Baskisk"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Persisk"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finsk"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Fransk"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Frisisk"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irsk"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galisisk"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebraisk"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Kroatisk"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Ungarsk"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "Indonesisk"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandsk"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italiensk"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japansk"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Georgisk"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Koreansk"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Litauisk"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Latvisk"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Makedonsk"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr "Malayalam"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "Mongolsk"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Nederlandsk"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norsk"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Norsk (bokmål)"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Norsk (nynorsk)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Polsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugisisk"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Brasiliansk portugisisk"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Rumensk"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slovakisk"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slovensk"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Albansk"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Serbisk latin"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Svensk"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Tyrkisk"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukrainsk"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vietnamesisk"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Simplifisert kinesisk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Tradisjonell kinesisk"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Oppgje ein gyldig verdi."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Oppgje ei gyldig nettadresse."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Nettadressa fører til ei side som ikkje eksisterar."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Oppgje ei gyldig nettadresse."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Oppgje ei gyldig e-postadresse."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Oppgje ein gyldig 'slug' som består av bokstavar, nummer, understrekar eller "
"bindestrekar."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Oppgje ei gyldig IPv4-adresse."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Oppgje berre tall skild med komma."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Verdien må minimum ha %(limit_value)s teikn (den er %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Verdien må vere mindre enn eller lik %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Verdien må vere større enn eller lik %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr "Verdien må minimum ha %(limit_value)d teikn (den er %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -328,17 +336,17 @@ msgid ""
msgstr ""
"Verdien kan maksimalt ha %(limit_value)d teikn (den er %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s må vere unik for %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s med %(field_label)s fins allereie."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "og"
@@ -421,7 +429,7 @@ msgid "E-mail address"
msgstr "E-postadresse"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Filsti"
@@ -469,24 +477,24 @@ msgstr "Nettadresse"
msgid "XML text"
msgstr "XML-tekst"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Modellen %(model)s med primærnøkkelen %(pk)r eksisterer ikkje."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Primærnøkkel (type bestemt av relatert felt)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Ein-til-ein-forhold"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Mange-til-mange-forhold"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -568,29 +576,29 @@ msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Velg eit gyldig valg. %(value)s er ikkje eit av dei tilgjengelege valga."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Oppgje ei liste med verdiar."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Rekkefølge"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Slett"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Korriger dupliserte data for %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Korriger dupliserte data for %(field)s, som må vere unike."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -599,90 +607,88 @@ msgstr ""
"Korriger dupliserte data for %(field_name)s, som må vere unike for %(lookup)"
"s i %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Korriger dei dupliserte verdiane nedanfor."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Primærnøkkelen er ikkje den samme som foreldreinstansen sin primærnøkkel."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Velg eit gyldig valg. Valget er ikkje eit av dei tilgjengelege valga."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Velg eit gyldig valg. %s er ikkje eit av dei tilgjengelege valga."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" er ikkje ein gyldig verdi for ein primærnøkkel."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "No:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Endre"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Ukjend"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nei"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ja,nei,kanskje"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -863,134 +869,122 @@ msgstr "des"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "jan."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "feb."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "mars"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "april"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "mai"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "juni"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "juli"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "aug."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "sept."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "okt."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "nov."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "des."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "januar"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "februar"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "mars"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "april"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "mai"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "juni"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "juli"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "august"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "september"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "oktober"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "november"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "desember"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1051,23 +1045,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j. F Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. F Y H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1085,3 +1079,55 @@ msgstr "%(verbose_name)s vart oppdatert."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s vart sletta."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s vart sletta."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s vart oppdatert."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/no/LC_MESSAGES/django.mo b/django/conf/locale/no/LC_MESSAGES/django.mo
index 93f897524b..f790d50aa9 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.mo
+++ b/django/conf/locale/no/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/no/LC_MESSAGES/django.po b/django/conf/locale/no/LC_MESSAGES/django.po
index 7c49dce98f..210b3cdb98 100644
--- a/django/conf/locale/no/LC_MESSAGES/django.po
+++ b/django/conf/locale/no/LC_MESSAGES/django.po
@@ -1,20 +1,18 @@
-# This is the *old* Norwegian (Bokmål) translation of Django
-# For future updates please use the translation in the "nb" directory.
-# Copyright (C) 2005-2010
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:00+0100\n"
-"PO-Revision-Date: 2010-03-11 14:22+0100\n"
-"Last-Translator: Christian Mikalsen and Jon Lønne\n"
-"Language-Team: Norsk <no@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:36+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: Norwegian <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: no\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -69,278 +67,285 @@ msgid "Spanish"
msgstr "Spansk"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Argentinsk spansk"
+msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Spansk"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estisk"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Baskisk"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Persisk"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finsk"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Fransk"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Frisisk"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irsk"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galisisk"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebraisk"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Kroatisk"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Ungarsk"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "Indonesisk"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandsk"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italiensk"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japansk"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Georgisk"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Koreansk"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Litauisk"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Latvisk"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Makedonsk"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Málaga"
+msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "Mongolsk"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Nederlandsk"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norsk"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Norsk (bokmål)"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Norsk (nynorsk)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Polsk"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugisisk"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Brasiliansk portugisisk"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Rumensk"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Russisk"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slovakisk"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slovensk"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Albansk"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Serbisk"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Serbisk latin"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Svensk"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Tyrkisk"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukrainsk"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vietnamesisk"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Forenklet kinesisk"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Tradisjonell kinesisk"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Oppgi en gyldig verdi."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Oppgi en gyldig nettadresse."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Nettadressen fører til en side som ikke eksisterer."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Oppgi en gyldig nettadresse."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Oppgi en gyldig e-postadresse."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Oppgi en gyldig 'slug' bestående av bokstaver, nummer, understreker eller "
"bindestreker."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Oppgi en gyldig IPv4-adresse."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Oppgi kun tall adskilt med komma."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Verdien må være %(limit_value)s (den er %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Verdien må være mindre enn eller lik som %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Verdien må være større enn eller lik som %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr "Verdien må minimum ha %(limit_value)d tegn (den har %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr "Verdien kan maksimalt ha %(limit_value)d tegn (den er %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s må være unik for %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s med %(field_label)s finnes allerede."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "og"
@@ -423,7 +428,7 @@ msgid "E-mail address"
msgstr "E-postadresse"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Filsti"
@@ -471,24 +476,24 @@ msgstr "Nettadresse"
msgid "XML text"
msgstr "XML-tekst"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Modell %(model)s med primærnøkkelen %(pk)r finnes ikke."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Fremmednøkkel (type bestemmes av relatert felt)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "En-til-en-relasjon"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Mange-til-mange-relasjon"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -568,29 +573,29 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Velg et gyldig valg. %(value)s er ikke et av de tilgjengelige valgene."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Oppgi en liste med verdier."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Rekkefølge"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Slett"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Vennligst korriger duplisert data for %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Vennligst korriger duplisert data for %(field)s, som må være unik."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -599,89 +604,87 @@ msgstr ""
"Vennligst korriger duplisert data for %(field_name)s, som må være unik for %"
"(lookup)s i %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Vennligst korriger de dupliserte verdiene nedenfor."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Primærnøkkelen er ikke den samme som foreldreinstansens primærnøkkel."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Velg et gyldig valg. Valget er ikke et av de tilgjengelige valgene."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Velg et gyldig valg. %s er ikke et av de tilgjengelige valgene."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" er ikke en gyldig verdi for en primærnøkkel."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Nå:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Endre"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Cáceres"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Ukjent"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nei"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ja,nei,kanskje"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -862,134 +865,122 @@ msgstr "des"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "jan."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "feb."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "mars"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "april"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "mai"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "juni"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "juli"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "aug."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "sept."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "okt."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "nov."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "des."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "januar"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "februar"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "mars"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "april"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "mai"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "juni"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "juli"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "august"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "september"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "oktober"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "november"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "desember"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1050,23 +1041,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j. F Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. F Y H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1084,3 +1075,55 @@ msgstr "%(verbose_name)s ble oppdatert."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s ble slettet."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s ble slettet."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s ble oppdatert."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/pa/LC_MESSAGES/django.mo b/django/conf/locale/pa/LC_MESSAGES/django.mo
index 08dd668b81..1d77c45e14 100644
--- a/django/conf/locale/pa/LC_MESSAGES/django.mo
+++ b/django/conf/locale/pa/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/pa/LC_MESSAGES/django.po b/django/conf/locale/pa/LC_MESSAGES/django.po
index 29eca12937..b1c18ec7c8 100644
--- a/django/conf/locale/pa/LC_MESSAGES/django.po
+++ b/django/conf/locale/pa/LC_MESSAGES/django.po
@@ -4,14 +4,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:00+0100\n"
-"PO-Revision-Date: 2010-10-15 22:47+0530\n"
-"Last-Translator: A S Alam <aalam@users.sf.net>\n"
-"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.net>\n"
+"POT-Creation-Date: 2011-02-28 17:36+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: aalam <apreet.alam@gmail.com>\n"
+"Language-Team: Panjabi (Punjabi) <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -70,270 +71,279 @@ msgid "Argentinian Spanish"
msgstr "ਅਰਜਨਟੀਨੀ ਸਪੇਨੀ"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "ਅਰਜਨਟੀਨੀ ਸਪੇਨੀ"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "ਈਸਟੋਨੀਆਈ"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "ਬਸਕਿਊ"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "ਪਰਸ਼ੀਆਈ"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "ਫੈਨਿਸ਼"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "ਫਰੈਂਚ"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "ਫ਼ਾਰਸੀ"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "ਆਈਰਸ਼"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "ਗਲੀਸੀਆਈ"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "ਹੈਬਰਿਊ"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "ਹਿੰਦੀ"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "ਕਰੋਆਟੀਆਈ"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "ਹੰਗਰੀਆਈ"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "ਇੰਡੋਨੇਸ਼ੀਆਈ"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "ਆਈਸਲੈਂਡਿਕ"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "ਇਤਾਲਵੀ"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "ਜਾਪਾਨੀ"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "ਜਾਰਜੀਆਈ"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "ਖਮੀਰ"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "ਕੰਨੜ"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "ਕੋਰੀਆਈ"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "ਲੀਥੁਨੀਆਈ"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "ਲਾਟਵੀਅਨ"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "ਮੈਕਡੋਨੀਆਈ"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr ""
+msgstr "ਮਲਿਆਲਮ"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "ਮੰਗੋਲੀਆਈ"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "ਡੱਚ"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "ਨਾਰਵੇਗੀਆਈ"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "ਨਾਰਵੇਗੀਆਈ ਬੋਕਮਾਲ"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "ਨਾਰਵੇਗੀਅਨ ਨਯਨੋਰਸਕ"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "ਪੰਜਾਬੀ"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "ਪੋਲੈਂਡੀ"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "ਪੁਰਤਗਾਲੀ"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "ਬਰਾਜ਼ੀਲੀ ਪੁਰਤਗਾਲੀ"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "ਰੋਮਾਨੀਆਈ"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "ਰੂਸੀ"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "ਸਲੋਵਾਕ"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "ਸਲੋਵੀਨੀਆਈ"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "ਅਲਬੀਨੀਆਈ"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "ਸਰਬੀਆਈ"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "ਸਰਬੀਆਈ ਲੈਟਿਨ"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "ਸਵੀਡਨੀ"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "ਤਾਮਿਲ"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "ਤੇਲਗੂ"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "ਥਾਈ"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "ਤੁਰਕ"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ਯੂਕਰੇਨੀ"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "ਵੀਅਤਨਾਮੀ"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "ਸਧਾਰਨ ਚੀਨੀ"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "ਮੂਲ ਚੀਨੀ"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "ਠੀਕ ਮੁੱਲ ਦਿਓ"
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "ਠੀਕ URL ਦਿਉ।"
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr ""
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "ਠੀਕ URL ਦਿਉ।"
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "ਠੀਕ ਈਮੇਲ ਐਡਰੈੱਸ ਦਿਓ ਜੀ।"
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr ""
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr ""
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "ਅਤੇ"
@@ -416,7 +426,7 @@ msgid "E-mail address"
msgstr "ਈਮੇਲ ਐਡਰੈੱਸ"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "ਫਾਇਲ ਪਾਥ"
@@ -464,24 +474,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML ਟੈਕਸਟ"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -558,60 +568,60 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "ਮੁੱਲ ਦੀ ਲਿਸਟ ਦਿਓ।"
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "ਲੜੀ"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "ਹਟਾਓ"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
msgid "Currently"
-msgstr ""
+msgstr "ਮੌਜੂਦਾ"
#: forms/widgets.py:300
msgid "Change"
@@ -619,55 +629,55 @@ msgstr "ਬਦਲੋ"
#: forms/widgets.py:301
msgid "Clear"
-msgstr ""
+msgstr "ਸਾਫ਼ ਕਰੋ"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "ਅਣਜਾਣ"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "ਹਾਂ"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "ਨਹੀਂ"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
-msgstr ""
+msgstr "ਹਾਂ,ਨਹੀਂ,ਸ਼ਾਇਦ"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d ਬਾਈਟ"
msgstr[1] "%(size)d ਬਾਈਟ"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
-msgstr "%s TB"
+msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
-msgstr "%s PB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -848,22 +858,22 @@ msgstr "ਦਸੰ"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "ਜਨ."
+msgstr "ਜਨ"
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "ਫਰ."
+msgstr "ਫਰ"
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "ਮਾਰਚ"
+msgstr "ਮਾਰ"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "ਅਪਰੈਲ"
+msgstr "ਅਪ"
#: utils/dates.py:35
msgctxt "abbrev. month"
@@ -878,101 +888,89 @@ msgstr "ਜੂਨ"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "ਜੁਲਾਈ"
+msgstr "ਜੁਲ"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "ਅਗ."
+msgstr "ਅਗ"
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "ਸਤੰ."
+msgstr "ਸਤੰ"
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "ਅਕ."
+msgstr "ਅਕਤੂ"
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "ਨਵੰ."
+msgstr "ਨਵੰ"
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "ਦਸੰ."
+msgstr "ਦਸੰ"
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "ਜਨਵਰੀ"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "ਫਰਵਰੀ"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "ਮਾਰਚ"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "ਅਪਰੈਲ"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "ਮਈ"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "ਜੂਨ"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "ਜੁਲਾਈ"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "ਅਗਸਤ"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "ਸਤੰਬਰ"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "ਅਕਤੂਬਰ"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "ਨਵੰਬਰ"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "ਦਸੰਬਰ"
@@ -984,7 +982,7 @@ msgstr "ਜਾਂ"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ","
#: utils/timesince.py:21
msgid "year"
@@ -1036,23 +1034,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "N j, Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "N j, Y, P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
@@ -1070,3 +1068,55 @@ msgstr "%(verbose_name)s ਠੀਕ ਤਰ੍ਹਾਂ ਅੱਪਡੇਟ ਕੀ
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s ਹਟਾਇਆ ਗਿਆ।"
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s ਹਟਾਇਆ ਗਿਆ।"
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s ਠੀਕ ਤਰ੍ਹਾਂ ਅੱਪਡੇਟ ਕੀਤਾ ਗਿਆ।"
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/pl/LC_MESSAGES/django.mo b/django/conf/locale/pl/LC_MESSAGES/django.mo
index f4e68d680b..f7f9924daa 100644
--- a/django/conf/locale/pl/LC_MESSAGES/django.mo
+++ b/django/conf/locale/pl/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/pl/LC_MESSAGES/django.po b/django/conf/locale/pl/LC_MESSAGES/django.po
index 15295fcca3..9714db60a0 100644
--- a/django/conf/locale/pl/LC_MESSAGES/django.po
+++ b/django/conf/locale/pl/LC_MESSAGES/django.po
@@ -1,20 +1,19 @@
-# translation of django.po to Polish
-# Polish .po file.
-# This file is distributed under the same license as the django package.
+# This file is distributed under the same license as the Django package.
+#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:00+0100\n"
-"PO-Revision-Date: 2008-02-25 15:53+0100\n"
-"Last-Translator: Jarek Zgoda <jarek.zgoda@gmail.com>\n"
-"Language-Team: PL <pl@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:36+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: lrekucki <lrekucki@gmail.com>\n"
+"Language-Team: Polish <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -73,246 +72,255 @@ msgid "Argentinian Spanish"
msgstr "hiszpański argentyński"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "hiszpański argentyński"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "estoński"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "baskijski"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "perski"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "fiński"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "francuski"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "fryzyjski"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "irlandzki"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "galicyjski"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "hebrajski"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "chorwacki"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "węgierski"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "indonezyjski"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islandzki"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "włoski"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "japoński"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "gruziński"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "khmerski"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "koreański"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "litewski"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "łotewski"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "macedoński"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr "malajski"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "mongolski"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "holenderski"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "norweski"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "norweski (Bokmal)"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "norweski (Nynorsk)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr "pendżabski"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "polski"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "portugalski"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "brazylijski portugalski"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "rumuński"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "rosyjski"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "słowacki"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "słoweński"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "albański"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "serbski"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "serbski (łaciński)"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "szwedzki"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "tamilski"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "tajski"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "turecki"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ukraiński"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "wietnamski"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "chiński uproszczony"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "chiński tradycyjny"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Wpisz poprawną wartość."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Wpisz poprawny URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Ten odnośnik jest nieprawidłowy."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Wpisz poprawny URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Wprowadź poprawny adres e-mail."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "To pole może zawierać jedynie litery, cyfry, podkreślenia i myślniki."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Wprowadź poprawny adres IPv4."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Wpisz tylko cyfry oddzielone przecinkami."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Upewnij się, że ta wartość jest %(limit_value)s (jest %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Upewnij się, że ta wartość jest mniejsza lub równa %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Upewnij się, że ta wartość jest większa lub równa %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -321,7 +329,7 @@ msgstr ""
"Upewnij się, że ta wartość ma co najmniej %(limit_value)d znaków (ma długość "
"%(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -330,19 +338,19 @@ msgstr ""
"Upewnij się, że ta wartość ma co najwyżej %(limit_value)d znaków (ma długość "
"%(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"Wartości w %(field_name)s muszą być unikalne dla wyszukiwań %(lookup)s w %"
"(date_field)s"
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(field_label)s już istnieje w %(model_name)s."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "i"
@@ -427,7 +435,7 @@ msgid "E-mail address"
msgstr "Adres e-mail"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Ścieżka do pliku"
@@ -476,24 +484,24 @@ msgstr "URL"
msgid "XML text"
msgstr "Tekst XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Model %(model)s o kluczu głównym %(pk)r nie istnieje."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Klucz obcy (typ określony przez pole powiązane)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Powiązanie jeden do jednego"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Powiązanie wiele do wiele"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -577,29 +585,29 @@ msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"Wybierz poprawną wartość. %(value)s nie jest jednym z dostępnych wyborów."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Podaj listę wartości."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Porządek"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Usuń"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Popraw zduplikowane dane w %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Popraw zduplikowane dane w %(field)s, które wymaga unikalności."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -608,24 +616,24 @@ msgstr ""
"Popraw zduplikowane dane w %(field_name)s, które wymaga unikalności dla %"
"(lookup)s w polu %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Popraw poniższe zduplikowane wartości."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Osadzony klucz obcy nie pasuje do klucza głównego obiektu rodzica."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Wybierz poprawną wartość. Podana nie jest jednym z dostępnych wyborów."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Wybierz poprawną wartość. %s nie jest jednym z dostępnych wyborów."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" nie jest poprawną wartością klucza głównego."
@@ -642,23 +650,23 @@ msgstr "Zmień"
msgid "Clear"
msgstr "Wyczyść"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Nieznany"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Tak"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nie"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "tak,nie,może"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -666,27 +674,27 @@ msgstr[0] "%(size)d bajt"
msgstr[1] "%(size)d bajty"
msgstr[2] "%(size)d bajtów"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
msgstr "%s TB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
msgstr "%s PB"
@@ -761,7 +769,7 @@ msgstr "Czw"
#: utils/dates.py:10
msgid "Fri"
-msgstr "Pi"
+msgstr "Pt"
#: utils/dates.py:11
msgid "Sat"
@@ -870,22 +878,22 @@ msgstr "gru"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Sty."
+msgstr "Sty"
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Lut."
+msgstr "Lut"
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "Marzec"
+msgstr "Mar"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Kwiecień"
+msgstr "Kwi"
#: utils/dates.py:35
msgctxt "abbrev. month"
@@ -895,37 +903,37 @@ msgstr "Maj"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Czerwiec"
+msgstr "Cze"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Lipiec"
+msgstr "Lip"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Sier."
+msgstr "Sie"
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Wrz."
+msgstr "Wrz"
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Paź."
+msgstr "Paź"
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Lis."
+msgstr "Lis"
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Gru."
+msgstr "Gru"
#: utils/dates.py:45
msgctxt "alt. month"
@@ -1052,23 +1060,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "Y-m-d"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "Y-m-d H:i:s"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i:s"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "Y-m"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "m-d"
@@ -1086,3 +1094,55 @@ msgstr "%(verbose_name)s zostało pomyślnie zmienione."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s zostało usunięte."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s zostało usunięte."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s zostało pomyślnie zmienione."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/pt/LC_MESSAGES/django.mo b/django/conf/locale/pt/LC_MESSAGES/django.mo
index e996b97db7..864cc645d6 100644
--- a/django/conf/locale/pt/LC_MESSAGES/django.mo
+++ b/django/conf/locale/pt/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/pt/LC_MESSAGES/django.po b/django/conf/locale/pt/LC_MESSAGES/django.po
index 1940315d22..a632c467dc 100644
--- a/django/conf/locale/pt/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt/LC_MESSAGES/django.po
@@ -1,18 +1,18 @@
-# Portuguese translation of Django.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:00+0100\n"
-"PO-Revision-Date: 2010-03-09 10:45+0000\n"
-"Last-Translator: Nuno Mariz <nmariz@gmail.com>\n"
-"Language-Team: pt_PT <nmariz@gmail.com>\n"
+"POT-Creation-Date: 2011-02-28 17:37+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: Portuguese <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: pt\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -67,254 +67,260 @@ msgid "Spanish"
msgstr "Espanhol"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Espanhol Argentino"
+msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Espanhol"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estónio"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Basco"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Persa"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Filandês"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Francês"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Frisão"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irlandês"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galaciano"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebraico"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Croata"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Húngaro"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Macedónio"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandês"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japonês"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Georgiano"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Canarês"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Coreano"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Lituano"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Letão"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Macedónio"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Macedónio"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Holandês"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norueguês"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Norueguês (Bokmål)"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Norueguês (Nynors)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Polaco"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Português"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Português Brasileiro"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Romeno"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Russo"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Eslovaco"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Esloveno"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Albanês"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Sérvio"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Sérvio Latim"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Sueco"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Thai"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Turco"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ucraniano"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vietnamita"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Chinês Simplificado"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Chinês Tradicional"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Introduza um valor válido."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Introduza um URL válido."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Este URL é link quebrado."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Introduza um URL válido."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Introduza um endereço de e-mail válido."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Este valor apenas poderá conter letras, números, undercores ou hífenes."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Introduza um endereço IPv4 válido."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Introduza apenas números separados por vírgulas."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Garanta que este valor seja %(limit_value)s (tem %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Garanta que este valor seja menor ou igual a %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Garanta que este valor seja maior ou igual a %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -323,7 +329,7 @@ msgstr ""
"Garanta que este valor tem no mínimo %(limit_value)d caracteres (tem %"
"(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -332,17 +338,17 @@ msgstr ""
"Garanta que este valor tem no máximo %(limit_value)d caracteres (tem %"
"(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s deverá ser único para %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s com este %(field_label)s já existe."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "e"
@@ -426,7 +432,7 @@ msgid "E-mail address"
msgstr "Endereço de e-mail"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Caminho do ficheiro"
@@ -474,24 +480,24 @@ msgstr "URL"
msgid "XML text"
msgstr "Texto XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "O modelo %(model)s com a chave primária %(pk)r não existe."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Chave Estrangeira (tipo determinado pelo campo relacionado)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Relação de um-para-um"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Relação de muitos-para-muitos"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -577,30 +583,30 @@ msgstr ""
"Seleccione uma opção válida. %(value)s não se encontra nas opções "
"disponíveis."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Introduza uma lista de valores."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Ordem"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Remover"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Por favor corrija os dados duplicados em %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Por favor corrija os dados duplicados em %(field)s, que deverá ser único."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -609,90 +615,88 @@ msgstr ""
"Por favor corrija os dados duplicados em %(field_name)s que deverá ser único "
"para o %(lookup)s em %(date_field)s.\""
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Por favor corrija os valores duplicados abaixo."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"A chave estrangeira em linha não coincide com a chave primária na instância "
"pai."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Seleccione uma opção válida. Esse valor não se encontra opções disponíveis."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
"Seleccione uma opção válida. %s não se encontra nas opções disponíveis."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" não é um valor válido para uma chave primária."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Actualmente:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Modificar"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "ano"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Desconhecido"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Sim"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Não"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "sim,não,talvez"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
msgstr ""
@@ -876,134 +880,122 @@ msgstr "dez"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Jan."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Fev."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "Março"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Abril"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "Maio"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Junho"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Julho"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Ago."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Set."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Out."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Nov."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Dez."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "Janeiro"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "Fevereiro"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "Março"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "Abril"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "Maio"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "Junho"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "Julho"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "Agosto"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "Setembro"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "Outubro"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "Novembro"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "Dezembro"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1064,23 +1056,23 @@ msgstr ""
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "N j, Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "N j, Y, P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
@@ -1098,3 +1090,55 @@ msgstr "O(A) %(verbose_name)s foi actualizado(a) com sucesso."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "O(A) %(verbose_name)s foi removido(a)."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "O(A) %(verbose_name)s foi removido(a)."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "O(A) %(verbose_name)s foi actualizado(a) com sucesso."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
index 6ceb318a94..cb19bdcd05 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/pt_BR/LC_MESSAGES/django.po b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
index 4a1ed3500b..1ae5620e7c 100644
--- a/django/conf/locale/pt_BR/LC_MESSAGES/django.po
+++ b/django/conf/locale/pt_BR/LC_MESSAGES/django.po
@@ -1,19 +1,19 @@
-# Português do Brasil translation of django.
-# This file is distributed under the same license as the django package.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:00+0100\n"
-"PO-Revision-Date: 2010-03-19 17:58-0300\n"
-"Last-Translator: Guilherme Gondim <semente@taurinus.org>\n"
-"Language-Team: Grupo de Localização para o Português <django-l10n-"
-"portuguese@googlegroups.com>\n"
+"POT-Creation-Date: 2011-02-28 17:37+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: eduardocereto <eduardocereto@gmail.com>\n"
+"Language-Team: Portuguese (Brazilian) <django-l10n-portuguese@googlegroups."
+"com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -60,267 +60,269 @@ msgid "English"
msgstr "Inglês"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Inglês"
+msgstr "Inglês Britânico"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Espanhol"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "Espanhol Argentino"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Espanhol Argentino"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estoniano"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Basco"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Persa"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finlandês"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Francês"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Frísia"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irlandês"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galiciano"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebraico"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Croata"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Húngaro"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Macedônio"
+msgstr "Indonésio"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandês"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italiano"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japonês"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Georgiano"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Canarês"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Coreano"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Lituano"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Letão"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Macedônio"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Málaga"
+msgstr "Malaiala"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Monaghan"
+msgstr "Mongol"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Neerlandês"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norueguês"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Norueguês"
+msgstr "Dano-norueguês"
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Norueguês"
+msgstr "Novo Norueguês"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Punjabi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Polonês"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Português"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Português Brasileiro"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Romeno"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Russo"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Eslovaco"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Esloveno"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Albanesa"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Sérvio"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Sérvio Latino"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Sueco"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tâmil"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Tailandês"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Turco"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ucraniano"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vietnamita"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Chinês Simplificado"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Chinês Tradicional"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Informe um valor válido."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Informe uma URL válida."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "A URL %s aparenta ser um link quebrado."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Informe uma URL válida."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Informe um endereço de email válido."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Insira um \"slug\" válido consistindo de letras, números, sublinhados (_) ou "
"hífens."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Informe um endereço IPv4 válido."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Informe apenas dígitos separados por vírgulas."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Certifique-se de que o valor é %(limit_value)s (ele é %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Certifique-se que este valor seja menor ou igual a %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Certifique-se que este valor seja maior ou igual a %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -329,7 +331,7 @@ msgstr ""
"Certifique-se de que o valor tenha no mínimo %(limit_value)d caracteres (ele "
"possui %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -338,17 +340,17 @@ msgstr ""
"Certifique-se de que o valor tenha no máximo %(limit_value)d caracteres (ele "
"possui %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s deverá ser único para %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s com este %(field_label)s já existe."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "e"
@@ -432,7 +434,7 @@ msgid "E-mail address"
msgstr "Endereço de e-mail"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Caminho de arquivo"
@@ -480,24 +482,24 @@ msgstr "URL"
msgid "XML text"
msgstr "Texto XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Model %(model)s com chave primária %(pk)r não existe."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Chave Estrangeira (tipo determinado pelo campo relacionado)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Relacionamento um-para-um"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Relacionamento muitos-para-muitos"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -566,7 +568,7 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "Por favor, envie um arquivo ou marque o checkbox, mas não ambos."
#: forms/fields.py:518
msgid ""
@@ -581,30 +583,30 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Faça uma escolha válida. %(value)s não está disponível."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Informe uma lista de valores."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Ordem"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Apagar"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Por favor, corrija o valor duplicado para %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Por favor, corrija o valor duplicado para %(field)s, o qual deve ser único"
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -613,91 +615,89 @@ msgstr ""
"Por favor corrija os dados duplicados em %(field_name)s que deverá ser único "
"para o %(lookup)s em %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Por favor, corrija os valores duplicados abaixo."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"A chave estrangeira no inline não coincide com a chave primária na instância "
"pai."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Faça uma escolha válida. Sua escolha não é uma das disponíveis."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Faça uma escolha válida. %s não está disponível."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" não é um valor válido para uma chave primária."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Atualmente:"
+msgstr "Atualmente"
#: forms/widgets.py:300
msgid "Change"
msgstr "Modificar"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr "Limpar"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Desconhecido"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Sim"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Não"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "sim,não,talvez"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -936,73 +936,61 @@ msgid "Dec."
msgstr "Dez."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "Janeiro"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "Fevereiro"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "Março"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "Abril"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "Maio"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "Junho"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "Julho"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "Agosto"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "Setembro"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "Outubro"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "Novembro"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "Dezembro"
@@ -1014,7 +1002,7 @@ msgstr "ou"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1066,23 +1054,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j \\de N \\de Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j \\de N \\de Y à\\s H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F \\de Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j \\de F"
@@ -1100,3 +1088,55 @@ msgstr "%(verbose_name)s: atualizado com sucesso."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s: excluído."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s: excluído."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s: atualizado com sucesso."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.mo b/django/conf/locale/ro/LC_MESSAGES/django.mo
index e12c81d2d2..33df91c538 100644
--- a/django/conf/locale/ro/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ro/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ro/LC_MESSAGES/django.po b/django/conf/locale/ro/LC_MESSAGES/django.po
index 0a8c12f343..94bd77643a 100644
--- a/django/conf/locale/ro/LC_MESSAGES/django.po
+++ b/django/conf/locale/ro/LC_MESSAGES/django.po
@@ -1,19 +1,19 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:01+0100\n"
-"PO-Revision-Date: 2008-04-25 21:44+0200\n"
-"Last-Translator: \n"
-"Language-Team: Romanian <ro@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:37+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: Romanian <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: ro\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -28,9 +28,8 @@ msgid "Bengali"
msgstr "Bengaleză"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "Română"
+msgstr ""
#: conf/global_settings.py:48
msgid "Catalan"
@@ -61,307 +60,291 @@ msgid "English"
msgstr "Engleză"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Engleză"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Spaniolă"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Spaniolă argentiniană"
+msgstr ""
#: conf/global_settings.py:58
#, fuzzy
-msgid "Estonian"
-msgstr "Română"
+msgid "Mexican Spanish"
+msgstr "Spaniolă"
#: conf/global_settings.py:59
+msgid "Estonian"
+msgstr ""
+
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Bască"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Persană"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finlandeză"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Franceză"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "Frizia"
+msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irlandeză"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galiciană"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Ebraică"
-#: conf/global_settings.py:67
-#, fuzzy
+#: conf/global_settings.py:68
msgid "Hindi"
-msgstr "Highland"
+msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Croată"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Ungară"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Macedoneană"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandeză"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italiană"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japoneză"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Georgiană"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmeră"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Limba kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Koreană"
-#: conf/global_settings.py:78
-#, fuzzy
+#: conf/global_settings.py:79
msgid "Lithuanian"
-msgstr "Lothian"
+msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Letonă"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Macedoneană"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Malaga"
+msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Macedoneană"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Olandeză"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norvegiană"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Norvegiană"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Norvegiană"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Poloneză"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
-msgstr "Portugheză"
+msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Portugheză braziliană"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Română"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Rusă"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slovacă"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slovenă"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Alacant"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Sârbă"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "Sârbă"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Suedeză"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Limba tamila"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Limba telugu"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "Limba tamila"
+msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Turcă"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ucraineană"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "Prenume"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Chineză simplificată"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Chineză tradițională"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Introduceți o valoare validă."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Introduceți un URL valid."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "URL-ul e invalid."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Introduceți un URL valid."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Introduceţi o adresă de email validă."
-#: core/validators.py:123 forms/fields.py:958
-#, fuzzy
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-"Această valoare trebuie să conţină numai litere, numere, liniuţe de "
-"subliniere şi liniute."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Introduceţi o adresă IPv4 validă."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Introduceţi numai numere separate de virgule."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Asigurați-vă că această valoare are cel puțin %(min)d caractere (are %"
-"(length)d)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Asigurați-vă că această valoare este mai mică sau egală cu %s."
+msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Asigurați-vă că aceasta valoare este mai mare sau egală cu %s."
+msgstr ""
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Asigurați-vă că această valoare are cel puțin %(min)d caractere (are %"
-"(length)d)."
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Asigurați-vă că această valoare are cel mult %(max)d caractere (are %(length)"
-"d)."
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "Acest câmp e necesar dacă %(field)s este %(value)s"
+msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
-#, fuzzy, python-format
+#: db/models/base.py:784 db/models/base.py:792
+#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(optname)s cu acest %(fieldname)s există deja."
+msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "și"
@@ -375,9 +358,8 @@ msgid "This field cannot be null."
msgstr "Câmpul nu poate fi gol"
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Câmpul nu poate fi gol"
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -425,9 +407,8 @@ msgid "Invalid date: %s"
msgstr "Data invalida: %s"
#: db/models/fields/__init__.py:670
-#, fuzzy
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "Introduceţi o dată/oră validă în format AAAA-LL-ZZ OO:MM."
+msgstr ""
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
@@ -446,14 +427,13 @@ msgid "E-mail address"
msgstr "Adresa email"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Calea fisierului"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "Această valoare trebuie să fie cel puțin %s."
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -484,9 +464,8 @@ msgid "Time"
msgstr "Timp"
#: db/models/fields/__init__.py:1044
-#, fuzzy
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "Introduceţi o oră în format OO:MM."
+msgstr ""
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -496,24 +475,24 @@ msgstr "URL"
msgid "XML text"
msgstr "Text XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -572,12 +551,10 @@ msgid "The submitted file is empty."
msgstr "Fișierul uploadat este gol"
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Asigurați-vă că această valoare are cel mult %(max)d caractere (are %(length)"
-"d)."
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
@@ -598,123 +575,120 @@ msgstr ""
"Selectați o opțiune validă. %(value)s nu face parte din opțiunile "
"disponibile."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Introduceți o listă de valori."
-#: forms/formsets.py:308 forms/formsets.py:310
-#, fuzzy
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr "Ordonare:"
+msgstr ""
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Șterge"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Vă rugăm să corectați eroarea de mai jos"
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "Vă rugăm să corectați eroarea de mai jos"
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Selectați o opțiune validă. Această opțiune nu face parte din opțiunile "
"disponibile."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
"Selectați o opțiune validă. %s nu face parte din opțiunile disponibile."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Current:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Schimbă"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "an"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Necunoscut"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Da"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nu"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "da,nu,poate"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] "%(size)d byte"
-msgstr[1] "%(size)d bytes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -895,134 +869,122 @@ msgstr "dec"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Ian."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Feb."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "Martie"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Aprilie"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "Mai"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Iunie"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Iulie"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Aug."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Sept."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Oct"
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Noi."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Dec."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "Ianuarie"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "Februarie"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "Martie"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "Aprilie"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "Mai"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "Iunie"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "Iulie"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "August"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "Septembrie"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "Octombrie"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "Noiembrie"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "Decembrie"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1036,38 +998,44 @@ msgstr ""
#: utils/timesince.py:21
msgid "year"
msgid_plural "years"
-msgstr[0] "an"
-msgstr[1] "ani"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: utils/timesince.py:22
msgid "month"
msgid_plural "months"
-msgstr[0] "lună"
-msgstr[1] "luni"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: utils/timesince.py:23
msgid "week"
msgid_plural "weeks"
-msgstr[0] "săptămână"
-msgstr[1] "săptămâni"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: utils/timesince.py:24
msgid "day"
msgid_plural "days"
-msgstr[0] "zi"
-msgstr[1] "zile"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: utils/timesince.py:25
msgid "hour"
msgid_plural "hours"
-msgstr[0] "oră"
-msgstr[1] "ore"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: utils/timesince.py:26
msgid "minute"
msgid_plural "minutes"
-msgstr[0] "minut"
-msgstr[1] "minute"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: utils/timesince.py:45
msgid "minutes"
@@ -1083,23 +1051,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j N Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j N Y, H:i:s"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i:s"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
@@ -1117,3 +1085,55 @@ msgstr "%(verbose_name)s a fost actualizat cu succes."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s a fost șters."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s a fost șters."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s a fost actualizat cu succes."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.mo b/django/conf/locale/ru/LC_MESSAGES/django.mo
index 527c68d02b..67e119ee0f 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ru/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ru/LC_MESSAGES/django.po b/django/conf/locale/ru/LC_MESSAGES/django.po
index 886ee633ea..5d876ede80 100644
--- a/django/conf/locale/ru/LC_MESSAGES/django.po
+++ b/django/conf/locale/ru/LC_MESSAGES/django.po
@@ -1,21 +1,19 @@
-# Translation of django.po to russian.
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:01+0100\n"
-"PO-Revision-Date: 2010-05-11 17:36+0300\n"
-"Last-Translator: alexey boriskin <sun.void@gmail.com>\n"
-"Language-Team: Russian\n"
+"POT-Creation-Date: 2011-02-28 17:37+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Dimmus <dmitri.chudinov@gmail.com>\n"
+"Language-Team: Russian <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIAN FEDERATION\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -70,255 +68,262 @@ msgid "Spanish"
msgstr "Испанский"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "Аргентинский испанский"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Аргентинский испанский"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Эстонский"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Баскский"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Персидский"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Финский"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Французский"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Фризский"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Ирландский"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Галисийский"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Иврит"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Хинди"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Хорватский"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Венгерский"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "Индонезийский"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Исландский"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Итальянский"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Японский"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Грузинский"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Кхмерский"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Каннада"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Корейский"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Литовский"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Латвийский"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Македонский"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Малага"
+msgstr "Малаялам"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "Монгольский"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Голландский"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Норвежский"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Норвежский (Букмол)"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Норвежский (Нюнорск)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Панджаби"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Польский"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Португальский"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Бразильский португальский"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Румынский"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Русский"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Словацкий"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Словенский"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Албанский"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Сербский"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Сербский (латиница)"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Шведский"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Тамильский"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Телугу"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Тайский"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Турецкий"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Украинский"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Вьетнамский"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Упрощенный китайский"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Традиционный китайский"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Введите правильное значение."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Введите правильный URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Эта ссылка не работает."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Введите правильный URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Введите правильный адрес электронной почты."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Значение должно состоять только из букв, цифр, знаков подчеркивания или "
"дефиса."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Введите правильный IPv4 адрес."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Введите цифры, разделенные запятыми."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Убедитесь, что это значение — %(limit_value)s (сейчас оно — %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Убедитесь, что это значение меньше либо равно %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Убедитесь, что это значение больше либо равно %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -327,7 +332,7 @@ msgstr ""
"Убедитесь, что это значение содержит не менее %(limit_value)d символов "
"(сейчас %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -336,19 +341,19 @@ msgstr ""
"Убедитесь, что это значение содержит не более %(limit_value)d символов "
"(сейчас %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"Значение в поле %(field_name)s должно быть уникальным для %(lookup)s в поле %"
"(date_field)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s с таким %(field_label)s уже существует."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "и"
@@ -432,7 +437,7 @@ msgid "E-mail address"
msgstr "Адрес электронной почты"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Путь к файлу"
@@ -480,24 +485,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML текст"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Объект модели %(model)s с первичным ключом %(pk)r не существует."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Внешний ключ (тип определен по связанному полю)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Связь \"один к одному\""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Связь \"многие ко многим\""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -566,6 +571,8 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Пожалуйста, либо предоставьте файл или поставьте флажок на пункте очистить, "
+"но не оба."
#: forms/fields.py:518
msgid ""
@@ -580,30 +587,30 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Выберите корректный вариант. %(value)s нет среди допустимых значений."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Введите список значений."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Порядок"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Удалить"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Пожалуйста, измените повторяющееся значение в поле %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Пожалуйста, измените значение в поле %(field)s, оно должно быть уникальным."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -612,91 +619,90 @@ msgstr ""
"Пожалуйста, измените значение в поле %(field_name)s, оно должно быть "
"уникальным для %(lookup)s в поле %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Пожалуйста, измените повторяющиеся значения ниже."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Внешний ключ не совпадает с первичным ключом родителя."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Выберите корректный вариант. Вашего варианта нет среди допустимых значений."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Выберите корректный вариант. %s нет среди допустимых значений."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" не является верным значением для первичного ключа."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Текущий файл:"
+msgstr "В настоящее время"
#: forms/widgets.py:300
msgid "Change"
msgstr "Изменить"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Клэр"
+msgstr "Очистить"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Неизвестно"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Да"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Нет"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "да,нет,может быть"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d байт"
-msgstr[1] "%(size)d байта"
-msgstr[2] "%(size)d байт"
+msgstr[1] "%(size)d байт(а)"
+msgstr[2] "%(size)d байт(а)"
+msgstr[3] "%(size)d байт(а)"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s КБ"
+msgstr "%s KБ"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s МБ"
+msgstr "%s MБ"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s ГБ"
+msgstr "%s GБ"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s КБ"
+msgstr "%s TБ"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s КБ"
+msgstr "%s PБ"
#: utils/dateformat.py:42
msgid "p.m."
@@ -927,7 +933,7 @@ msgstr "Окт."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Нояб."
+msgstr "Ноя."
#: utils/dates.py:42
msgctxt "abbrev. month"
@@ -1001,49 +1007,55 @@ msgstr "или"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ","
#: utils/timesince.py:21
msgid "year"
msgid_plural "years"
msgstr[0] "год"
-msgstr[1] "года"
+msgstr[1] "лет"
msgstr[2] "лет"
+msgstr[3] "лет"
#: utils/timesince.py:22
msgid "month"
msgid_plural "months"
msgstr[0] "месяц"
-msgstr[1] "месяца"
+msgstr[1] "месяцев"
msgstr[2] "месяцев"
+msgstr[3] "месяцев"
#: utils/timesince.py:23
msgid "week"
msgid_plural "weeks"
msgstr[0] "неделя"
-msgstr[1] "недели"
+msgstr[1] "недель"
msgstr[2] "недель"
+msgstr[3] "недель"
#: utils/timesince.py:24
msgid "day"
msgid_plural "days"
msgstr[0] "день"
-msgstr[1] "дня"
+msgstr[1] "дней"
msgstr[2] "дней"
+msgstr[3] "дней"
#: utils/timesince.py:25
msgid "hour"
msgid_plural "hours"
msgstr[0] "час"
-msgstr[1] "часа"
+msgstr[1] "часов"
msgstr[2] "часов"
+msgstr[3] "часов"
#: utils/timesince.py:26
msgid "minute"
msgid_plural "minutes"
msgstr[0] "минута"
-msgstr[1] "минуты"
+msgstr[1] "минут"
msgstr[2] "минут"
+msgstr[3] "минут"
#: utils/timesince.py:45
msgid "minutes"
@@ -1059,23 +1071,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "d.m.Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "d.m.Y H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
@@ -1093,3 +1105,55 @@ msgstr "%(verbose_name)s был успешно изменен."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s был успешно удален."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s был успешно удален."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s был успешно изменен."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.mo b/django/conf/locale/sk/LC_MESSAGES/django.mo
index af2b70ede5..67d779ffd5 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sk/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/sk/LC_MESSAGES/django.po b/django/conf/locale/sk/LC_MESSAGES/django.po
index 502a9015a4..d2ef73fbda 100644
--- a/django/conf/locale/sk/LC_MESSAGES/django.po
+++ b/django/conf/locale/sk/LC_MESSAGES/django.po
@@ -1,18 +1,18 @@
-# Slovak translation of Django
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:01+0100\n"
-"PO-Revision-Date: 2010-05-08 16:32+0200\n"
-"Last-Translator: Martin Kosír <martin@martinkosir.net>\n"
-"Language-Team: Slovak <>\n"
+"POT-Creation-Date: 2011-02-28 17:37+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: andrem <marian@andre.sk>\n"
+"Language-Team: Slovak <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n>1 && n<5 ? 1 : 2;\n"
+"Language: sk\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -67,255 +67,261 @@ msgid "Spanish"
msgstr "španielsky"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "argentínska španielčina"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "argentínska španielčina"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "estónsky"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "baskický"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "perzský"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "fínsky"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "francúzsky"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "frízsky"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "írsky"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "galícijský"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "hebrejský"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "hindský"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "chorvátsky"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "maďarský"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "macedónsky"
+msgstr "indonézsky"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islandský"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "taliansky"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "japonský"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "gruzínsky"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "kmérsky"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "kanadský"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "kórejský"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "litovský"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "lotyšský"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "macedónsky"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Malaga"
+msgstr "malajalámsky"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "mongolský"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "holandský"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "nórsky"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "nórsky (Bokmal)"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "nórsky (Nynorsk)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "pandžábsky"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "poľský"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "portugalský"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "portugalský (Brazília)"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "rumunský"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "ruský"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "slovenský"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "slovinský"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "albánsky"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "srbský"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "srbský (Latin)"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "švédsky"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "tamilský"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telúgsky"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "thajský"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "turecký"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ukrajinský"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "vietnamský"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "čínsky (zjednodušene)"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "čínsky (tradične)"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Zadajte platnú hodnotu."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Zadajte platnú URL adresu."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Toto URL je chybný odkaz."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Zadajte platnú URL adresu."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Zadajte platnú e-mailovú adresu."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Zadajte platný 'slug' pozostávajúci z písmen, čísel, podčiarkovníkov alebo "
"pomlčiek."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Zadajte platnú IPv4 adresu."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Zadajte len číslice oddelené čiarkami."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Uistite sa, že táto hodnota je %(limit_value)s (je to %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Uistite sa, že táto hodnota je menšia alebo rovná %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Uistite sa, že hodnota je väčšia alebo rovná %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -324,7 +330,7 @@ msgstr ""
"Uistite sa, že zadaná hodnota má najmenej %(limit_value)d znakov (má %"
"(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -333,17 +339,17 @@ msgstr ""
"Uistite sa, že táto hodnota má najviac %(limit_value)d znakov (má %"
"(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s musí byť unikátne pre %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s s týmto %(field_label)s už existuje."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "a"
@@ -426,7 +432,7 @@ msgid "E-mail address"
msgstr "E-mail adresa"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Cesta k súboru"
@@ -474,24 +480,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML text"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Model %(model)s s primárnym kľúčom %(pk)r neexistuje."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Cudzí kľúč (typ určuje pole v relácii)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Typ relácie: jedna k jednej"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Typ relácie: M ku N"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -559,6 +565,8 @@ msgstr "Uistite sa, že názov súboru má najviac %(max)d znakov (má %(length)
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Odošlite prosím súbor alebo zaškrtnite políčko pre vymazanie vstupného poľa, "
+"nie oboje."
#: forms/fields.py:518
msgid ""
@@ -573,29 +581,29 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Vyberte platnú voľbu. %(value)s nepatrí medzi dostupné možnosti."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Vložte zoznam hodnôt."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Poradie"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Odstrániť"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Prosím, opravte duplicitné dáta pre %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "Dáta pre %(field)s musia byť unikátne, prosím, opravte duplikáty."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -604,61 +612,59 @@ msgstr ""
"Dáta pre %(field_name)s musia byť unikátne pre %(lookup)s v %(date_field)s, "
"prosím, opravte duplikáty."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Prosím, opravte nižšie uvedené duplicitné hodnoty. "
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Vnorený cudzí kľúč sa nezhoduje s nadradenou inštanciou primárnho kľúča."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Vyberte platnú možnosť. Vybraná položka nepatrí medzi dostupné možnosti."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Vyberte platnú možnost. %s nepatrí medzi dostupné možnosti."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" nie je platná hodnota pre primárny kľúč."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Aktuálne:"
+msgstr "Súčasne"
#: forms/widgets.py:300
msgid "Change"
msgstr "Zmeniť"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr "Vymazať"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Neznámy"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Áno"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nie"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "áno,nie,možno"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -666,30 +672,30 @@ msgstr[0] "%(size)d bajt"
msgstr[1] "%(size)d bajty"
msgstr[2] "%(size)d bajtov"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -880,12 +886,12 @@ msgstr "feb."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "marec"
+msgstr "mar."
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "apríl"
+msgstr "apr."
#: utils/dates.py:35
msgctxt "abbrev. month"
@@ -910,7 +916,7 @@ msgstr "aug."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "sept."
+msgstr "sep."
#: utils/dates.py:40
msgctxt "abbrev. month"
@@ -928,73 +934,61 @@ msgid "Dec."
msgstr "dec."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "január"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "február"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "marec"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "apríl"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "máj"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "jún"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "júl"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "august"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "september"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "október"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "november"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "december"
@@ -1006,7 +1000,7 @@ msgstr "alebo"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1064,23 +1058,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j. F Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. F Y G:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "G:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1098,3 +1092,55 @@ msgstr "Objekt %(verbose_name)s bol úspešne zmenený."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "Objekt %(verbose_name)s bol zmazaný."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Objekt %(verbose_name)s bol zmazaný."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Objekt %(verbose_name)s bol úspešne zmenený."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/sl/LC_MESSAGES/django.mo b/django/conf/locale/sl/LC_MESSAGES/django.mo
index 046386773a..f2eecd25f0 100644
--- a/django/conf/locale/sl/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sl/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/sl/LC_MESSAGES/django.po b/django/conf/locale/sl/LC_MESSAGES/django.po
index 2a3ce10894..fb64d7f511 100644
--- a/django/conf/locale/sl/LC_MESSAGES/django.po
+++ b/django/conf/locale/sl/LC_MESSAGES/django.po
@@ -1,21 +1,19 @@
-# translation of django.po to Slovenian
-# Gasper Zejn <zejn@kiberpipa.org>, 2010.
-# Jure Cuhalev <gandalf@owca.info>, 2010.
# This file is distributed under the same license as the Django package.
+#
msgid ""
msgstr ""
-"Project-Id-Version: django\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:01+0100\n"
-"PO-Revision-Date: 2010-05-08 13:47+0100\n"
-"Last-Translator: Jure Cuhalev <gandalf@owca.info>\n"
-"Language-Team: <sl@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:37+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: iElectric <domen@dev.si>\n"
+"Language-Team: Slovenian <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
+"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"%100==4 ? 2 : 3)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -70,257 +68,263 @@ msgid "Spanish"
msgstr "Španščina"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "Argentinska španščina"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Argentinska španščina"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estonščina"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Baskovščina"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Perzijščina"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finščina"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Francoščina"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Frizijščina"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irščina"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galičanski jezik"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebrejski jezik"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hindujščina"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Hrvaščina"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Madžarščina"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Makedonščina"
+msgstr "Indonezijski"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Islandski jezik"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italijanščina"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japonščina"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Gruzijščina"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Kmerščina"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kanareščina"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Korejščina"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Litvanščina"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Latvijščina"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Makedonščina"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Malaga"
+msgstr "Malajalščina"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "Mongolščina"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Nizozemščina"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norveščina"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Norveščina Bokmal"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Norveščina Nynorsk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Pandžabščina"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Poljščina"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugalščina"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Brazilska portugalščina"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Romunščina"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Ruščina"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slovaščina"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slovenščina"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Albanščina"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Srbščina"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Srbščina v latinici"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Švedščina"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamilščina"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Teluščina"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Tajski jezik"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Turščina"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukrajinščina"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vietnamščina"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Poenostavljena kitajščina"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Tradicionalna kitajščina"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Vnesite veljavno vrednost."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Vnesite veljaven URL naslov."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Izgleda, da povezava na ta URL ne deluje."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Vnesite veljaven URL naslov."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Vnesite veljaven e-mail."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Vnesite veljavno URL okrajšavo. Vrednost sme vsebovati le črke, števila, "
"podčrtaje ali pomišljaje."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Vnesite veljaven IPv4 naslov."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Vnesite samo števila, ločena z vejicami."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Poskrbite, da bo ta vrednost %(limit_value)s. Trenutno je %(show_value)s."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Poskrbite, da bo ta vrednost manj kot ali natanko %(limit_value)s znakov."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Poskrbite, da bo ta vrednost večja ali enaka %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -329,7 +333,7 @@ msgstr ""
"Poskrbite, da bo ta vrednost vsaj %(limit_value)d znakov. Trenutno jih ima %"
"(show_value)d."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -338,17 +342,17 @@ msgstr ""
"Poskrbite, da bo imela ta vrednost največ %(limit_value)d znakov. Trenutno "
"jih ima %(show_value)d."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s mora biti edinstveno za %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s s tem %(field_label)s že obstaja."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "in"
@@ -433,7 +437,7 @@ msgid "E-mail address"
msgstr "E-mail naslov"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Pot do datoteke"
@@ -483,24 +487,24 @@ msgstr "URL (spletni naslov)"
msgid "XML text"
msgstr "XML besedilo"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Model %(model)s z glavnim ključem %(pk)r ne obstaja."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Tuji ključ (tip odvisen od povezanega polja)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Relacija ena-na-ena"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Relacija več-na-več"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Držite \"Control\" (ali \"Command\" na Mac-u) za izbiro več kot enega."
@@ -566,7 +570,7 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "Prosim oddaj datoteko ali izberi počisti okvir, ampak ne oboje hkrati."
#: forms/fields.py:518
msgid ""
@@ -581,30 +585,30 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Izberite veljavno možnost. %(value)s ni med ponujenimi izbirami."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Vnesite seznam vrednosti."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Razvrsti"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Izbriši"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Prosimo, odpravite podvojene vrednosti za %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Prosimo popravite podvojene vrednosti za %(field)s, ki morajo biti unikatne."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -613,59 +617,57 @@ msgstr ""
"Prosimo popravite podvojene vrednosti za polje %(field_name)s, ki mora biti "
"edinstveno za %(lookup)s po %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Prosimo odpravite podvojene vrednosti spodaj."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Tuji ključ se ne ujema z glavnim ključem povezanega vnosa."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Izberite veljavno možnost. Te možnosti ni med ponujenimi izbirami."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Izberite veljavno možnost. %s ni med ponujenimi izbirami."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" ni veljavna vrednost za glavni ključ."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Trenutno:"
+msgstr "Trenutno"
#: forms/widgets.py:300
msgid "Change"
msgstr "Spremeni"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr "Počisti"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Neznano"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Da"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "da,ne,morda"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
@@ -674,30 +676,30 @@ msgstr[1] "%(size)d bajta"
msgstr[2] "%(size)d bajti"
msgstr[3] "%(size)d bajtov"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -878,134 +880,122 @@ msgstr "dec"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "jan."
+msgstr "Jan"
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "feb."
+msgstr "Feb."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "marec"
+msgstr "Marec"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "april"
+msgstr "April"
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "maj"
+msgstr "Maj"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "junij"
+msgstr "Junij"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "julij"
+msgstr "Julij"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "avg."
+msgstr "Avg."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "sep."
+msgstr "Sept."
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "okt."
+msgstr "Okt."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "nov."
+msgstr "Nov."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "dec."
+msgstr "Dec."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "januar"
+msgstr "Januar"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "februar"
+msgstr "Februar"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "marec"
+msgstr "Marec"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "april"
+msgstr "April"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "maj"
+msgstr "Maj"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "junij"
+msgstr "Junij"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "julij"
+msgstr "Julij"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "avgust"
+msgstr "Avgust"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "september"
+msgstr "September"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "oktober"
+msgstr "Oktober"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "november"
+msgstr "November"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "december"
+msgstr "December"
#: utils/text.py:136
msgid "or"
@@ -1014,7 +1004,7 @@ msgstr "ali"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1078,23 +1068,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j.n.Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. F Y, H:i:s"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i:s"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1112,3 +1102,55 @@ msgstr "%(verbose_name)s je bil uspešno posodobljen."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s je bil uspešno izbrisan."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s je bil uspešno izbrisan."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s je bil uspešno posodobljen."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/sq/LC_MESSAGES/django.mo b/django/conf/locale/sq/LC_MESSAGES/django.mo
index e0dbd0ac36..4f7e56cdaf 100644
--- a/django/conf/locale/sq/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sq/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/sq/LC_MESSAGES/django.po b/django/conf/locale/sq/LC_MESSAGES/django.po
index f7a78a5653..6849b27e35 100644
--- a/django/conf/locale/sq/LC_MESSAGES/django.po
+++ b/django/conf/locale/sq/LC_MESSAGES/django.po
@@ -4,345 +4,361 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:01+0100\n"
-"PO-Revision-Date: 2010-01-27 23:01+0200\n"
-"Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
-"Language-Team: Albanian <sq@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:37+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Besnik <besnik@programeshqip.org>\n"
+"Language-Team: Albanian <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
-msgstr ""
+msgstr "Arabe"
#: conf/global_settings.py:45
msgid "Bulgarian"
-msgstr ""
+msgstr "Bulgare"
#: conf/global_settings.py:46
msgid "Bengali"
-msgstr ""
+msgstr "Bengali"
#: conf/global_settings.py:47
msgid "Bosnian"
-msgstr ""
+msgstr "Boshnjake"
#: conf/global_settings.py:48
msgid "Catalan"
-msgstr ""
+msgstr "Katalane"
#: conf/global_settings.py:49
msgid "Czech"
-msgstr ""
+msgstr "Çeke"
#: conf/global_settings.py:50
msgid "Welsh"
-msgstr ""
+msgstr "Uellsiane"
#: conf/global_settings.py:51
msgid "Danish"
-msgstr ""
+msgstr "Daneze"
#: conf/global_settings.py:52
msgid "German"
-msgstr ""
+msgstr "Gjermane"
#: conf/global_settings.py:53
msgid "Greek"
-msgstr ""
+msgstr "Greke"
#: conf/global_settings.py:54
msgid "English"
-msgstr ""
+msgstr "Angleze"
#: conf/global_settings.py:55
msgid "British English"
-msgstr ""
+msgstr "Anglishte Britanike"
#: conf/global_settings.py:56
msgid "Spanish"
-msgstr ""
+msgstr "Spanjolle"
#: conf/global_settings.py:57
msgid "Argentinian Spanish"
-msgstr ""
+msgstr "Spanjishte Argjentinase"
#: conf/global_settings.py:58
-msgid "Estonian"
-msgstr ""
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Spanjishte Argjentinase"
#: conf/global_settings.py:59
-msgid "Basque"
-msgstr ""
+msgid "Estonian"
+msgstr "Estoneze"
#: conf/global_settings.py:60
-msgid "Persian"
-msgstr ""
+msgid "Basque"
+msgstr "Baske"
#: conf/global_settings.py:61
-msgid "Finnish"
-msgstr ""
+msgid "Persian"
+msgstr "Persiane"
#: conf/global_settings.py:62
-msgid "French"
-msgstr ""
+msgid "Finnish"
+msgstr "Finlandeze"
#: conf/global_settings.py:63
-msgid "Frisian"
-msgstr ""
+msgid "French"
+msgstr "Frënge"
#: conf/global_settings.py:64
-msgid "Irish"
-msgstr ""
+msgid "Frisian"
+msgstr "Frisiane"
#: conf/global_settings.py:65
-msgid "Galician"
-msgstr ""
+msgid "Irish"
+msgstr "Irlandeze"
#: conf/global_settings.py:66
-msgid "Hebrew"
-msgstr ""
+msgid "Galician"
+msgstr "Galike"
#: conf/global_settings.py:67
-msgid "Hindi"
-msgstr ""
+msgid "Hebrew"
+msgstr "Hebraishte"
#: conf/global_settings.py:68
-msgid "Croatian"
-msgstr ""
+msgid "Hindi"
+msgstr "Indiane"
#: conf/global_settings.py:69
-msgid "Hungarian"
-msgstr ""
+msgid "Croatian"
+msgstr "Kroate"
#: conf/global_settings.py:70
-msgid "Indonesian"
-msgstr ""
+msgid "Hungarian"
+msgstr "Hungareze"
#: conf/global_settings.py:71
-msgid "Icelandic"
-msgstr ""
+msgid "Indonesian"
+msgstr "Indoneziane"
#: conf/global_settings.py:72
-msgid "Italian"
-msgstr ""
+msgid "Icelandic"
+msgstr "Islandeze"
#: conf/global_settings.py:73
-msgid "Japanese"
-msgstr ""
+msgid "Italian"
+msgstr "Italiane"
#: conf/global_settings.py:74
-msgid "Georgian"
-msgstr ""
+msgid "Japanese"
+msgstr "Japoneze"
#: conf/global_settings.py:75
-msgid "Khmer"
-msgstr ""
+msgid "Georgian"
+msgstr "Gjeorgjiane"
#: conf/global_settings.py:76
-msgid "Kannada"
-msgstr ""
+msgid "Khmer"
+msgstr "Khmere"
#: conf/global_settings.py:77
-msgid "Korean"
-msgstr ""
+msgid "Kannada"
+msgstr "Kannada"
#: conf/global_settings.py:78
-msgid "Lithuanian"
-msgstr ""
+msgid "Korean"
+msgstr "Koreane"
#: conf/global_settings.py:79
-msgid "Latvian"
-msgstr ""
+msgid "Lithuanian"
+msgstr "Lituaneze"
#: conf/global_settings.py:80
-msgid "Macedonian"
-msgstr ""
+msgid "Latvian"
+msgstr "Latviane"
#: conf/global_settings.py:81
-msgid "Malayalam"
-msgstr ""
+msgid "Macedonian"
+msgstr "Maqedone"
#: conf/global_settings.py:82
-msgid "Mongolian"
-msgstr ""
+msgid "Malayalam"
+msgstr "Malajalame"
#: conf/global_settings.py:83
-msgid "Dutch"
-msgstr ""
+msgid "Mongolian"
+msgstr "Mongoliane"
#: conf/global_settings.py:84
-msgid "Norwegian"
-msgstr ""
+msgid "Dutch"
+msgstr "Holandeze"
#: conf/global_settings.py:85
-msgid "Norwegian Bokmal"
-msgstr ""
+msgid "Norwegian"
+msgstr "Norvegjeze"
#: conf/global_settings.py:86
-msgid "Norwegian Nynorsk"
-msgstr ""
+msgid "Norwegian Bokmal"
+msgstr "Norvegjeze Bokmal"
#: conf/global_settings.py:87
-msgid "Punjabi"
-msgstr ""
+msgid "Norwegian Nynorsk"
+msgstr "Norvegjeze Nynorsk"
#: conf/global_settings.py:88
-msgid "Polish"
-msgstr ""
+msgid "Punjabi"
+msgstr "Panxhabe"
#: conf/global_settings.py:89
-msgid "Portuguese"
-msgstr ""
+msgid "Polish"
+msgstr "Polake"
#: conf/global_settings.py:90
-msgid "Brazilian Portuguese"
-msgstr ""
+msgid "Portuguese"
+msgstr "Portugeze"
#: conf/global_settings.py:91
-msgid "Romanian"
-msgstr ""
+msgid "Brazilian Portuguese"
+msgstr "Portugeze Braziliane"
#: conf/global_settings.py:92
-msgid "Russian"
-msgstr ""
+msgid "Romanian"
+msgstr "Rumune"
#: conf/global_settings.py:93
-msgid "Slovak"
-msgstr ""
+msgid "Russian"
+msgstr "Ruse"
#: conf/global_settings.py:94
-msgid "Slovenian"
-msgstr ""
+msgid "Slovak"
+msgstr "Slovake"
#: conf/global_settings.py:95
-msgid "Albanian"
-msgstr ""
+msgid "Slovenian"
+msgstr "Slovene"
#: conf/global_settings.py:96
-msgid "Serbian"
-msgstr ""
+msgid "Albanian"
+msgstr "Shqipe"
#: conf/global_settings.py:97
-msgid "Serbian Latin"
-msgstr ""
+msgid "Serbian"
+msgstr "Serbe"
#: conf/global_settings.py:98
-msgid "Swedish"
-msgstr ""
+msgid "Serbian Latin"
+msgstr "Serbe Latine"
#: conf/global_settings.py:99
-msgid "Tamil"
-msgstr ""
+msgid "Swedish"
+msgstr "Suedeze"
#: conf/global_settings.py:100
-msgid "Telugu"
-msgstr ""
+msgid "Tamil"
+msgstr "Tamileze"
#: conf/global_settings.py:101
-msgid "Thai"
-msgstr ""
+msgid "Telugu"
+msgstr "Telugu"
#: conf/global_settings.py:102
-msgid "Turkish"
-msgstr ""
+msgid "Thai"
+msgstr "Tailandeze"
#: conf/global_settings.py:103
-msgid "Ukrainian"
-msgstr ""
+msgid "Turkish"
+msgstr "Turke"
#: conf/global_settings.py:104
-msgid "Vietnamese"
-msgstr ""
+msgid "Ukrainian"
+msgstr "Ukrainase"
#: conf/global_settings.py:105
-msgid "Simplified Chinese"
+msgid "Urdu"
msgstr ""
#: conf/global_settings.py:106
+msgid "Vietnamese"
+msgstr "Vietnameze"
+
+#: conf/global_settings.py:107
+msgid "Simplified Chinese"
+msgstr "Kineze e Thjeshtuar"
+
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
-msgstr ""
+msgstr "Kineze Tradicionale"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Jepni vlerë të vlefshme."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Jepni një URL të vlefshme."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Kjo URL duket se është lidhje e dëmtuar."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Jepni një URL të vlefshme."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
-msgstr ""
+msgstr "Jepni një adresë e-mail të vlefshme."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Jepni një 'slug' të vlefshëm, të përbërë nga shkronja, numra, nëvija ose "
"vija në mes."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Jepni një vendndodhje të vlefshme IPv4."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Jepni vetëm shifra të ndara nga presje."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
+"Sigurohuni që kjo vlerë të jetë %(limit_value)s (është %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
+"Sigurohuni që kjo vlerë të jetë më e vogël ose baraz me %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr ""
+msgstr "Sigurohuni që kjo vlerë është më e madhe ose baraz me %(limit_value)s."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
+"Sigurohuni që kjo vlerë të ketë të paktën %(limit_value)d shenja (ka %"
+"(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
+"Sigurohuni që kjo vlerë të ketë e shumta %(limit_value)d shenja (ka %"
+"(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
+msgstr "%(field_name)s duhet të jetë unike për %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "Ka tashmë një %(model_name)s me këtë %(field_label)s."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
-msgstr ""
+msgstr " dhe "
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "Vlera %r nuk është zgjedhje e vlefshme."
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
@@ -350,18 +366,18 @@ msgstr "Kjo fushë nuk mund të jetë bosh."
#: db/models/fields/__init__.py:65
msgid "This field cannot be blank."
-msgstr ""
+msgstr "Kjo fushë nuk mund të jetë e zbrazët."
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "Fushë e llojit: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
#: db/models/fields/__init__.py:1018
msgid "Integer"
-msgstr ""
+msgstr "Numër i plotë"
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
msgid "This value must be an integer."
@@ -373,20 +389,20 @@ msgstr "Kjo vlerë duhet të jetë True ose False."
#: db/models/fields/__init__.py:495
msgid "Boolean (Either True or False)"
-msgstr ""
+msgstr "Buleane (Ose True, ose False)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
#, python-format
msgid "String (up to %(max_length)s)"
-msgstr ""
+msgstr "Varg (deri në %(max_length)s)"
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
-msgstr ""
+msgstr "Numra të plotë të ndarë me presje"
#: db/models/fields/__init__.py:584
msgid "Date (without time)"
-msgstr ""
+msgstr "Datë (pa kohë)"
#: db/models/fields/__init__.py:588
msgid "Enter a valid date in YYYY-MM-DD format."
@@ -404,7 +420,7 @@ msgstr ""
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
-msgstr ""
+msgstr "Datë (me kohë)"
#: db/models/fields/__init__.py:746
msgid "This value must be a decimal number."
@@ -412,16 +428,16 @@ msgstr "Kjo vlerë duhet të jetë një numër dhjetor."
#: db/models/fields/__init__.py:748
msgid "Decimal number"
-msgstr ""
+msgstr "Numër dhjetor"
#: db/models/fields/__init__.py:803
msgid "E-mail address"
-msgstr ""
+msgstr "Adresë e-mail"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
-msgstr ""
+msgstr "Shteg kartele"
#: db/models/fields/__init__.py:841
msgid "This value must be a float."
@@ -433,11 +449,11 @@ msgstr ""
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "Numër i plotë i madh (8 bajte)"
#: db/models/fields/__init__.py:915
msgid "IP address"
-msgstr ""
+msgstr "Adresë IP"
#: db/models/fields/__init__.py:931
msgid "This value must be either None, True or False."
@@ -445,15 +461,15 @@ msgstr "Kjo vlerë duhet të jetë None, True ose False."
#: db/models/fields/__init__.py:933
msgid "Boolean (Either True, False or None)"
-msgstr ""
+msgstr "Buleane (Ose True, ose False, ose None)"
#: db/models/fields/__init__.py:1024
msgid "Text"
-msgstr ""
+msgstr "Tekst"
#: db/models/fields/__init__.py:1040
msgid "Time"
-msgstr ""
+msgstr "Kohë"
#: db/models/fields/__init__.py:1044
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
@@ -461,30 +477,30 @@ msgstr "Jepni një kohë të vlefshme, në formatin HH:MM[:ss[.uuuuuu]]."
#: db/models/fields/__init__.py:1120
msgid "URL"
-msgstr ""
+msgstr "URL"
#: db/models/fields/__init__.py:1136
msgid "XML text"
-msgstr ""
+msgstr "Tekst XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr ""
+msgstr "Modeli %(model)s me pk %(pk)r nuk ekziston."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "Kyç i Jashtëm (lloj i përcaktuar nga fusha përkatëse)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "Marrëdhënie një-për-një"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "Marrëdhënie shumë-për-shumë"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -548,10 +564,13 @@ msgstr "Kartela e parashtruar është bosh."
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
+"Sigurohuni që ky emër kartele ka e shumta %(max)d shenja (ka %(length)d)."
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Ju lutem, ose parashtroni një kartelë, ose i vini shenjë kutizës për "
+"pastrim, jo që të dyja."
#: forms/fields.py:518
msgid ""
@@ -568,493 +587,498 @@ msgstr ""
"Përzgjidhni një zgjedhje të vlefshme. %(value)s nuk është nga zgjedhjet e "
"mundshme."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Jepni një listë vlerash."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Rend"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
-msgstr ""
+msgstr "Fshije"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr ""
+msgstr "Ju lutem, ndreqni të dhënat dyfishe për %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
+"Ju lutem, ndreqni të dhënat dyfishe për %(field)s, të cilat duhet të jenë "
+"unike."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
+"Ju lutem, ndreqni të dhënat dyfishe për %(field_name)s të cilat duhet të "
+"jenë unike për %(lookup)s te %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr ""
+msgstr "Ju lutem, ndreqni vlerat dyfishe më poshtë."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
+"Kyçi i jashtëm \"inline\" nuk u përputh me kyçin parësor të instancës mëmë."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Përzgjidhni një zgjedhje të vlefshme. Ajo zgjedhje nuk është një nga "
"zgjedhjet e mundshme."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
"Përzgjidhni një zgjedhje të vlefshme. %s nuk është një nga zgjedhjet e "
"mundshme."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" nuk është vlerë e vlefshme për kyç primar."
#: forms/widgets.py:299
msgid "Currently"
-msgstr ""
+msgstr "Tani"
#: forms/widgets.py:300
msgid "Change"
-msgstr ""
+msgstr "Ndryshoje"
#: forms/widgets.py:301
msgid "Clear"
-msgstr ""
+msgstr "Pastroje"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
-msgstr ""
+msgstr "E panjohur"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
-msgstr ""
+msgstr "Po"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
-msgstr ""
+msgstr "Jo"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
-msgstr ""
+msgstr "po,jo,ndoshta"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%(size)d bajt"
+msgstr[1] "%(size)d bajte"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
-msgstr ""
+msgstr "p.m."
#: utils/dateformat.py:43
msgid "a.m."
-msgstr ""
+msgstr "a.m."
#: utils/dateformat.py:48
msgid "PM"
-msgstr ""
+msgstr "PM"
#: utils/dateformat.py:49
msgid "AM"
-msgstr ""
+msgstr "AM"
#: utils/dateformat.py:98
msgid "midnight"
-msgstr ""
+msgstr "mesnatë"
#: utils/dateformat.py:100
msgid "noon"
-msgstr ""
+msgstr "meditë"
#: utils/dates.py:6
msgid "Monday"
-msgstr ""
+msgstr "E hënë"
#: utils/dates.py:6
msgid "Tuesday"
-msgstr ""
+msgstr "E martë"
#: utils/dates.py:6
msgid "Wednesday"
-msgstr ""
+msgstr "E mërkurë"
#: utils/dates.py:6
msgid "Thursday"
-msgstr ""
+msgstr "E enjte"
#: utils/dates.py:6
msgid "Friday"
-msgstr ""
+msgstr "E premte"
#: utils/dates.py:7
msgid "Saturday"
-msgstr ""
+msgstr "E shtunë"
#: utils/dates.py:7
msgid "Sunday"
-msgstr ""
+msgstr "E dielë"
#: utils/dates.py:10
msgid "Mon"
-msgstr ""
+msgstr "Hën"
#: utils/dates.py:10
msgid "Tue"
-msgstr ""
+msgstr "Mar"
#: utils/dates.py:10
msgid "Wed"
-msgstr ""
+msgstr "Mër"
#: utils/dates.py:10
msgid "Thu"
-msgstr ""
+msgstr "Enj"
#: utils/dates.py:10
msgid "Fri"
-msgstr ""
+msgstr "Pre"
#: utils/dates.py:11
msgid "Sat"
-msgstr ""
+msgstr "Sht"
#: utils/dates.py:11
msgid "Sun"
-msgstr ""
+msgstr "Die"
#: utils/dates.py:18
msgid "January"
-msgstr ""
+msgstr "Janar"
#: utils/dates.py:18
msgid "February"
-msgstr ""
+msgstr "Shkurt"
#: utils/dates.py:18
msgid "March"
-msgstr ""
+msgstr "Mars"
#: utils/dates.py:18
msgid "April"
-msgstr ""
+msgstr "Prill"
#: utils/dates.py:18
msgid "May"
-msgstr ""
+msgstr "Maj"
#: utils/dates.py:18
msgid "June"
-msgstr ""
+msgstr "Qershor"
#: utils/dates.py:19
msgid "July"
-msgstr ""
+msgstr "Korrik"
#: utils/dates.py:19
msgid "August"
-msgstr ""
+msgstr "Gusht"
#: utils/dates.py:19
msgid "September"
-msgstr ""
+msgstr "Shtator"
#: utils/dates.py:19
msgid "October"
-msgstr ""
+msgstr "Tetor"
#: utils/dates.py:19
msgid "November"
-msgstr ""
+msgstr "Nëntor"
#: utils/dates.py:20
msgid "December"
-msgstr ""
+msgstr "Dhjetor"
#: utils/dates.py:23
msgid "jan"
-msgstr ""
+msgstr "jan"
#: utils/dates.py:23
msgid "feb"
-msgstr ""
+msgstr "shk"
#: utils/dates.py:23
msgid "mar"
-msgstr ""
+msgstr "mar"
#: utils/dates.py:23
msgid "apr"
-msgstr ""
+msgstr "pri"
#: utils/dates.py:23
msgid "may"
-msgstr ""
+msgstr "maj"
#: utils/dates.py:23
msgid "jun"
-msgstr ""
+msgstr "qer"
#: utils/dates.py:24
msgid "jul"
-msgstr ""
+msgstr "kor"
#: utils/dates.py:24
msgid "aug"
-msgstr ""
+msgstr "gus"
#: utils/dates.py:24
msgid "sep"
-msgstr ""
+msgstr "sht"
#: utils/dates.py:24
msgid "oct"
-msgstr ""
+msgstr "oct"
#: utils/dates.py:24
msgid "nov"
-msgstr ""
+msgstr "nën"
#: utils/dates.py:24
msgid "dec"
-msgstr ""
+msgstr "dhj"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr ""
+msgstr "Jan."
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr ""
+msgstr "Shk."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr ""
+msgstr "Mars"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr ""
+msgstr "Prill"
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr ""
+msgstr "Maj"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr ""
+msgstr "Qershor"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr ""
+msgstr "Korrik"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr ""
+msgstr "Gus."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr ""
+msgstr "Shta."
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr ""
+msgstr "Tet."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr ""
+msgstr "Nën."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr ""
+msgstr "Dhj."
#: utils/dates.py:45
msgctxt "alt. month"
msgid "January"
-msgstr ""
+msgstr "Janar"
#: utils/dates.py:46
msgctxt "alt. month"
msgid "February"
-msgstr ""
+msgstr "Shkurt"
#: utils/dates.py:47
msgctxt "alt. month"
msgid "March"
-msgstr ""
+msgstr "Mars"
#: utils/dates.py:48
msgctxt "alt. month"
msgid "April"
-msgstr ""
+msgstr "Prill"
#: utils/dates.py:49
msgctxt "alt. month"
msgid "May"
-msgstr ""
+msgstr "Maj"
#: utils/dates.py:50
msgctxt "alt. month"
msgid "June"
-msgstr ""
+msgstr "Qershor"
#: utils/dates.py:51
msgctxt "alt. month"
msgid "July"
-msgstr ""
+msgstr "Korrik"
#: utils/dates.py:52
msgctxt "alt. month"
msgid "August"
-msgstr ""
+msgstr "Gusht"
#: utils/dates.py:53
msgctxt "alt. month"
msgid "September"
-msgstr ""
+msgstr "Shtator"
#: utils/dates.py:54
msgctxt "alt. month"
msgid "October"
-msgstr ""
+msgstr "Tetor"
#: utils/dates.py:55
msgctxt "alt. month"
msgid "November"
-msgstr ""
+msgstr "Nëntor"
#: utils/dates.py:56
msgctxt "alt. month"
msgid "December"
-msgstr ""
+msgstr "Dhjetor"
#: utils/text.py:136
msgid "or"
-msgstr ""
+msgstr "ose"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
msgid_plural "years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "vit"
+msgstr[1] "vite"
#: utils/timesince.py:22
msgid "month"
msgid_plural "months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "muaj"
+msgstr[1] "muaj"
#: utils/timesince.py:23
msgid "week"
msgid_plural "weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "javë"
+msgstr[1] "javë"
#: utils/timesince.py:24
msgid "day"
msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "ditë"
+msgstr[1] "ditë"
#: utils/timesince.py:25
msgid "hour"
msgid_plural "hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "orë"
+msgstr[1] "orë"
#: utils/timesince.py:26
msgid "minute"
msgid_plural "minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "minutë"
+msgstr[1] "minuta"
#: utils/timesince.py:45
msgid "minutes"
-msgstr ""
+msgstr "minuta"
#: utils/timesince.py:50
#, python-format
msgid "%(number)d %(type)s"
-msgstr ""
+msgstr "%(number)d %(type)s"
#: utils/timesince.py:56
#, python-format
msgid ", %(number)d %(type)s"
-msgstr ""
+msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "N j, Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr ""
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
@@ -1072,3 +1096,55 @@ msgstr "%(verbose_name)s u përditësua me sukses."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s u fshi."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s u fshi."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s u përditësua me sukses."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.mo b/django/conf/locale/sr/LC_MESSAGES/django.mo
index 90aea83118..6a4ab28f3f 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sr/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/sr/LC_MESSAGES/django.po b/django/conf/locale/sr/LC_MESSAGES/django.po
index d314e4d01d..5ed9cc51aa 100644
--- a/django/conf/locale/sr/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr/LC_MESSAGES/django.po
@@ -4,18 +4,16 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:01+0100\n"
-"PO-Revision-Date: 2010-08-06 19:47+0100\n"
-"Last-Translator: Janos Guljas <janos@janos.in.rs>\n"
-"Language-Team: Branko Vukelic <bg.branko@gmail.com> & Janos Guljas "
-"<janos@janos.in.rs> & Nesh <djnesh@gmail.com> & Petar <petar.maric@gmail."
-"com>\n"
+"POT-Creation-Date: 2011-02-28 17:37+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: janos <janos@resenje.org>\n"
+"Language-Team: Serbian <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: sr\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -74,248 +72,257 @@ msgid "Argentinian Spanish"
msgstr "аргентински шпански"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "аргентински шпански"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "естонски"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "баскијски"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "персијски"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "фински"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "француски"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "фризијски"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "ирски"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "галски"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "хебрејски"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "хинду"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "хрватски"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "мађарски"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "индонежански"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "исландски"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "италијански"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "јапански"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "грузијски"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "камбодијски"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "канада"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "корејски"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "литвански"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "латвијски"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "македонски"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr "малајаламски"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "монголски"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "холандски"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "норвешки"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "норвешки кнјжевни"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "норвешки нови"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Панџаби"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "пољски"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "португалски"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "бразилски португалски"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "румунски"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "руски"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "словачки"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "словеначки"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "албански"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "српски"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "српски (латиница)"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "шведски"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "тамилски"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "телугу"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "тајландски"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "турски"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "украјински"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "вијетнамски"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "новокинески"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "старокинески"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Унесите исправну вредност."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Унесите исправан URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Овај URL изгледа не води никуда."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Унесите исправан URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Унесите важећу имејл адресу."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Унесите исрпаван „слаг“, који се састоји од слова, бројки, доњих црта или "
"циртица."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Унесите исправну IPv4 адресу."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Унесите само бројке раздвојене запетама."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Ово поље мора да буде %(limit_value)s (тренутно има %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Ова вредност мора да буде мања од %(limit_value)s. или тачно толико."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Ова вредност мора бити већа од %(limit_value)s или тачно толико."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -324,7 +331,7 @@ msgstr ""
"Ово поље мора да садржи најмање %(limit_value)d словних места (тренутно има %"
"(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -333,17 +340,17 @@ msgstr ""
"Ово поље мора да садржи највише %(limit_value)d словних места (тренутно има %"
"(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s мора да буде јединствен за %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s са овом вредношћу %(field_label)s већ постоји."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "и"
@@ -426,7 +433,7 @@ msgid "E-mail address"
msgstr "Имејл адреса"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Путања фајла"
@@ -474,24 +481,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML текст"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Објекат класе %(model)s са примарним кључем %(pk)r не постоји."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Страни кључ (тип одређује референтно поље)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Релација један на један"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Релација више на више"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -559,7 +566,7 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "Може се само послати фајл или избрисати, не оба."
#: forms/fields.py:518
msgid ""
@@ -575,30 +582,30 @@ msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"%(value)s није међу понуђеним вредностима. Одаберите једну од понуђених."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Унесите листу вредности."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Редослед"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Обриши"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Исправите дуплиран садржај за поља: %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Исправите дуплиран садржај за поља: %(field)s, који мора да буде јединствен."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -607,90 +614,89 @@ msgstr ""
"Исправите дуплиран садржај за поља: %(field_name)s, који мора да буде "
"јединствен за %(lookup)s у %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Исправите дуплиране вредности доле."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Страни кључ се није поклопио са инстанцом родитељског кључа."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Одабрана вредност није међу понуђенима. Одаберите једну од понуђених."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "%s није међу понуђеним вредностима. Одаберите једну од понуђених."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "„%s“ није исправна вредност за примарни кључ."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Тренутно:"
+msgstr "Тренутно"
#: forms/widgets.py:300
msgid "Change"
msgstr "Измени"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "година"
+msgstr "Очисти"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Непознато"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Да"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Не"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "да,не,можда"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d бајт"
msgstr[1] "%(size)d бајта"
msgstr[2] "%(size)d бајтова"
+msgstr[3] "%(size)d бајтова"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -871,134 +877,122 @@ msgstr "дец."
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "јан."
+msgstr "Јан."
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "беб."
+msgstr "Феб."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "март"
+msgstr "Март"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "април"
+msgstr "Април"
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "мај"
+msgstr "Мај"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "јун"
+msgstr "Јун"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "јул"
+msgstr "Јул"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "ауг."
+msgstr "Авг."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "септ."
+msgstr "Септ."
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "окт."
+msgstr "Окт."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "нов."
+msgstr "Нов."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "дец."
+msgstr "Дец."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "јануар"
+msgstr "Јануар"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "фебруар"
+msgstr "Фебруар"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "март"
+msgstr "Март"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "април"
+msgstr "Април"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "мај"
+msgstr "Мај"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "јун"
+msgstr "Јун"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "јул"
+msgstr "Јул"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "август"
+msgstr "Август"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "септембар"
+msgstr "Септембар"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "октобар"
+msgstr "Октобар"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "новембар"
+msgstr "Новембар"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "децембар"
+msgstr "Децембар"
#: utils/text.py:136
msgid "or"
@@ -1007,7 +1001,7 @@ msgstr "или"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ","
#: utils/timesince.py:21
msgid "year"
@@ -1015,6 +1009,7 @@ msgid_plural "years"
msgstr[0] "година"
msgstr[1] "године"
msgstr[2] "година"
+msgstr[3] "година"
#: utils/timesince.py:22
msgid "month"
@@ -1022,6 +1017,7 @@ msgid_plural "months"
msgstr[0] "месец"
msgstr[1] "месеца"
msgstr[2] "месеци"
+msgstr[3] "месеци"
#: utils/timesince.py:23
msgid "week"
@@ -1029,6 +1025,7 @@ msgid_plural "weeks"
msgstr[0] "недеља"
msgstr[1] "недеље"
msgstr[2] "недеља"
+msgstr[3] "недеља"
#: utils/timesince.py:24
msgid "day"
@@ -1036,6 +1033,7 @@ msgid_plural "days"
msgstr[0] "дан"
msgstr[1] "дана"
msgstr[2] "дана"
+msgstr[3] "дана"
#: utils/timesince.py:25
msgid "hour"
@@ -1043,6 +1041,7 @@ msgid_plural "hours"
msgstr[0] "сат"
msgstr[1] "сата"
msgstr[2] "сати"
+msgstr[3] "сати"
#: utils/timesince.py:26
msgid "minute"
@@ -1050,6 +1049,7 @@ msgid_plural "minutes"
msgstr[0] "минут"
msgstr[1] "минута"
msgstr[2] "минута"
+msgstr[3] "минута"
#: utils/timesince.py:45
msgid "minutes"
@@ -1065,23 +1065,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j. F Y."
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. F Y. H:i Т"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "G:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y."
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1099,3 +1099,55 @@ msgstr "%(verbose_name)s је успешно ажуриран."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s је обрисан."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s је обрисан."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s је успешно ажуриран."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo b/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
index 1adb13202a..5859725ba8 100644
--- a/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/sr_Latn/LC_MESSAGES/django.po b/django/conf/locale/sr_Latn/LC_MESSAGES/django.po
index e824cd241f..b0d42af4dc 100644
--- a/django/conf/locale/sr_Latn/LC_MESSAGES/django.po
+++ b/django/conf/locale/sr_Latn/LC_MESSAGES/django.po
@@ -4,18 +4,16 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:01+0100\n"
-"PO-Revision-Date: 2010-08-06 19:47+0100\n"
-"Last-Translator: Janos Guljas <janos@janos.in.rs>\n"
-"Language-Team: Branko Vukelic <bg.branko@gmail.com> & Janos Guljas "
-"<janos@janos.in.rs> & Nesh <djnesh@gmail.com> & Petar <petar.maric@gmail."
-"com>\n"
+"POT-Creation-Date: 2011-02-28 17:37+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: janos <janos@resenje.org>\n"
+"Language-Team: Serbian (Latin) <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -74,248 +72,257 @@ msgid "Argentinian Spanish"
msgstr "argentinski španski"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "argentinski španski"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "estonski"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "baskijski"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "persijski"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "finski"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "francuski"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "frizijski"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "irski"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "galski"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "hebrejski"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "hindu"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "hrvatski"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "mađarski"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr "indonežanski"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "islandski"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "italijanski"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "japanski"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "gruzijski"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "kambodijski"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "kanada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "korejski"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "litvanski"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "latvijski"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "makedonski"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr "malajalamski"
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr "mongolski"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "holandski"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "norveški"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "norveški knjževni"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "norveški novi"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Pandžabi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "poljski"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "portugalski"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "brazilski portugalski"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "rumunski"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "ruski"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "slovački"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "slovenački"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "albanski"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "srpski"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "srpski (latinica)"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "švedski"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "tamilski"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "tajlandski"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "turski"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ukrajinski"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "vijetnamski"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "novokineski"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "starokineski"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Unesite ispravnu vrednost."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Unesite ispravan URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Ovaj URL izgleda ne vodi nikuda."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Unesite ispravan URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Unesite važeću imejl adresu."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Unesite isrpavan „slag“, koji se sastoji od slova, brojki, donjih crta ili "
"cirtica."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Unesite ispravnu IPv4 adresu."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Unesite samo brojke razdvojene zapetama."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "Ovo polje mora da bude %(limit_value)s (trenutno ima %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "Ova vrednost mora da bude manja od %(limit_value)s. ili tačno toliko."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "Ova vrednost mora biti veća od %(limit_value)s ili tačno toliko."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -324,7 +331,7 @@ msgstr ""
"Ovo polje mora da sadrži najmanje %(limit_value)d slovnih mesta (trenutno "
"ima %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -333,17 +340,17 @@ msgstr ""
"Ovo polje mora da sadrži najviše %(limit_value)d slovnih mesta (trenutno ima "
"%(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s mora da bude jedinstven za %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s sa ovom vrednošću %(field_label)s već postoji."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "i"
@@ -426,7 +433,7 @@ msgid "E-mail address"
msgstr "Imejl adresa"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Putanja fajla"
@@ -474,24 +481,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML tekst"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Objekat klase %(model)s sa primarnim ključem %(pk)r ne postoji."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Strani ključ (tip određuje referentno polje)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Relacija jedan na jedan"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Relacija više na više"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -559,7 +566,7 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "Može se samo poslati fajl ili izbrisati, ne oba."
#: forms/fields.py:518
msgid ""
@@ -575,30 +582,30 @@ msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
"%(value)s nije među ponuđenim vrednostima. Odaberite jednu od ponuđenih."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Unesite listu vrednosti."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Redosled"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Obriši"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Ispravite dupliran sadržaj za polja: %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Ispravite dupliran sadržaj za polja: %(field)s, koji mora da bude jedinstven."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -607,90 +614,89 @@ msgstr ""
"Ispravite dupliran sadržaj za polja: %(field_name)s, koji mora da bude "
"jedinstven za %(lookup)s u %(date_field)s."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Ispravite duplirane vrednosti dole."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "Strani ključ se nije poklopio sa instancom roditeljskog ključa."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Odabrana vrednost nije među ponuđenima. Odaberite jednu od ponuđenih."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "%s nije među ponuđenim vrednostima. Odaberite jednu od ponuđenih."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "„%s“ nije ispravna vrednost za primarni ključ."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Trenutno:"
+msgstr "Trenutno"
#: forms/widgets.py:300
msgid "Change"
msgstr "Izmeni"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "godina"
+msgstr "Očisti"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Nepoznato"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Da"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Ne"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "da,ne,možda"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bajt"
msgstr[1] "%(size)d bajta"
msgstr[2] "%(size)d bajtova"
+msgstr[3] "%(size)d bajtova"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -871,134 +877,122 @@ msgstr "dec."
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "jan."
+msgstr "Jan."
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "beb."
+msgstr "Feb."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "mart"
+msgstr "Mart"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "april"
+msgstr "April"
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "maj"
+msgstr "Maj"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "jun"
+msgstr "Jun"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "jul"
+msgstr "Jul"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "aug."
+msgstr "Avg."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "sept."
+msgstr "Sept."
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "okt."
+msgstr "Okt."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "nov."
+msgstr "Nov."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "dec."
+msgstr "Dec."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "januar"
+msgstr "Januar"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "februar"
+msgstr "Februar"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "mart"
+msgstr "Mart"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "april"
+msgstr "April"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "maj"
+msgstr "Maj"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "jun"
+msgstr "Jun"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "jul"
+msgstr "Jul"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "avgust"
+msgstr "Avgust"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "septembar"
+msgstr "Septembar"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "oktobar"
+msgstr "Oktobar"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "novembar"
+msgstr "Novembar"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "decembar"
+msgstr "Decembar"
#: utils/text.py:136
msgid "or"
@@ -1007,7 +1001,7 @@ msgstr "ili"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ","
#: utils/timesince.py:21
msgid "year"
@@ -1015,6 +1009,7 @@ msgid_plural "years"
msgstr[0] "godina"
msgstr[1] "godine"
msgstr[2] "godina"
+msgstr[3] "godina"
#: utils/timesince.py:22
msgid "month"
@@ -1022,6 +1017,7 @@ msgid_plural "months"
msgstr[0] "mesec"
msgstr[1] "meseca"
msgstr[2] "meseci"
+msgstr[3] "meseci"
#: utils/timesince.py:23
msgid "week"
@@ -1029,6 +1025,7 @@ msgid_plural "weeks"
msgstr[0] "nedelja"
msgstr[1] "nedelje"
msgstr[2] "nedelja"
+msgstr[3] "nedelja"
#: utils/timesince.py:24
msgid "day"
@@ -1036,6 +1033,7 @@ msgid_plural "days"
msgstr[0] "dan"
msgstr[1] "dana"
msgstr[2] "dana"
+msgstr[3] "dana"
#: utils/timesince.py:25
msgid "hour"
@@ -1043,6 +1041,7 @@ msgid_plural "hours"
msgstr[0] "sat"
msgstr[1] "sata"
msgstr[2] "sati"
+msgstr[3] "sati"
#: utils/timesince.py:26
msgid "minute"
@@ -1050,6 +1049,7 @@ msgid_plural "minutes"
msgstr[0] "minut"
msgstr[1] "minuta"
msgstr[2] "minuta"
+msgstr[3] "minuta"
#: utils/timesince.py:45
msgid "minutes"
@@ -1065,23 +1065,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j. F Y."
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j. F Y. H:i T"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "G:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y."
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j. F"
@@ -1099,3 +1099,55 @@ msgstr "%(verbose_name)s je uspešno ažuriran."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s je obrisan."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s je obrisan."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s je uspešno ažuriran."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.mo b/django/conf/locale/sv/LC_MESSAGES/django.mo
index 61bfc71a6f..f3a67543aa 100644
--- a/django/conf/locale/sv/LC_MESSAGES/django.mo
+++ b/django/conf/locale/sv/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/sv/LC_MESSAGES/django.po b/django/conf/locale/sv/LC_MESSAGES/django.po
index 26f578db40..cfeeb16474 100644
--- a/django/conf/locale/sv/LC_MESSAGES/django.po
+++ b/django/conf/locale/sv/LC_MESSAGES/django.po
@@ -1,21 +1,18 @@
-# Swedish translation of Django
-# Copyright (C) 2005-2007
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:01+0100\n"
-"PO-Revision-Date: 2008-05-26 11:15+0200\n"
-"Last-Translator: Mikko Hellsing <mikko@aino.se>\n"
-"Language-Team: Django I18N <Django-I18N@googlegroups.com>\n"
+"POT-Creation-Date: 2011-02-28 17:37+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: andreaspelme <andreas@pelme.se>\n"
+"Language-Team: Swedish <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-Language: Swedish\n"
-"X-Poedit-Country: SWEDEN\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -30,9 +27,8 @@ msgid "Bengali"
msgstr "Bengaliska"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "Estländska"
+msgstr "Bosniska"
#: conf/global_settings.py:48
msgid "Catalan"
@@ -63,319 +59,320 @@ msgid "English"
msgstr "Engelska"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Engelska"
+msgstr "Brittisk engelska"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Spanska"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Argentisk Spanska"
+msgstr "Argentinsk spanska"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Argentinsk spanska"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estländska"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Baskiska"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Persiska"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Finska"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Franska"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "Friesland"
+msgstr "Frisiska"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Irländska"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galisiska"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Hebreiska"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
-msgstr ""
+msgstr "Hindi"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Kroatiska"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Ungerska"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Makedonska"
+msgstr "Indonesiska"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Isländska"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Italienska"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japanska"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Georgiska"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Khmer"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Koreanska"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Lettiska"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Lettiska"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Makedonska"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Málaga"
+msgstr "Malayalam"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Makedonska"
+msgstr "Mongoliska"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Holländska"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norska"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Norska"
+msgstr "Norska (bokmål)"
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Norska"
+msgstr "Norska (nynorsk)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Punjabi"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Polska"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portugisiska"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Brasiliensk portugisiska"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Rumänska"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Ryska"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slovakiska"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slovenska"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Alacant"
+msgstr "Albanska"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Serbiska"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "Serbiska"
+msgstr "Serbiska (latin)"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Svenska"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamilska"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telugu"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Thailändska"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Turkiska"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukrainska"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "Wien"
+msgstr "Vietnamesiska"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Förenklad Kinesiska"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Traditionell Kinesiska"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Fyll i ett giltigt värde."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Fyll i en giltig URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Denna URL verkar vara en trasig länk."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Fyll i en giltig URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Fyll i en giltig e-postadress."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Fyll i en giltig 'slug', beståendes av enbart bokstäver, siffror, "
"understreck samt bindestreck."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Fyll i en giltig IPv4 adress."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Fyll enbart i siffror separerade med kommatecken."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Kontrollera att detta värde har minst %(min)d tecken (det har %(length)d)."
+"Kontrollera att detta värde är %(limit_value)s (det är %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Kontrollera att detta värde är mindre eller lika med %s."
+msgstr ""
+"Kontrollera att detta värde är mindre än eller lika med %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Kontrollera att detta värde är mer eller lika med %s."
+msgstr ""
+"Kontrollera att detta värde är större än eller lika med %(limit_value)s."
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Kontrollera att detta värde har minst %(min)d tecken (det har %(length)d)."
+"Kontrollera att detta värde har minst %(limit_value)d tecken (det har %"
+"(show_value)d)."
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Kontrollera att detta värde har högst %(max)d tecken (det har %(length)d)."
+"Kontrollera att detta värde som mest har %(limit_value)d tecken (det har %"
+"(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "%(field_name)s måste vara unikt för %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s med detta %(field_label)s finns redan."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "och"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "Värdet %r är inget giltigt alternativ."
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
msgstr "Detta fält får inte vara null."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Detta fält får inte vara null."
+msgstr "Detta fält får inte vara tomt."
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "Fält av typ: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
@@ -438,13 +435,13 @@ msgid "E-mail address"
msgstr "E-postadress"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Sökväg till fil"
#: db/models/fields/__init__.py:841
msgid "This value must be a float."
-msgstr ""
+msgstr "Detta värde måste vara ett flyttal."
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -452,7 +449,7 @@ msgstr "Flyttal"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "Stort (8 byte) heltal"
#: db/models/fields/__init__.py:915
msgid "IP address"
@@ -486,24 +483,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML-text"
-#: db/models/fields/related.py:804
-#, fuzzy, python-format
+#: db/models/fields/related.py:815
+#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr "%(name)s-objekt med primärnyckel %(key)r finns inte."
+msgstr "Modell %(model)s med primärnyckel %(pk)r finns inte."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "Främmande nyckel (typ bestäms av relaterat fält)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "Ett-till-ett-samband"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "Många-till-många-samband"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -550,7 +547,7 @@ msgstr "Fyll i ett giltigt datum/tid."
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
-msgstr "Ingen fil skickades. Kontrollera kodningnstypen i formuläret."
+msgstr "Ingen fil skickades. Kontrollera kodningstypen i formuläret."
#: forms/fields.py:461
msgid "No file was submitted."
@@ -570,6 +567,8 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Var vänlig antingen skicka en fil eller markera kryssrutan för att rensa, "
+"inte både och. "
#: forms/fields.py:518
msgid ""
@@ -586,122 +585,123 @@ msgstr ""
"Välj ett giltigt alternativ. %(value)s finns inte bland tillgängliga "
"alternativ."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Fyll i en lista med värden."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Sortering"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Radera"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Rätta till felet nedan."
+msgstr "Var vänlig korrigera duplikatdata för %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
+msgstr "Var vänlig korrigera duplikatdata för %(field)s, som måste vara unik."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
+"Var vänlig korrigera duplikatdata för %(field_name)s som måste vara unik för "
+"%(lookup)s i %(date_field)s."
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "Rätta till felet nedan."
+msgstr "Vänligen korrigera duplikatvärdena nedan."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
+"Den infogade främmande nyckeln matchade inte den överordnade instansens "
+"primära nyckel."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Välj ett giltigt alternativ. Det valet finns inte bland tillgängliga "
"alternativ."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
"Välj ett giltigt alternativ. %s finns inte bland tillgängliga alternativ."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "En primärnyckel kan inte ha värde \"%s\""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Aktuell:"
+msgstr "Nuvarande"
#: forms/widgets.py:300
msgid "Change"
msgstr "Ändra"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "år"
+msgstr "Rensa"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Okänt"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Ja"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Nej"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ja,nej,kanske"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d byte"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr "%s kB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -882,12 +882,12 @@ msgstr "dec"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "jan."
+msgstr "jan"
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "feb."
+msgstr "feb"
#: utils/dates.py:33
msgctxt "abbrev. month"
@@ -917,96 +917,84 @@ msgstr "juli"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "aug."
+msgstr "aug"
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "sept."
+msgstr "sep"
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "okt."
+msgstr "okt"
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "nov."
+msgstr "nov"
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "dec."
+msgstr "dec"
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "januari"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "februari"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "mars"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "april"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "maj"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "juni"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "juli"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "augusti"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "september"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "oktober"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "november"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "december"
@@ -1018,7 +1006,7 @@ msgstr "eller"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1070,23 +1058,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "Y-m-d"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "Y-m-d H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
@@ -1104,3 +1092,55 @@ msgstr "%(verbose_name)s uppdaterades."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s togs bort."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s togs bort."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s uppdaterades."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/ta/LC_MESSAGES/django.mo b/django/conf/locale/ta/LC_MESSAGES/django.mo
index ad5560a02f..a31b8b092d 100644
--- a/django/conf/locale/ta/LC_MESSAGES/django.mo
+++ b/django/conf/locale/ta/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/ta/LC_MESSAGES/django.po b/django/conf/locale/ta/LC_MESSAGES/django.po
index 9625684eb3..66de3f4e53 100644
--- a/django/conf/locale/ta/LC_MESSAGES/django.po
+++ b/django/conf/locale/ta/LC_MESSAGES/django.po
@@ -1,44 +1,38 @@
-# translation of django-new.po to tamil
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# PONNUSAMY.A <ponnusamy.simpleman@gmail.com>, 2007.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:01+0100\n"
-"PO-Revision-Date: 2007-03-15 16:48+0530\n"
-"Last-Translator: PONNUSAMY <ponnusamy.simpleman@gmail.com>\n"
-"Language-Team: tamil <tamilinix@yahoogroups.com>\n"
+"POT-Creation-Date: 2011-02-28 17:37+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=n>1;\n"
+"Language: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
msgstr "அரபிக்"
#: conf/global_settings.py:45
-#, fuzzy
msgid "Bulgarian"
-msgstr "ஹங்கேரியன்"
+msgstr ""
#: conf/global_settings.py:46
msgid "Bengali"
msgstr "பெங்காலி"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "ரோமானியன்"
+msgstr ""
#: conf/global_settings.py:48
-#, fuzzy
msgid "Catalan"
-msgstr "இத்தாலியன்"
+msgstr ""
#: conf/global_settings.py:49
msgid "Czech"
@@ -65,305 +59,291 @@ msgid "English"
msgstr "ஆங்கிலம்"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "ஆங்கிலம்"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "ஸ்பானிஷ்"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "அர்ஜெண்டியன் ஸ்பானிஷ் "
+msgstr ""
#: conf/global_settings.py:58
#, fuzzy
-msgid "Estonian"
-msgstr "ரோமானியன்"
+msgid "Mexican Spanish"
+msgstr "ஸ்பானிஷ்"
#: conf/global_settings.py:59
-msgid "Basque"
+msgid "Estonian"
msgstr ""
#: conf/global_settings.py:60
-#, fuzzy
-msgid "Persian"
-msgstr "செர்பியன்"
+msgid "Basque"
+msgstr ""
#: conf/global_settings.py:61
+msgid "Persian"
+msgstr ""
+
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "பீனீஷ்"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "ப்ரென்சு"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "பிரேசிலியன்"
+msgstr ""
-#: conf/global_settings.py:64
-#, fuzzy
+#: conf/global_settings.py:65
msgid "Irish"
-msgstr "துருக்கிஷ்"
+msgstr ""
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "கலீஷீயன்"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "ஹீப்ரு"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:68
-#, fuzzy
+#: conf/global_settings.py:69
msgid "Croatian"
-msgstr "ரோமானியன்"
+msgstr ""
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "ஹங்கேரியன்"
-#: conf/global_settings.py:70
+#: conf/global_settings.py:71
msgid "Indonesian"
msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "ஐஸ்லான்டிக்"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "இத்தாலியன்"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "ஜப்பானிய"
-#: conf/global_settings.py:74
-#, fuzzy
+#: conf/global_settings.py:75
msgid "Georgian"
-msgstr "ஜெர்மன்"
+msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr ""
-#: conf/global_settings.py:76
-#, fuzzy
+#: conf/global_settings.py:77
msgid "Kannada"
-msgstr "மற்றும்"
+msgstr ""
-#: conf/global_settings.py:77
-#, fuzzy
+#: conf/global_settings.py:78
msgid "Korean"
-msgstr "நார்வீசியன்"
+msgstr ""
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr ""
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr ""
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr ""
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
+#: conf/global_settings.py:83
msgid "Mongolian"
msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "டச்சு"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "நார்வீசியன்"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "நார்வீசியன்"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "நார்வீசியன்"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
-#, fuzzy
+#: conf/global_settings.py:89
msgid "Polish"
-msgstr "ஆங்கிலம்"
+msgstr ""
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:90
-#, fuzzy
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
-msgstr "பிரேசிலியன்"
+msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "ரோமானியன்"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "ரஷ்யன்"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "சுலோவாக்"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "ஸ்லோவேனியன்"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "ரோமானியன்"
+msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "செர்பியன்"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "செர்பியன்"
+msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "சுவிடிஷ்"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "தமிழ்"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "தமிழ்"
+msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "துருக்கிஷ்"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "உக்ரேனியன்"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "முதல் பெயர்"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "எளிய சீன மொழி"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "மரபு சீன மொழி"
-#: core/validators.py:20 forms/fields.py:67
-#, fuzzy
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
-msgstr "முறையான கோப்புப் பெயரை எழுதவும்"
-
-#: core/validators.py:87 forms/fields.py:574
-#, fuzzy
-msgid "Enter a valid URL."
-msgstr "முறையான கோப்புப் பெயரை எழுதவும்"
+msgstr ""
#: core/validators.py:89 forms/fields.py:575
-#, fuzzy
msgid "This URL appears to be a broken link."
-msgstr "%s என்ற இணையதள முகவரி உடைந்துள்ளது"
+msgstr ""
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr ""
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "முறையான e முகவரிகள் மட்டும் எழுதவும்"
-#: core/validators.py:123 forms/fields.py:958
-#, fuzzy
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
-msgstr "இந்த மதிப்பு எழுத்துகள், எண்கள், அன்டர்ஸ்கோர் டஷ் அல்லது கைப்பன் மற்றும் உள்ளடக்க வேண்டும்"
+msgstr ""
-#: core/validators.py:126 forms/fields.py:951
-#, fuzzy
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
-msgstr "முறையான e முகவரிகள் மட்டும் எழுதவும்"
+msgstr ""
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "இங்கு எண்களை மட்டுமே எழுதவும் காமவாள் தனிமைபடுத்தவும் "
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field)s, %(value)s ஆக இருந்தால் இந்த புலம் இருக்க வேண்டும்"
+msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
-#, fuzzy, python-format
+#: db/models/base.py:784 db/models/base.py:792
+#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(fieldname)s உடன் உள்ள %(optname)s ஏற்கனவே உள்ளது"
+msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "மற்றும்"
@@ -377,9 +357,8 @@ msgid "This field cannot be null."
msgstr "இந்த புலம் காலியாக இருக்கக் கூடாது"
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "இந்த புலம் காலியாக இருக்கக் கூடாது"
+msgstr ""
#: db/models/fields/__init__.py:70
#, python-format
@@ -405,9 +384,9 @@ msgid "Boolean (Either True or False)"
msgstr "பூலியன் (சரி அல்லது தவறு)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
-#, fuzzy, python-format
+#, python-format
msgid "String (up to %(max_length)s)"
-msgstr "உரை (%(maxlength)s வரைக்கும்)"
+msgstr ""
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
@@ -422,24 +401,21 @@ msgid "Enter a valid date in YYYY-MM-DD format."
msgstr "வவவவ-மாமா-நாநா என்ற அமைப்பில் உள்ள முறையான தேதி மட்டுமே எழுதவும்"
#: db/models/fields/__init__.py:589
-#, fuzzy, python-format
+#, python-format
msgid "Invalid date: %s"
-msgstr "முறையல்லாத தேதி: %s"
+msgstr ""
#: db/models/fields/__init__.py:670
-#, fuzzy
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
msgstr ""
-"வவவவ-மாமா-நாநா மம-நிநி என்ற அமைப்பில் உள்ள முறையான தேதி/நேரம் மட்டுமே எழுதவும்"
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
msgstr "தேதி (நேரமுடன்)"
#: db/models/fields/__init__.py:746
-#, fuzzy
msgid "This value must be a decimal number."
-msgstr "இந்த மதிப்பு முழுவெண்ணாக இருக்க வேண்டும"
+msgstr ""
#: db/models/fields/__init__.py:748
msgid "Decimal number"
@@ -450,14 +426,13 @@ msgid "E-mail address"
msgstr "மின் அஞ்சல்"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "கோப்புப் பாதை"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "இந்த மதிப்பு முழுவெண்ணாக இருக்க வேண்டும"
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -472,9 +447,8 @@ msgid "IP address"
msgstr "IP விலாசம்"
#: db/models/fields/__init__.py:931
-#, fuzzy
msgid "This value must be either None, True or False."
-msgstr "இந்த மதிப்பு சரி அல்லது தவறாக இருக்க வேண்டும்"
+msgstr ""
#: db/models/fields/__init__.py:933
msgid "Boolean (Either True, False or None)"
@@ -489,9 +463,8 @@ msgid "Time"
msgstr "நேரம்"
#: db/models/fields/__init__.py:1044
-#, fuzzy
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "மம-நிநி என்ற அமைப்பில் உள்ள முறையான நேரம் மட்டுமே எழுதவும்"
+msgstr ""
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -501,24 +474,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML உரை"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -534,9 +507,8 @@ msgid "Enter a whole number."
msgstr "முழு எண் மட்டுமே எழுதவும்"
#: forms/fields.py:253 forms/fields.py:274
-#, fuzzy
msgid "Enter a number."
-msgstr "முழு எண் மட்டுமே எழுதவும்"
+msgstr ""
#: forms/fields.py:277
#, python-format
@@ -554,19 +526,16 @@ msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr ""
#: forms/fields.py:342 forms/fields.py:918
-#, fuzzy
msgid "Enter a valid date."
-msgstr "முறையான கோப்புப் பெயரை எழுதவும்"
+msgstr ""
#: forms/fields.py:370 forms/fields.py:919
-#, fuzzy
msgid "Enter a valid time."
-msgstr "முறையான கோப்புப் பெயரை எழுதவும்"
+msgstr ""
#: forms/fields.py:396
-#, fuzzy
msgid "Enter a valid date/time."
-msgstr "முறையான கோப்புப் பெயரை எழுதவும்"
+msgstr ""
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
@@ -599,123 +568,117 @@ msgstr ""
"அல்லது கெட்டுப்போன கோப்பாகும்"
#: forms/fields.py:650 forms/fields.py:725
-#, fuzzy, python-format
+#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "முறையான விருப்பத்தைத் தேர்வு செய்யவும்; '%(data)s என்பது %(choices)s இல் இல்லை"
+msgstr ""
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
-#, fuzzy
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
-msgstr "முறையான கோப்புப் பெயரை எழுதவும்"
+msgstr ""
-#: forms/formsets.py:308 forms/formsets.py:310
-#, fuzzy
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
-msgstr "வரிசைப்படுத்து:"
+msgstr ""
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "நீக்குக"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "கீழே உள்ள தவறுயைத் திருத்துக"
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "கீழே உள்ள தவறுயைத் திருத்துக"
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
-#, fuzzy
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "முறையான விருப்பத்தைத் தேர்வு செய்யவும்; '%(data)s என்பது %(choices)s இல் இல்லை"
+msgstr ""
-#: forms/models.py:1019
-#, fuzzy, python-format
+#: forms/models.py:984
+#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
-msgstr "முறையான விருப்பத்தைத் தேர்வு செய்யவும்; '%(data)s என்பது %(choices)s இல் இல்லை"
+msgstr ""
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "தற்போது:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "மாற்றுக"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "வருடம்"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "தெரியாத"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "ஆம்"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "இல்லை"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ஆம், இல்லை, இருக்கலாம்"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
msgstr[1] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr ""
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
msgstr ""
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
msgstr ""
@@ -773,14 +736,12 @@ msgid "Sunday"
msgstr "ஞாயிறு"
#: utils/dates.py:10
-#, fuzzy
msgid "Mon"
-msgstr "திங்கள்"
+msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Tue"
-msgstr "செவ்வாய்"
+msgstr ""
#: utils/dates.py:10
msgid "Wed"
@@ -791,18 +752,16 @@ msgid "Thu"
msgstr ""
#: utils/dates.py:10
-#, fuzzy
msgid "Fri"
-msgstr "வெள்ளி"
+msgstr ""
#: utils/dates.py:11
msgid "Sat"
msgstr ""
#: utils/dates.py:11
-#, fuzzy
msgid "Sun"
-msgstr "ஞாயிறு"
+msgstr ""
#: utils/dates.py:18
msgid "January"
@@ -903,139 +862,126 @@ msgstr "டிச"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "ஜன."
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "பிப்."
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "மார்ச்"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "ஏப்ரல்"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "மே"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "ஜூன்"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "ஜூலை"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "ஆக."
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "செப்."
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "அக்."
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "நவ."
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "டிச."
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "ஜனவரி"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "பிப்ரவரி"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "மார்ச்"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "ஏப்ரல்"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "மே"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "ஜூன்"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "ஜூலை"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "ஆகஸ்டு"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "செப்டம்பர்"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "அக்டோபர்"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "நவம்பர்"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "டிசம்பர்"
+msgstr ""
#: utils/text.py:136
-#, fuzzy
msgid "or"
-msgstr "மணி"
+msgstr ""
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
@@ -1079,9 +1025,8 @@ msgstr[0] "நிமிடம்"
msgstr[1] "நிமிடங்கள்"
#: utils/timesince.py:45
-#, fuzzy
msgid "minutes"
-msgstr "நிமிடம்"
+msgstr ""
#: utils/timesince.py:50
#, python-format
@@ -1093,23 +1038,23 @@ msgstr ""
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "தேதி_முறை"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "தேதிநேரம்_முறை"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "நேரம்_முறை"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "வருடம்_மாதம்_முறை"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "மாதம்_நாள்_முறை"
@@ -1127,3 +1072,55 @@ msgstr "%(verbose_name)s வெற்றிகரமாக மாற்றபட
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s நீக்கப்பட்டுள்ளது"
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s நீக்கப்பட்டுள்ளது"
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s வெற்றிகரமாக மாற்றபட்டு விட்டது"
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/te/LC_MESSAGES/django.mo b/django/conf/locale/te/LC_MESSAGES/django.mo
index eb29534e24..21086e9b1a 100644
--- a/django/conf/locale/te/LC_MESSAGES/django.mo
+++ b/django/conf/locale/te/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/te/LC_MESSAGES/django.po b/django/conf/locale/te/LC_MESSAGES/django.po
index 93511fefa8..4f14121d2e 100644
--- a/django/conf/locale/te/LC_MESSAGES/django.po
+++ b/django/conf/locale/te/LC_MESSAGES/django.po
@@ -1,20 +1,18 @@
-# translation of django.po to Telugu
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:02+0100\n"
-"PO-Revision-Date: 2008-09-09 21:24+0530\n"
-"Last-Translator: Thejaswi Puthraya <thejaswi.puthraya@gmail.com>\n"
-"Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n"
+"POT-Creation-Date: 2011-02-28 17:38+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: veeven <veeven@gmail.com>\n"
+"Language-Team: Telugu <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=n>1;\n"
+"Language: te\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -22,24 +20,23 @@ msgstr "ఆరబిక్"
#: conf/global_settings.py:45
msgid "Bulgarian"
-msgstr "బల్గెరియన్"
+msgstr "బల్గేరియన్"
#: conf/global_settings.py:46
msgid "Bengali"
-msgstr "బెంగాలి"
+msgstr "బెంగాలీ"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "ఎస్టొనియన్"
+msgstr "బోస్నియన్"
#: conf/global_settings.py:48
msgid "Catalan"
-msgstr "కటలాన్"
+msgstr "కాటలాన్"
#: conf/global_settings.py:49
msgid "Czech"
-msgstr "క్జెఖ్"
+msgstr "ఛెక్"
#: conf/global_settings.py:50
msgid "Welsh"
@@ -47,7 +44,7 @@ msgstr "వెల్ష్"
#: conf/global_settings.py:51
msgid "Danish"
-msgstr "డానిశ్"
+msgstr "డానిష్"
#: conf/global_settings.py:52
msgid "German"
@@ -59,299 +56,294 @@ msgstr "గ్రీక్"
#: conf/global_settings.py:54
msgid "English"
-msgstr "ఆంగ్లము"
+msgstr "ఆంగ్లం"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "ఆంగ్లము"
+msgstr "బ్రిటీష్ ఆంగ్లం"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "స్పానిష్"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "అర్జంటీనా స్పానిష్"
+msgstr "అర్జెంటీనా స్పానిష్"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "అర్జెంటీనా స్పానిష్"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "ఎస్టొనియన్"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
-msgstr "బాస్క"
+msgstr "బాస్క్"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "పారసీ"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "ఫీన్నిష్"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "ఫ్రెంచ్"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "ఫ్రియెస్లాండ్"
+msgstr "ఫ్రిసియన్"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "ఐరిష్"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "గలిసియన్"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
-msgstr "హెబ్రివ్"
+msgstr "హీబ్రూ"
-#: conf/global_settings.py:67
-#, fuzzy
+#: conf/global_settings.py:68
msgid "Hindi"
-msgstr "హైలాండ్"
+msgstr "హిందీ"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
-msgstr "క్రొయెటియన్"
+msgstr "క్రొయేషియన్"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
-msgstr "హంగారియన్"
+msgstr "హంగేరియన్"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "మెసిడొనియన్"
+msgstr "ఇండోనేషియన్"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
-msgstr "ఐస్ లాండిక్"
+msgstr "ఐస్లాండిక్"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "ఇటాలియవ్"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
-msgstr "జపనీస్"
+msgstr "జపనీ"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
-msgstr "జ్యొర్జీన్"
+msgstr "జార్జియన్"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "ఖ్మెర్"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "కన్నడ"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "కొరియన్"
-#: conf/global_settings.py:78
-msgid "Lithuanian"
-msgstr "లిత్ఠువెనీను"
-
#: conf/global_settings.py:79
-msgid "Latvian"
-msgstr "లాట్వీను"
+msgid "Lithuanian"
+msgstr "లిథుయేనియన్"
#: conf/global_settings.py:80
-msgid "Macedonian"
-msgstr "మెసిడొనియన్"
+msgid "Latvian"
+msgstr "లాత్వియన్"
#: conf/global_settings.py:81
-#, fuzzy
-msgid "Malayalam"
-msgstr "మలగా"
+msgid "Macedonian"
+msgstr "మెసిడోనియన్"
#: conf/global_settings.py:82
-#, fuzzy
-msgid "Mongolian"
-msgstr "మెసిడొనియన్"
+msgid "Malayalam"
+msgstr "మలయాళం"
#: conf/global_settings.py:83
-msgid "Dutch"
-msgstr "డచ్చ"
+msgid "Mongolian"
+msgstr "మంగోలియన్"
#: conf/global_settings.py:84
-msgid "Norwegian"
-msgstr "నార్వీజియన్"
+msgid "Dutch"
+msgstr "డచ్"
#: conf/global_settings.py:85
-#, fuzzy
-msgid "Norwegian Bokmal"
+msgid "Norwegian"
msgstr "నార్వీజియన్"
#: conf/global_settings.py:86
-#, fuzzy
-msgid "Norwegian Nynorsk"
-msgstr "నార్వీజియన్"
+msgid "Norwegian Bokmal"
+msgstr ""
#: conf/global_settings.py:87
-msgid "Punjabi"
+msgid "Norwegian Nynorsk"
msgstr ""
#: conf/global_settings.py:88
+msgid "Punjabi"
+msgstr "పంజాబీ"
+
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "పొలిష్"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
-msgstr "పుర్తగాలి"
+msgstr "పోర్చుగీస్"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
-msgstr "బ్రజీలియన్ పుర్తగాలి"
+msgstr "బ్రజీలియన్ పోర్చుగీస్"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "రొమానియన్"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
-msgstr "రషియన్"
+msgstr "రష్యన్"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "స్లొవాక్"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "స్లొవానియన్"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "అలకంట్"
+msgstr "అల్బేనియన్"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
-msgstr "సర్బియన్"
+msgstr "సెర్బియన్"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "సర్బియన్"
+msgstr "సెర్బియన్ లాటిన్"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "స్వీడిష్"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
-msgstr "తమిళ్"
+msgstr "తమిళం"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "తెలుగు"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "తమిళ్"
+msgstr "థాయి"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
-msgstr "టర్కిశ్"
+msgstr "టర్కిష్"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
-msgstr "యుక్రానియన్"
+msgstr "ఉక్రేనియన్"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "వియెన్నా"
+msgstr "వియెత్నామీ"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
-msgstr "వాడుక చైనీస్"
+msgstr "సరళ చైనీ"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
-msgstr "గ్రాంధిక చైనీస్"
+msgstr "సాంప్రదాయ చైనీ"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
-msgstr "దయచేసి సరైన వెల ఇవ్వండి."
-
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "దయచేసి సరైన URL ఇవ్వండి."
+msgstr "సరైన విలువని ఇవ్వండి."
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr ""
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "సరైన URL ఇవ్వండి."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
-msgstr "సరైన ఇటపా ఇవ్వండి"
+msgstr "సరైన ఈమెయిలు చిరునామాను ఇవ్వండి."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "దయచేసి సరైన IPv4 అడ్రస్ ఇవ్వండి"
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "కామాల తో అంకెలు విడడీసి ఇవ్వండి "
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "%(field)s %(value)s ఐతే ఈ ఫీల్డ్ ఇవ్వాలి "
+msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr ""
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "మరియు"
@@ -365,9 +357,8 @@ msgid "This field cannot be null."
msgstr "ఈ ఫీల్డ్ కాళీగా ఉందకూడడు "
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "ఈ ఫీల్డ్ కాళీగా ఉందకూడడు "
+msgstr "ఈ ఖాళీని తప్పనిసరిగా పూరించాలి"
#: db/models/fields/__init__.py:70
#, python-format
@@ -378,24 +369,24 @@ msgstr ""
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
#: db/models/fields/__init__.py:1018
msgid "Integer"
-msgstr "అంకె"
+msgstr "పూర్ణసంఖ్య"
#: db/models/fields/__init__.py:455 db/models/fields/__init__.py:869
msgid "This value must be an integer."
-msgstr "ఈ విలువ లో ఉందాలి"
+msgstr "ఈ విలువ తప్పనిసరిగా పూర్ణసంఖ్య అయివుండాలి."
#: db/models/fields/__init__.py:493
msgid "This value must be either True or False."
-msgstr "ఈ విలువ తప్పైన ఒప్పైన ఉందాలి"
+msgstr "ఈ విలువ తప్పనిసరిగా సత్యము లేదా అసత్యము అయివుండాలి."
#: db/models/fields/__init__.py:495
msgid "Boolean (Either True or False)"
-msgstr "బూలియన్ (అవునా లెక కాదా)"
+msgstr "బూలియన్ (అవునా లేక కాదా)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
#, python-format
msgid "String (up to %(max_length)s)"
-msgstr ""
+msgstr "పదబంధం (గరిష్ఠం %(max_length)s)"
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
@@ -403,20 +394,20 @@ msgstr "కామా తో విడడీసిన సంఖ్య"
#: db/models/fields/__init__.py:584
msgid "Date (without time)"
-msgstr "తేది (సమయం లేకుండా)"
+msgstr "తేదీ (సమయం లేకుండా)"
#: db/models/fields/__init__.py:588
msgid "Enter a valid date in YYYY-MM-DD format."
-msgstr "దయచేసి సరైన తెది (YYYY-MM-DD రూపలావన్యం) ఇవ్వండి"
+msgstr "సరైన తేదీని (YYYY-MM-DD రూపంలో) ఇవ్వండి."
#: db/models/fields/__init__.py:589
#, python-format
msgid "Invalid date: %s"
-msgstr "సరికాని తారీఖు : %s."
+msgstr "చెల్లని తేదీ: %s"
#: db/models/fields/__init__.py:670
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
-msgstr "దయచేసి సరైన తెది/సమయం (YYYY-MM-DD HH:MM[:ss[.uuuuuu]] రూపలావన్యం) ఇవ్వండి"
+msgstr "సరైన తేదీ/సమయాన్ని (YYYY-MM-DD HH:MM[:ss[.uuuuuu]] రూపంలో) ఇవ్వండి."
#: db/models/fields/__init__.py:672
msgid "Date (with time)"
@@ -435,14 +426,13 @@ msgid "E-mail address"
msgstr "ఇటపా"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "ఫైల్ పాత్"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "ఈ విలువ లో ఉందాలి"
+msgstr ""
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -484,24 +474,24 @@ msgstr "URL"
msgid "XML text"
msgstr "ఎక్స్ ఎమ్ ఎల్"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "\"Control\" కాని \"Command\" మాక్ లో నొక్కి ఉంచండి , ఒకటి కన్న ఎక్కువ ఎన్నుకోవటానికి"
@@ -578,119 +568,116 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr ""
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr ""
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "అంతరము"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "తొలగించు"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "క్రింద ఉన్న తప్పు సరిదిద్దుకోండి"
+msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "క్రింద ఉన్న తప్పు సరిదిద్దుకోండి"
+msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "ప్రస్తుతం:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "మార్చు"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "సంవత్సరం"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "తెలియనది"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "అవును"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "కాదు"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "అవును, కాదు , ఏమొ"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d byte"
msgstr[1] "%(size)d bytes"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -871,12 +858,12 @@ msgstr "డిస్"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "జాన్"
+msgstr "జన."
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "ఫిబ్"
+msgstr "ఫిబ్ర."
#: utils/dates.py:33
msgctxt "abbrev. month"
@@ -886,7 +873,7 @@ msgstr "మార్చి"
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "ఎప్రిల్"
+msgstr "ఏప్రి."
#: utils/dates.py:35
msgctxt "abbrev. month"
@@ -896,106 +883,94 @@ msgstr "మే"
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "జూను"
+msgstr "జూన్"
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "జులై"
+msgstr "జూలై"
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "ఆగ్"
+msgstr "ఆగ."
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "సెప్"
+msgstr "సెప్టెం."
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "అక్ట్"
+msgstr "అక్టో."
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "నవ్"
+msgstr "నవం."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "డిస్"
+msgstr "డిసెం."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "జాన్వరి "
+msgstr "జనవరి"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "ఫిబ్రవరి"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "మార్చి"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "ఎప్రిల్"
+msgstr "ఏప్రిల్"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "మే"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "జూను"
+msgstr "జూన్"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "జులై"
+msgstr "జూలై"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "ఆగష్టు"
+msgstr "ఆగస్ట్"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "సెప్టెంబర్"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "అక్టోబర్"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "నవంబర్"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "డిసెంబర్"
@@ -1007,7 +982,7 @@ msgstr "లెక"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1059,23 +1034,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "తెది_రూపలావణ్యం"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "తెదిసమయం_రూపలావన్యం"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "సమయం_రూపలావణ్యం"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "సంవత్సరం_మాసము_రూపలావణ్యం"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "మాసము_దినము_రూపలావణ్యం"
@@ -1093,3 +1068,55 @@ msgstr "%(verbose_name)s జయప్రదంగా @@"
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s తీసివేయబడినది"
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s తీసివేయబడినది"
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s జయప్రదంగా @@"
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/th/LC_MESSAGES/django.mo b/django/conf/locale/th/LC_MESSAGES/django.mo
index c7de770ee3..749ce74f51 100644
--- a/django/conf/locale/th/LC_MESSAGES/django.mo
+++ b/django/conf/locale/th/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/th/LC_MESSAGES/django.po b/django/conf/locale/th/LC_MESSAGES/django.po
index b7ca96b4c6..746c499319 100644
--- a/django/conf/locale/th/LC_MESSAGES/django.po
+++ b/django/conf/locale/th/LC_MESSAGES/django.po
@@ -2,20 +2,17 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Django-1.1-rc-1\n"
+"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:02+0100\n"
-"PO-Revision-Date: 2009-07-28 22:31+0700\n"
-"Last-Translator: Kowit Charoenratchatabhan <kowito@felspar.com>\n"
-"Language-Team: Kowit Charoenratchatabhan<kowito@felspar.com>,Kadsarin "
-"Sanjek, Felspar,Theppitak Karoonboonyanan <thep@linux.thai.net>\n"
+"POT-Creation-Date: 2011-02-28 17:38+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: jonathanz <monkeycrew_topza@hotmail.com>\n"
+"Language-Team: Thai <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Thai\n"
-"X-Poedit-Country: THAILAND\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: th\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -30,9 +27,8 @@ msgid "Bengali"
msgstr "เบ็งกาลี"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "เอสโตเนีย"
+msgstr "บอสเนีย"
#: conf/global_settings.py:48
msgid "Catalan"
@@ -63,317 +59,312 @@ msgid "English"
msgstr "อังกฤษ"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "อังกฤษ"
+msgstr "อังกฤษ - สหราชอาณาจักร"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "สเปน"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "สเปน (อาร์เจนตินา)"
+msgstr "สเปน - อาร์เจนติน่า"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "สเปน - อาร์เจนติน่า"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "เอสโตเนีย"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "แบ็ซค์"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "เปอร์เชีย"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "ฟินแลนด์"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "ฝรั่งเศส"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "ฟรายส์แลนด์"
+msgstr "ฟริเซียน"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "ไอริช"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "กาลิเซีย"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "ฮีบรู"
-#: conf/global_settings.py:67
-#, fuzzy
+#: conf/global_settings.py:68
msgid "Hindi"
-msgstr "ไฮแลนด์"
+msgstr "ฮินดี"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "โครเอเชีย"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "ฮังการี"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "มาซิโดเนีย"
+msgstr "อินโดนิเซีย"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "ไอซ์แลนด์"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "อิตาลี"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "ญี่ปุ่น"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "จอร์เจีย"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "เขมร"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "กัณณาท"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "เกาหลี"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "ลิทัวเนีย"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "ลัตเวีย"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "มาซิโดเนีย"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "มายอกา"
+msgstr "มลายู"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "มาซิโดเนีย"
+msgstr "มองโกเลีย"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "ดัตช์"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "นอร์เวย์"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "นอร์เวย์"
+msgstr "นอร์เวย์ - Bokmal"
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "นอร์เวย์"
+msgstr "นอร์เวย์ - Nynorsk"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "ปัญจาบี"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "โปแลนด์"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "โปรตุเกส"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "โปรตุเกส (บราซิล)"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "โรมาเนีย"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "รัสเซีย"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "สโลวัก"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "สโลวีเนีย"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "อลาแคนท์"
+msgstr "อัลแบเนีย"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "เซอร์เบีย"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "เซอร์เบีย"
+msgstr "เซอร์เบียละติน"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "สวีเดน"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "ทมิฬ"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "เตลุคู"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "ทมิฬ"
+msgstr "ไทย"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "ตุรกี"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "ยูเครน"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "เวียนนา"
+msgstr "เวียดนาม"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "จีนตัวย่อ"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "จีนตัวเต็ม"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "กรุณาใส่ค่าที่ถูกต้อง"
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "ใส่ URL ที่ถูกต้อง"
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "URL อาจจะเป็นลิ้งค์ที่เสียหาย."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "ใส่ URL ที่ถูกต้อง"
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "กรุณาใส่อีเมลที่ถูกต้อง"
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "ใส่ 'slug' ประกอปด้วย ตัวหนังสือ ตัวเลข เครื่องหมายขีดล่าง หรือ เครื่องหมายขีด"
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "กรุณาใส่หมายเลขไอพีที่ถูกต้อง"
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "ใส่ตัวเลขที่คั่นด้วยจุลภาคเท่านั้น"
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "ค่านี้มีได้น้อยที่สุด %(min)d ตัวอักษร (ค่านี้คือ %(length)d)."
+msgstr "ค่านี้ต้องเป็น %(limit_value)s (ปัจจุบันคือ %(show_value)s)"
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "ค่านี้ต้องน้อยกว่าหรือเท่ากับ %s."
+msgstr "ค่านี้ต้องน้อยกว่าหรือเท่ากับ %(limit_value)s"
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "ค่านี้ต้องมากกว่าหรือเท่ากับ %s."
+msgstr "ค่านี้ต้องมากกว่าหรือเท่ากับ %(limit_value)s"
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "ค่านี้มีได้น้อยที่สุด %(min)d ตัวอักษร (ค่านี้คือ %(length)d)."
+msgstr ""
+"ค่านี้ต้องมีอย่างน้อย %(limit_value)d ตัวอักษร (ปัจจุบันมีจำนวน %(show_value)d ตัวอักษร)"
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "ค่านี้มีได้มากที่สุด %(max)d ตัวอักษร (ค่านี้คือ %(length)d)."
+msgstr "ค่านี้มีได้ไม่เกิน %(limit_value)d ตัวอักษร (ปัจจุบันมีจำนวน %(show_value)d ตัวอักษร)"
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
+msgstr "%(field_name)s จะต้องไม่ซ้ำกันสำหรับ %(date_field)s %(lookup)s"
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s และ %(field_label)s มีอยู่แล้ว"
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "และ"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "ค่า %r ไม่ถูกต้อง"
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
msgstr "ฟิลด์นี้ไม่สารถปล่อยว่างได้"
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "ฟิลด์นี้ไม่สารถปล่อยว่างได้"
+msgstr "ฟิลด์นี้เว้นว่างไม่ได้"
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "ฟิลด์ข้อมูล: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
@@ -436,14 +427,13 @@ msgid "E-mail address"
msgstr "ที่อยู่อีเมล"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "ตำแหน่งไฟล์"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "ค่านี้ต้องเป็นจำนวนเต็ม"
+msgstr "ค่านี้ต้องเป็นชนิด float หรือตัวเลขจุดทศนิยม"
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -451,7 +441,7 @@ msgstr "เลขทศนิยม"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "จำนวนเต็ม (8 byte)"
#: db/models/fields/__init__.py:915
msgid "IP address"
@@ -486,24 +476,24 @@ msgstr "URL"
msgid "XML text"
msgstr "ข้อความ XML"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr ""
+msgstr "Primary key %(pk)r ของโมเดล %(model)s ไม่มีอยู่จริง"
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "Foreign Key (ชนิดของข้อมูลจะถูกกำหนดจากฟิลด์ที่เกี่ยวข้อง)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "ความสัมพันธ์แบบหนึ่งต่อหนึ่ง"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "ความสัมพันธ์แบบ many-to-many"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "กดปุ่ม \"Control\", หรือ \"Command\" บน Mac ค้างไว้, เพื่อเลือกหลายๆตัวเลือก"
@@ -560,14 +550,14 @@ msgid "The submitted file is empty."
msgstr "ไฟล์ที่ส่งว่างเปล่า"
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "ค่านี้มีได้มากที่สุด %(max)d ตัวอักษร (ค่านี้คือ %(length)d)."
+msgstr "ชื่อไฟล์มีความยาวได้ไม่เกิน %(max)d ตัวอักษร (ปัจจุบันมี %(length)d ตัวอักษร)"
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "โปรดเลือกไฟล์หรือติ๊ก clear checkbox อย่างใดอย่างหนึ่ง"
#: forms/fields.py:518
msgid ""
@@ -580,118 +570,117 @@ msgstr "อัพโหลดรูปที่ถูกต้อง. ไฟล
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "เลือกตัวเลือกที่ถูกต้อง. %(value)s ไม่ใช่ตัวเลือกที่ใช้ได้."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "ใส่รายการ"
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "เรียงลำดับ"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "ลบ"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "โปรดแก้ไขข้อผิดพลาดด้านล่าง"
+msgstr "โปรดแก้ไขข้อมูลที่ซ้ำซ้อนใน %(field)s"
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
+msgstr "โปรดแก้ไขข้อมูลที่ซ้ำซ้อนใน %(field)s ซึ่งจะต้องไม่ซ้ำกัน"
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
+"โปรดแก้ไขข้อมูลซ้ำซ้อนใน %(field_name)s ซึ่งจะต้องไม่ซ้ำกันสำหรับ %(lookup)s ใน %"
+"(date_field)s"
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "โปรดแก้ไขข้อผิดพลาดด้านล่าง"
+msgstr "โปรดแก้ไขค่าที่ซ้ำซ้อนด้านล่าง"
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
+msgstr "Foreign key ไม่สัมพันธ์กับ parent primary key"
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "เลือกตัวเลือกที่ถูกต้อง. ตัวเลือกนั้นไม่สามารถเลือกได้."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "เลือกตัวเลือกที่ถูกต้อง. %s ไม่สามารถเลือกได้"
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" ใช้เป็น primary key ไม่ได้"
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "ปัจจุบัน:"
+msgstr "ปัจจุบัน"
#: forms/widgets.py:300
msgid "Change"
msgstr "เปลี่ยนแปลง"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "ปี"
+msgstr "ล้าง"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "ไม่รู้"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "ใช่"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "ไม่ใช่"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "ใช่,ไม่ใช่,อาจจะ"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d ไบต์"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s กิโลไบต์"
+msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s เมกะไบต์"
+msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s กิกะไบต์"
+msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s กิโลไบต์"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s กิโลไบต์"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -882,27 +871,27 @@ msgstr "ก.พ."
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "มีนาคม"
+msgstr "มี.ค."
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "เมษายน"
+msgstr "เม.ษ."
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "พฤษภาคม"
+msgstr "พ.ค."
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "มิถุนายน"
+msgstr "มิ.ย."
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "กรกฎาคม"
+msgstr "ก.ค."
#: utils/dates.py:38
msgctxt "abbrev. month"
@@ -930,73 +919,61 @@ msgid "Dec."
msgstr "ธ.ค."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "มกราคม"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "กุมภาพันธ์"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "มีนาคม"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "เมษายน"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "พฤษภาคม"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "มิถุนายน"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "กรกฎาคม"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "สิงหาคม"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "กันยายน"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "ตุลาคม"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "พฤศจิกายน"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "ธันวาคม"
@@ -1008,7 +985,7 @@ msgstr "หรือ"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1054,23 +1031,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j N Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "N j, Y, P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "G:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
@@ -1088,3 +1065,55 @@ msgstr "%(verbose_name)s ได้ถูกปรับปรุงเรีย
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s ได้ถูกลบเรียบร้อยแล้ว"
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s ได้ถูกลบเรียบร้อยแล้ว"
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s ได้ถูกปรับปรุงเรียบร้อยแล้ว"
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/tr/LC_MESSAGES/django.mo b/django/conf/locale/tr/LC_MESSAGES/django.mo
index 02ab23df3a..75fb5e989b 100644
--- a/django/conf/locale/tr/LC_MESSAGES/django.mo
+++ b/django/conf/locale/tr/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/tr/LC_MESSAGES/django.po b/django/conf/locale/tr/LC_MESSAGES/django.po
index 24f7bcd407..a4ad77f405 100644
--- a/django/conf/locale/tr/LC_MESSAGES/django.po
+++ b/django/conf/locale/tr/LC_MESSAGES/django.po
@@ -1,19 +1,18 @@
-# translation of django.po to Turkish
# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:02+0100\n"
-"PO-Revision-Date: 2010-05-02 01:06+0300\n"
-"Last-Translator: Metin Amiroff <amiroff@gmail.com>\n"
-"Language-Team: Turkish <bahadir@pardus.org.tr>\n"
+"POT-Creation-Date: 2011-02-28 17:38+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: amiroff <amiroff@gmail.com>\n"
+"Language-Team: Turkish <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: tr\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -68,258 +67,263 @@ msgid "Spanish"
msgstr "İspanyolca"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
msgstr "Arjantin İspanyolcası"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Arjantin İspanyolcası"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Estonca"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Baskça"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Farsça"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Fince"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Fransızca"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr "Frisce"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "İrlandaca"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Galler Dili"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "İbranice"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Hinduca"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Hırvatça"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Macarca"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Makedonca"
+msgstr "Endonezce"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "İzlanda dili"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "İtalyanca"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Japonca"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Gürcüce"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Kamboçyaca"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Kannada Dili"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Korece"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Litovca"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Leton Dili"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Makedonca"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Malaga"
+msgstr "Malayamca"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Monaghan"
+msgstr "Moğolca"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Flamanca"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Norveç Dili"
-#: conf/global_settings.py:85
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
msgstr "Norveçce (Bokmal)"
-#: conf/global_settings.py:86
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
msgstr "Norveçce (Nynorsk)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Punjabice"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Lehçe"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Portekizce"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Brezilya Portekizcesi"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Romence"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Rusça"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Slovakça"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Slovence"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr "Arnavutça"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Sırpça"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr "Sırp Latini"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "İsveççe"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tamilce"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Telugu Dili"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Tayca"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Türkçe"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Ukraynaca"
-#: conf/global_settings.py:104
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
msgstr "Vyetnamca"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Basiteştirilmiş Çince"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Geleneksel Çince"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Geçerli bir değer girin."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Geçerli bir URL girin."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "Bu URL geçersiz bir link gibi duruyor."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Geçerli bir URL girin."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Geçerli bir e-posta adresi girin."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "Lütfen sadece harf, rakam, altçizgi veya çizgiden oluşan değer girin."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Geçerli bir IPv4 adresi girin."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Sadece virgülle ayrılmış sayılar girin."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
"Bu değerin en az %(limit_value)s karakterden oluştuğundan emin olun (şu anki "
"karakter sayısı: %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
"Bu değerin %(limit_value)s karakterden az veya eşit olduğundan emin olun."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
"Bu değerin %(limit_value)s karakterden çok veya eşit olduğundan emin olun."
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
@@ -328,7 +332,7 @@ msgstr ""
"Bu değerin en az %(limit_value)d karakterden oluştuğundan emin olun (şu anki "
"karakter sayısı: %(show_value)d)."
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
@@ -337,19 +341,19 @@ msgstr ""
"Bu değerin en fazla %(limit_value)d karakterden oluştuğundan emin olun (şu "
"anki karakter sayısı: %(show_value)d)."
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
"%(field_name)s değeri %(date_field)s alanı %(lookup)s işlemi için tek "
"olmalıdır."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(field_label)s alanına sahip %(model_name)s zaten mevcuttur."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "ve"
@@ -433,7 +437,7 @@ msgid "E-mail address"
msgstr "E-posta adresi"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Dosya yolu"
@@ -481,24 +485,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML metni"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "Birincil anahtarı %(pk)r olan %(model)s mevcut değil."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr "Yabancı Anahtar (türü ilişkili alana göre belirlenir)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr "Bire-bir ilişki"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr "Çoğa-çok ilişki"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -567,6 +571,8 @@ msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Lütfen ya dosya seçin, ya da sıfırla kutucuğunu işaretleyin. İkisini aynı "
+"anda yapmayın."
#: forms/fields.py:518
msgid ""
@@ -581,31 +587,31 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Geçerli bir seçimde bulunun; %(value)s mevcut değerlerden biri değil."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Değer listesi giriniz."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Sıralama"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Sil"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "Lütfen %(field)s alanları için mükerrer kayıt problemini düzeltin."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
"Lütfen %(field)s alanı için mükerrer verileri düzeltin, bunlar eşsiz "
"olmalıdır."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -614,91 +620,89 @@ msgstr ""
"Lütfen %(field_name)s alanı için mükerrer verileri düzeltin, bunlar %"
"(date_field)s alanı %(lookup)s sorgulamaları için eşsiz olmalıdır."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "Lütfen aşağıdaki mükerrer kayıtları düzeltin."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"İçeride belirtilmiş yabancı anahtar ebeveyin nesnenin birincil anahtarı ile "
"uyuşmadı."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Geçerli bir seçimde bulunun; seçiminiz mevcut değerlerden birisi değil."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Geçerli bir seçimde bulunun; %s mevcut değerlerden biri değil."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr "\"%s\" birincil anahtar için geçerli bir değer değil."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Geçerli:"
+msgstr "Geçerli"
#: forms/widgets.py:300
msgid "Change"
msgstr "Düzenle"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "Clare"
+msgstr "Sıfırla"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Bilinmiyor"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Evet"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Hayır"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "evet,hayır,olabilir"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d bayt"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -937,73 +941,61 @@ msgid "Dec."
msgstr "Ara."
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "Ocak"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "Şubat"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "Mart"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "Nisan"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "Mayıs"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "Haziran"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "Temmuz"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "Ağustos"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "Eylül"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "Ekim"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "Kasım"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "Aralık"
@@ -1015,7 +1007,7 @@ msgstr "ya da"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1061,23 +1053,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "j F Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "j F Y, H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "j F"
@@ -1095,3 +1087,55 @@ msgstr "%(verbose_name)s başarıyla güncellendi."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s silindi."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s silindi."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s başarıyla güncellendi."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/uk/LC_MESSAGES/django.mo b/django/conf/locale/uk/LC_MESSAGES/django.mo
index 54458c9b46..90ef84aae7 100644
--- a/django/conf/locale/uk/LC_MESSAGES/django.mo
+++ b/django/conf/locale/uk/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/uk/LC_MESSAGES/django.po b/django/conf/locale/uk/LC_MESSAGES/django.po
index 46c2bb343d..eaf5c21b32 100644
--- a/django/conf/locale/uk/LC_MESSAGES/django.po
+++ b/django/conf/locale/uk/LC_MESSAGES/django.po
@@ -1,20 +1,19 @@
-# Django, ukrainian translation.
-# Copyright (C) 2008-2010
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:02+0100\n"
-"PO-Revision-Date: 2010-04-06 00:02+0300\n"
-"Last-Translator: Mykola Zamkovoy <nickzam@gmail.com>\n"
-"Language-Team: UK <uk@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:38+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: sergikoff <sergikoff88@gmail.com>\n"
+"Language-Team: Ukrainian <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Language: uk\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -29,9 +28,8 @@ msgid "Bengali"
msgstr "Бенгальська"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "Румунська"
+msgstr "Боснійська"
#: conf/global_settings.py:48
msgid "Catalan"
@@ -62,322 +60,319 @@ msgid "English"
msgstr "Англійська"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Англійська"
+msgstr "Англійська (Великобританія)"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "Іспанська"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "Аргентинська іспанська"
+msgstr "Іспанська (Аргентина)"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Іспанська (Аргентина)"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Румунська"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
-msgstr "Баскський"
+msgstr "Баскська"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Перська"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Фінська"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Французька"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "Фризляндія"
+msgstr "Фризька"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Ірландська"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Галіційська"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Іврит"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "Хінді"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Хорватська"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Угорська"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Македонська"
+msgstr "Індонезійська"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Ісландська"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Італійська"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Японська"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "Грузинська"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Кхмерська"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Канадська"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Корейська"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Литовська"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Латвійська"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Македонська"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "Малага"
+msgstr "Малаялам"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Македонська"
+msgstr "Монгольська"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Голландська"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Норвезька"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Норвезька"
+msgstr "Норвезька (Букмол)"
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Норвезька"
+msgstr "Норвезька (Нюнорськ)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "Панджабі"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Польська"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "Португальська"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "Бразильска"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Румунська"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Російська"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Словацька"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Словенська"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Аліканте"
+msgstr "Албанська"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Сербська"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "Сербська"
+msgstr "Сербська (латинка)"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Шведська"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Тамільська"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "Телугу"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "Тайська"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Турецька"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Українська"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "Відень"
+msgstr "В'єтнамський"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Китайська спрощена"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Китайська традиційна"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Уведіть коректне значення."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Уведіть коректний URL."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "URL %s є пошкодженим посиланням."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Уведіть коректний URL."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Уведіть коректну e-mail адресу."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr ""
"Введіть коректне значення 'slug' (короткого заголовку), що може містити "
"тільки літери, числа, символи підкреслювання та дефіси."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Введіть коректну IPv4 адресу."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Введіть тільки цифри, що розділені комами."
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-"Переконайтеся, що це значення має не менще %(min)d символів (зараз %(length)"
-"d)."
+"Переконайтеся, що це значення дорівнює %(limit_value)s (зараз %(show_value)"
+"s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "Переконайтеся, що це значення менше або дорівнює %s."
+msgstr "Переконайтеся, що це значення менше чи дорівнює %(limit_value)s."
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "Переконайтеся, що це значення більше або дорівнює %s."
+msgstr "Переконайтеся, що це значення більше чи дорівнює %(limit_value)s."
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Переконайтеся, що це значення має не менще %(min)d символів (зараз %(length)"
-"d)."
+"Переконайтеся, що це значення має щонайменше %(limit_value)d символів (зараз "
+"%(show_value)d)."
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-"Переконайтеся, що це значення має не більше %(max)d символів (зараз %(length)"
-"d)."
+"Переконайтеся, що це значення має щонайбільше %(limit_value)d символів "
+"(зараз %(show_value)d)."
-#: db/models/base.py:767
-#, fuzzy, python-format
+#: db/models/base.py:769
+#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr "Це поле повинно бути заданим, у разі якщо %(field)s є %(value)s"
+msgstr "%(field_name)s має бути унікальним для %(date_field)s %(lookup)s."
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s з таким %(field_label)s вже існує."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "та"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "Значення %r не є дозволеним вибором."
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
msgstr "Це поле не може бути пустим."
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "Це поле не може бути пустим."
+msgstr "Це поле не може бути порожнім."
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "Тип поля: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
@@ -398,9 +393,9 @@ msgid "Boolean (Either True or False)"
msgstr "Булеве значення (True або False)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
-#, fuzzy, python-format
+#, python-format
msgid "String (up to %(max_length)s)"
-msgstr "Рядок (до %(maxlength)s символів)"
+msgstr "Рядок (до %(max_length)s)"
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
@@ -440,14 +435,13 @@ msgid "E-mail address"
msgstr "E-mail адреса"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Шлях до файла"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "Це значення повинно бути, принаймні %s."
+msgstr "Це значення має бути дійсним числом."
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -455,7 +449,7 @@ msgstr "Число з плаваючою комою"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "Велике (8 байтів) ціле число"
#: db/models/fields/__init__.py:915
msgid "IP address"
@@ -489,24 +483,24 @@ msgstr "URL"
msgid "XML text"
msgstr "текст XML"
-#: db/models/fields/related.py:804
-#, fuzzy, python-format
+#: db/models/fields/related.py:815
+#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr "%(name)s об'єкт з первинним ключем %(key)r не існує."
+msgstr "Моделі %(model)s з ключем %(pk)r не існує."
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "Зовнішній ключ (тип визначається відповідно поля)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "Один-до-одного"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "Багато-до-багатьох"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr ""
@@ -565,16 +559,18 @@ msgid "The submitted file is empty."
msgstr "Переданий файл порожній."
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
msgstr ""
-"Переконайтеся, що це значення має не більше %(max)d символів (зараз %(length)"
-"d)."
+"Переконайтеся, що ім'я файлу містить щонайбільше %(max)d символів (зараз %"
+"(length)d)."
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
msgstr ""
+"Будь ласка, або завантажте файл, або відмітьте прапорець очищення, а не "
+"обидва варіанти одразу"
#: forms/fields.py:518
msgid ""
@@ -589,122 +585,124 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "Зробить коректний вибір, %(value)s немає серед варіантів вибору."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Введіть список значень."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Послідовність"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Видалити"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "Будь ласка, виправте помилку, що зазначена нижче"
+msgstr "Будь ласка, виправте повторювані дані для поля %(field)s."
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
+"Будь ласка, виправте повторювані дані для поля %(field)s, яке має бути "
+"унікальним."
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
+"Будь ласка, виправте повторювані дані для поля %(field_name)s, яке має бути "
+"унікальним для вибірки %(lookup)s на %(date_field)s."
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "Будь ласка, виправте помилку, що зазначена нижче"
+msgstr "Будь ласка, виправте повторювані значення нижче."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
"Зв'язаний зовнішній ключ не відповідає первісному ключу батьківського "
"екземпляру."
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "Зробить коректний вибір. Такого варіанту нема серед доступних."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "Зробить коректний вибір. Такого варіанту %s нема серед доступних."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" не є допустимим значенням для первинного ключа."
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Зараз:"
+msgstr "Наразі"
#: forms/widgets.py:300
msgid "Change"
msgstr "Змінити"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "рік"
+msgstr "Очистити"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Невідомо"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Так"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Ні"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "так,ні,можливо"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d байт"
msgstr[1] "%(size)d байти"
msgstr[2] "%(size)d байтів"
+msgstr[3] "%(size)d байтів"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s КБ"
+msgstr "%s Кб"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s МБ"
+msgstr "%s Мб"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s ГБ"
+msgstr "%s Гб"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s КБ"
+msgstr "%s Тб"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s КБ"
+msgstr "%s Пб"
#: utils/dateformat.py:42
msgid "p.m."
@@ -940,7 +938,7 @@ msgstr "Лис."
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Груд."
+msgstr "Гру."
#: utils/dates.py:45
msgctxt "alt. month"
@@ -1009,7 +1007,7 @@ msgstr "або"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1017,6 +1015,7 @@ msgid_plural "years"
msgstr[0] "рік"
msgstr[1] "роки"
msgstr[2] "років"
+msgstr[3] "років"
#: utils/timesince.py:22
msgid "month"
@@ -1024,6 +1023,7 @@ msgid_plural "months"
msgstr[0] "місяць"
msgstr[1] "місяці"
msgstr[2] "місяців"
+msgstr[3] "місяців"
#: utils/timesince.py:23
msgid "week"
@@ -1031,6 +1031,7 @@ msgid_plural "weeks"
msgstr[0] "тиждень"
msgstr[1] "тижні"
msgstr[2] "тижнів"
+msgstr[3] "тижнів"
#: utils/timesince.py:24
msgid "day"
@@ -1038,6 +1039,7 @@ msgid_plural "days"
msgstr[0] "день"
msgstr[1] "дні"
msgstr[2] "днів"
+msgstr[3] "днів"
#: utils/timesince.py:25
msgid "hour"
@@ -1045,6 +1047,7 @@ msgid_plural "hours"
msgstr[0] "година"
msgstr[1] "години"
msgstr[2] "годин"
+msgstr[3] "годин"
#: utils/timesince.py:26
msgid "minute"
@@ -1052,6 +1055,7 @@ msgid_plural "minutes"
msgstr[0] "хвилина"
msgstr[1] "хвилини"
msgstr[2] "хвилин"
+msgstr[3] "хвилин"
#: utils/timesince.py:45
msgid "minutes"
@@ -1067,23 +1071,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "d.m.Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "d.m.Y H:i"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "d.m.Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "d.m.Y"
@@ -1101,3 +1105,55 @@ msgstr "Об'єкт %(verbose_name)s був успішно змінений."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "Об'єкт %(verbose_name)s був успішно видалений."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "Об'єкт %(verbose_name)s був успішно видалений."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "Об'єкт %(verbose_name)s був успішно змінений."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/vi/LC_MESSAGES/django.mo b/django/conf/locale/vi/LC_MESSAGES/django.mo
index 77c5a016f3..20cbeb3eb8 100644
--- a/django/conf/locale/vi/LC_MESSAGES/django.mo
+++ b/django/conf/locale/vi/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/vi/LC_MESSAGES/django.po b/django/conf/locale/vi/LC_MESSAGES/django.po
index 060dc7622d..ebf2cb065e 100644
--- a/django/conf/locale/vi/LC_MESSAGES/django.po
+++ b/django/conf/locale/vi/LC_MESSAGES/django.po
@@ -4,14 +4,15 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:02+0100\n"
-"PO-Revision-Date: 2010-02-07 16:11+0700\n"
-"Last-Translator: Hung. NGUYEN Manh <loveleeyoungae@yahoo.com>\n"
-"Language-Team: Vietnamese <vi@li.org>\n"
+"POT-Creation-Date: 2011-02-28 17:38+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: Jannis <jannis@leidel.info>\n"
+"Language-Team: English <en@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -58,9 +59,8 @@ msgid "English"
msgstr "Tiếng Anh"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "Tiếng Anh"
+msgstr ""
#: conf/global_settings.py:56
msgid "Spanish"
@@ -71,275 +71,279 @@ msgid "Argentinian Spanish"
msgstr ""
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "Tiếng Tây Ban Nha"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "Tiếng Estonia"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "Tiếng Baxcơ"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "Tiếng Ba Tư"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "Tiếng Phần Lan"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "Tiếng Pháp"
-#: conf/global_settings.py:63
+#: conf/global_settings.py:64
msgid "Frisian"
msgstr ""
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "Tiếng Ai-len"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "Tiếng Pháp cổ"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "Tiếng Do Thái cổ"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr ""
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "Tiếng Croatia"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "Tiếng Hung-ga-ri"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "Tiếng Maxêđôni"
+msgstr ""
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "Tiếng Aixơlen"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "Tiếng Ý"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "Tiếng Nhật Bản"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr ""
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "Tiếng Khơ-me"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "Tiếng Kannada"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "Tiếng Hàn Quốc"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "Tiếng Lat-vi"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "Ngôn ngữ vùng Bantic"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "Tiếng Maxêđôni"
-#: conf/global_settings.py:81
+#: conf/global_settings.py:82
msgid "Malayalam"
msgstr ""
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "Tiếng Maxêđôni"
+msgstr ""
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "Tiếng Hà Lan"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "Tiếng Nauy"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "Tiếng Nauy"
+msgstr ""
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "Tiếng Nauy"
+msgstr ""
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
msgstr ""
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "Tiếng Ba lan"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr ""
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr ""
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "Tiếng Ru-ma-ni"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "Tiếng Nga"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "Ngôn ngữ Slô-vac"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "Tiếng Slôven"
-#: conf/global_settings.py:95
+#: conf/global_settings.py:96
msgid "Albanian"
msgstr ""
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "Tiếng Xéc-bi"
-#: conf/global_settings.py:97
+#: conf/global_settings.py:98
msgid "Serbian Latin"
msgstr ""
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "Tiếng Thụy Điển"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "Tiếng Ta-min"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr ""
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr ""
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "Tiếng Thổ Nhĩ Kỳ"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "Tiếng Ukraina"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "Thành phố Viên"
+msgstr ""
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "Tiếng Trung Hoa giản thể"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "Tiếng Trung Hoa truyền thống"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "Nhập một giá trị hợp lệ."
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "Nhập một URL hợp lệ."
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "URL này có vẻ là một liên kết bị đứt gãy."
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "Nhập một URL hợp lệ."
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "Hãy nhập địa chỉ email hợp lệ."
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "Nhập một 'slug' hợp lệ gồm chữ cái, số, gạch dưới và gạch nối."
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "Nhập một địa chỉ IPv4 hợp lệ."
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "Chỉ nhập chữ số, cách nhau bằng dấu phẩy."
-#: core/validators.py:135
+#: core/validators.py:153
#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr ""
-#: core/validators.py:164
+#: core/validators.py:182
#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: core/validators.py:170
+#: core/validators.py:188
#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
msgstr ""
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr ""
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "%(model_name)s có %(field_label)s đã tồn tại."
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "và"
@@ -423,7 +427,7 @@ msgid "E-mail address"
msgstr "Địa chỉ email"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "Đường dẫn tắt tới file"
@@ -471,24 +475,24 @@ msgstr "Đường dẫn URL"
msgid "XML text"
msgstr ""
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr ""
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
msgstr ""
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
msgstr ""
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
msgstr ""
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "Giữ \"Control\", hoặc \"Command\" trên Mac, để chọn nhiều hơn một."
@@ -570,121 +574,119 @@ msgstr ""
"Hãy chọn một lựa chọn hợp lệ. %(value)s không phải là một trong các lựa chọn "
"khả thi."
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "Nhập một danh sách giá trị."
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "Thứ tự"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "Xóa"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr ""
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr ""
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr ""
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr ""
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr ""
"Hãy chọn một lựa chọn hợp lệ. Lựa chọn đó không phải là một trong các lựa "
"chọn khả thi."
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr ""
"Hãy chọn một lựa chọn hợp lệ. %s không phải là một trong các lựa chọn khả "
"thi."
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
msgstr ""
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "Hiện tại:"
+msgstr ""
#: forms/widgets.py:300
msgid "Change"
msgstr "Thay đổi"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "năm"
+msgstr ""
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "Chưa xác định"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "Có"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "Không"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "Có, Không, Có thể"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] ""
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr "%s MB"
+msgstr ""
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr "%s GB"
+msgstr ""
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr ""
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr ""
#: utils/dateformat.py:42
msgid "p.m."
@@ -865,134 +867,122 @@ msgstr "Tháng 12"
#: utils/dates.py:31
msgctxt "abbrev. month"
msgid "Jan."
-msgstr "Tháng 1"
+msgstr ""
#: utils/dates.py:32
msgctxt "abbrev. month"
msgid "Feb."
-msgstr "Tháng 2"
+msgstr ""
#: utils/dates.py:33
msgctxt "abbrev. month"
msgid "March"
-msgstr "Tháng 3"
+msgstr ""
#: utils/dates.py:34
msgctxt "abbrev. month"
msgid "April"
-msgstr "Tháng 4"
+msgstr ""
#: utils/dates.py:35
msgctxt "abbrev. month"
msgid "May"
-msgstr "Tháng 5"
+msgstr ""
#: utils/dates.py:36
msgctxt "abbrev. month"
msgid "June"
-msgstr "Tháng 6"
+msgstr ""
#: utils/dates.py:37
msgctxt "abbrev. month"
msgid "July"
-msgstr "Tháng 7"
+msgstr ""
#: utils/dates.py:38
msgctxt "abbrev. month"
msgid "Aug."
-msgstr "Tháng 8"
+msgstr ""
#: utils/dates.py:39
msgctxt "abbrev. month"
msgid "Sept."
-msgstr "Tháng 9"
+msgstr ""
#: utils/dates.py:40
msgctxt "abbrev. month"
msgid "Oct."
-msgstr "Tháng 10"
+msgstr ""
#: utils/dates.py:41
msgctxt "abbrev. month"
msgid "Nov."
-msgstr "Tháng 11"
+msgstr ""
#: utils/dates.py:42
msgctxt "abbrev. month"
msgid "Dec."
-msgstr "Tháng 12"
+msgstr ""
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
-msgstr "Tháng 1"
+msgstr ""
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
-msgstr "Tháng 2"
+msgstr ""
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
-msgstr "Tháng 3"
+msgstr ""
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
-msgstr "Tháng 4"
+msgstr ""
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
-msgstr "Tháng 5"
+msgstr ""
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
-msgstr "Tháng 6"
+msgstr ""
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
-msgstr "Tháng 7"
+msgstr ""
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
-msgstr "Tháng 8"
+msgstr ""
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
-msgstr "Tháng 9"
+msgstr ""
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
-msgstr "Tháng 10"
+msgstr ""
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
-msgstr "Tháng 11"
+msgstr ""
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
-msgstr "Tháng 12"
+msgstr ""
#: utils/text.py:136
msgid "or"
@@ -1047,23 +1037,23 @@ msgstr ""
msgid ", %(number)d %(type)s"
msgstr ""
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "N j, Y"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "N j, Y, P"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "P"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "F Y"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "F j"
@@ -1081,3 +1071,55 @@ msgstr "%(verbose_name)s đã được cập nhật thành công."
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s đã bị xóa."
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s đã bị xóa."
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s đã được cập nhật thành công."
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
index bd92ebdad9..d014b429b1 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
index 32fcdd6310..87099b9c60 100644
--- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_CN/LC_MESSAGES/django.po
@@ -1,20 +1,18 @@
-# This file is distributed under the same license as the django package.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:02+0100\n"
-"PO-Revision-Date: 2009-07-23 11:47+0800\n"
-"Last-Translator: Qing Feng <paradise.qingfeng@gmail.com>\n"
-"Language-Team: Simplified Chinese <paradise.qingfeng@gmail.com>\n"
+"POT-Creation-Date: 2011-02-28 17:38+0100\n"
+"PO-Revision-Date: 2011-02-27 05:02+0000\n"
+"Last-Translator: schemacs <schemacs@gmail.com>\n"
+"Language-Team: Chinese (China) <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Chinese\n"
-"X-Poedit-Country: CHINA\n"
-"X-Poedit-SourceCharset: utf-8\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
msgid "Arabic"
@@ -29,9 +27,8 @@ msgid "Bengali"
msgstr "孟加拉语"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "爱沙尼亚语"
+msgstr "波斯尼亚语"
#: conf/global_settings.py:48
msgid "Catalan"
@@ -62,314 +59,311 @@ msgid "English"
msgstr "英语"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "英语"
+msgstr "英国英语"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "西班牙语"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "阿根廷的西班牙语"
+msgstr "阿根廷西班牙语"
#: conf/global_settings.py:58
+#, fuzzy
+msgid "Mexican Spanish"
+msgstr "阿根廷西班牙语"
+
+#: conf/global_settings.py:59
msgid "Estonian"
msgstr "爱沙尼亚语"
-#: conf/global_settings.py:59
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "巴斯克语"
-#: conf/global_settings.py:60
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "波斯语"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "芬兰语"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "法语"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "菲仕兰"
+msgstr "夫里斯兰语"
-#: conf/global_settings.py:64
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "爱尔兰语"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "加利西亚语"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "希伯来语"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
msgstr "北印度语"
-#: conf/global_settings.py:68
+#: conf/global_settings.py:69
msgid "Croatian"
msgstr "克罗地亚语"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "匈牙利语"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "马其顿语"
+msgstr "印尼语"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "冰岛语"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "意大利语"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "日语"
-#: conf/global_settings.py:74
+#: conf/global_settings.py:75
msgid "Georgian"
msgstr "格鲁吉亚语"
-#: conf/global_settings.py:75
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "高棉语"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "埃纳德语"
-#: conf/global_settings.py:77
+#: conf/global_settings.py:78
msgid "Korean"
msgstr "韩语"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "立陶宛语"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "拉脱维亚语"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "马其顿语"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "马拉加"
+msgstr "马来亚拉姆语"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "马其顿语"
+msgstr "蒙古语"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "荷兰语"
-#: conf/global_settings.py:84
-msgid "Norwegian"
-msgstr "挪威语"
-
#: conf/global_settings.py:85
-#, fuzzy
-msgid "Norwegian Bokmal"
+msgid "Norwegian"
msgstr "挪威语"
#: conf/global_settings.py:86
-#, fuzzy
-msgid "Norwegian Nynorsk"
-msgstr "挪威语"
+msgid "Norwegian Bokmal"
+msgstr ""
#: conf/global_settings.py:87
-msgid "Punjabi"
+msgid "Norwegian Nynorsk"
msgstr ""
#: conf/global_settings.py:88
+msgid "Punjabi"
+msgstr "旁遮普语 "
+
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "波兰语"
-#: conf/global_settings.py:89
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "葡萄牙语"
-#: conf/global_settings.py:90
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "巴西葡萄牙语"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "罗马尼亚语"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "俄语"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "斯洛伐克语"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "斯洛文尼亚语"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "Alacant"
+msgstr "阿尔巴尼亚语"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "塞尔维亚语"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "塞尔维亚语"
+msgstr "塞尔维亚拉丁语"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "瑞典语"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "泰米尔语"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "泰卢固语"
-#: conf/global_settings.py:101
+#: conf/global_settings.py:102
msgid "Thai"
msgstr "泰语"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "土耳其语"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "乌克兰语"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "维也纳"
+msgstr "越南语"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "简体中文"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "繁体中文"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "输入一个有效的值。"
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "输入一个有效的 URL。"
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "URL %s 似乎是一个已损坏的链接。"
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "输入一个有效的 URL。"
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "输入一个有效的 e-mail 地址。"
-#: core/validators.py:123 forms/fields.py:958
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "输入一个有效的 'slug',由字母、数字、下划线或横线组成。"
-#: core/validators.py:126 forms/fields.py:951
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
msgstr "输入一个有效的 IPv4 地址。"
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "只能输入用逗号分隔的数字。"
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "确保该值最少为 %(min)d 个字符(其长度为 %(length)d)。"
+msgstr ""
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "这个值必须小于或等于 %s。"
+msgstr ""
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "这个值必须大于或等于 %s。"
+msgstr ""
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "确保该值最少为 %(min)d 个字符(其长度为 %(length)d)。"
+msgstr ""
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "确保该值最多为 %(max)d 个字符(其长度为 %(length)d)。"
+msgstr ""
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "在%(date_field)s %(lookup)s 需要唯一的 %(field_name)s"
-#: db/models/base.py:782 db/models/base.py:790
+#: db/models/base.py:784 db/models/base.py:792
#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "具有 %(field_label)s 的 %(model_name)s 已存在。"
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "和"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "值 %r 不是有效选项。"
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
msgstr "这个值不能为 null。"
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "这个值不能为 null。"
+msgstr "此字段不能为空。"
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "字段类型:%(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
@@ -432,14 +426,13 @@ msgid "E-mail address"
msgstr "E-mail 地址"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "文件路径"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "这个值必须是一个整数。"
+msgstr "该值必须为浮点数。"
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -447,7 +440,7 @@ msgstr "浮点数"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "大整数(8字节)"
#: db/models/fields/__init__.py:915
msgid "IP address"
@@ -481,24 +474,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML 文本"
-#: db/models/fields/related.py:804
-#, fuzzy, python-format
+#: db/models/fields/related.py:815
+#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr "具有主键 %(key)r 的对象 %(name)s 不存在。"
+msgstr "模型 %(model)s 的外键 %(pk)r 不存在。"
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "外键(由相关字段确定)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "一对一关系"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "多对多关系"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "按下 \"Control\",或者在Mac上按 \"Command\" 来选择多个值。"
@@ -555,14 +548,14 @@ msgid "The submitted file is empty."
msgstr "所提交的是空文件。"
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "确保该值最多为 %(max)d 个字符(其长度为 %(length)d)。"
+msgstr ""
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "请提交文件或勾选清除复选框,两者其一即可。"
#: forms/fields.py:518
msgid ""
@@ -575,29 +568,29 @@ msgstr "请上传一张有效的图片。您所上传的文件不是图片或者
msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "选择一个有效的选项。 %(value)s 不在可用的选项中。"
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "输入一系列值。"
-#: forms/formsets.py:308 forms/formsets.py:310
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "排序"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "删除"
-#: forms/models.py:575
+#: forms/models.py:554
#, python-format
msgid "Please correct the duplicate data for %(field)s."
msgstr "请修改%(field)s的重复数据"
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "请修改%(field)s的重复数据.这个字段必须唯一"
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
@@ -606,88 +599,86 @@ msgstr ""
"请修正%(field_name)s的重复数据。%(date_field)s %(lookup)s 在 %(field_name)s "
"必须保证唯一."
-#: forms/models.py:593
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
msgstr "请修正重复的数据."
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
msgstr "内联外键与父实例的主键不匹配。"
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "选择一个有效的选项: 该选择不在可用的选项中。"
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "选择一个有效的选项: '%s' 不在可用的选项中。"
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" 不是"
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
-msgstr "当前:"
+msgstr "目前"
#: forms/widgets.py:300
msgid "Change"
msgstr "修改"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "年"
+msgstr "清除"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "未知"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "是"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "否"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "是、否、也许"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
msgstr[0] "%(size)d 字节"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
msgstr "%s GB"
-#: template/defaultfilters.py:813
-#, fuzzy, python-format
+#: template/defaultfilters.py:808
+#, python-format
msgid "%s TB"
-msgstr "%s KB"
+msgstr "%s TB"
-#: template/defaultfilters.py:814
-#, fuzzy, python-format
+#: template/defaultfilters.py:809
+#, python-format
msgid "%s PB"
-msgstr "%s KB"
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
@@ -926,73 +917,61 @@ msgid "Dec."
msgstr "十二月"
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "一月"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "二月"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "三月"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "四月"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "五月"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "六月"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "七月"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "八月"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "九月"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "十月"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "十一月"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "十二月"
@@ -1050,23 +1029,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "Y-m-d"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "Y-m-d H:i:s"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i:s"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "Y-m"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "m-d"
@@ -1084,3 +1063,55 @@ msgstr "%(verbose_name)s 更新成功。"
#, python-format
msgid "The %(verbose_name)s was deleted."
msgstr "%(verbose_name)s 已被删除。"
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s 已被删除。"
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s 更新成功。"
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""
diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo
index 3b58ff615e..970a7adc9a 100644
--- a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo
+++ b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo
Binary files differ
diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.po b/django/conf/locale/zh_TW/LC_MESSAGES/django.po
index 411e975b0f..051b61515b 100644
--- a/django/conf/locale/zh_TW/LC_MESSAGES/django.po
+++ b/django/conf/locale/zh_TW/LC_MESSAGES/django.po
@@ -1,24 +1,24 @@
-# This file is distributed under the same license as the django package.
+# This file is distributed under the same license as the Django package.
#
msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-21 23:02+0100\n"
-"PO-Revision-Date: 2007-04-05 01:32+1000\n"
-"Last-Translator: Terry Huang <terryh.tp@gmail.com>\n"
-"Language-Team: Terry Huang <terryh.tp@gmail.com>\n"
+"POT-Creation-Date: 2011-02-28 17:38+0100\n"
+"PO-Revision-Date: 2011-02-22 00:09+0000\n"
+"Last-Translator: tcc <tcchou@tcchou.org>\n"
+"Language-Team: Chinese (Taiwan) <None>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Language: zh_TW\n"
+"Plural-Forms: nplurals=1; plural=0\n"
#: conf/global_settings.py:44
msgid "Arabic"
msgstr "阿拉伯語"
#: conf/global_settings.py:45
-#, fuzzy
msgid "Bulgarian"
msgstr "保加利亞語"
@@ -27,9 +27,8 @@ msgid "Bengali"
msgstr "孟加拉語"
#: conf/global_settings.py:47
-#, fuzzy
msgid "Bosnian"
-msgstr "羅馬尼亞語"
+msgstr "波士尼亞語"
#: conf/global_settings.py:48
msgid "Catalan"
@@ -60,326 +59,314 @@ msgid "English"
msgstr "英語"
#: conf/global_settings.py:55
-#, fuzzy
msgid "British English"
-msgstr "英語"
+msgstr "英國英語"
#: conf/global_settings.py:56
msgid "Spanish"
msgstr "西班牙語"
#: conf/global_settings.py:57
-#, fuzzy
msgid "Argentinian Spanish"
-msgstr "阿根廷的西班牙語"
+msgstr "阿根廷西班牙語"
#: conf/global_settings.py:58
#, fuzzy
-msgid "Estonian"
-msgstr "羅馬尼亞語"
+msgid "Mexican Spanish"
+msgstr "阿根廷西班牙語"
#: conf/global_settings.py:59
+msgid "Estonian"
+msgstr "愛沙尼亞語"
+
+#: conf/global_settings.py:60
msgid "Basque"
msgstr "巴斯克語"
-#: conf/global_settings.py:60
-#, fuzzy
+#: conf/global_settings.py:61
msgid "Persian"
msgstr "波斯語"
-#: conf/global_settings.py:61
+#: conf/global_settings.py:62
msgid "Finnish"
msgstr "芬蘭語"
-#: conf/global_settings.py:62
+#: conf/global_settings.py:63
msgid "French"
msgstr "法語"
-#: conf/global_settings.py:63
-#, fuzzy
+#: conf/global_settings.py:64
msgid "Frisian"
-msgstr "弗里斯蘭"
+msgstr "弗里斯蘭語"
-#: conf/global_settings.py:64
-#, fuzzy
+#: conf/global_settings.py:65
msgid "Irish"
msgstr "愛爾蘭語"
-#: conf/global_settings.py:65
+#: conf/global_settings.py:66
msgid "Galician"
msgstr "加里西亞語"
-#: conf/global_settings.py:66
+#: conf/global_settings.py:67
msgid "Hebrew"
msgstr "希伯來語"
-#: conf/global_settings.py:67
+#: conf/global_settings.py:68
msgid "Hindi"
-msgstr ""
+msgstr "印度語"
-#: conf/global_settings.py:68
-#, fuzzy
+#: conf/global_settings.py:69
msgid "Croatian"
-msgstr "嘉泰羅尼亞語"
+msgstr "克羅埃西亞語"
-#: conf/global_settings.py:69
+#: conf/global_settings.py:70
msgid "Hungarian"
msgstr "匈牙利語"
-#: conf/global_settings.py:70
-#, fuzzy
+#: conf/global_settings.py:71
msgid "Indonesian"
-msgstr "馬其頓語"
+msgstr "印尼語"
-#: conf/global_settings.py:71
+#: conf/global_settings.py:72
msgid "Icelandic"
msgstr "冰島語"
-#: conf/global_settings.py:72
+#: conf/global_settings.py:73
msgid "Italian"
msgstr "義大利語"
-#: conf/global_settings.py:73
+#: conf/global_settings.py:74
msgid "Japanese"
msgstr "日語"
-#: conf/global_settings.py:74
-#, fuzzy
+#: conf/global_settings.py:75
msgid "Georgian"
-msgstr "德語"
+msgstr "喬治亞語"
-#: conf/global_settings.py:75
-#, fuzzy
+#: conf/global_settings.py:76
msgid "Khmer"
msgstr "高棉語"
-#: conf/global_settings.py:76
+#: conf/global_settings.py:77
msgid "Kannada"
msgstr "坎那達語"
-#: conf/global_settings.py:77
-#, fuzzy
+#: conf/global_settings.py:78
msgid "Korean"
-msgstr "挪威語"
+msgstr "韓語"
-#: conf/global_settings.py:78
+#: conf/global_settings.py:79
msgid "Lithuanian"
msgstr "立陶宛語"
-#: conf/global_settings.py:79
+#: conf/global_settings.py:80
msgid "Latvian"
msgstr "拉脫維亞語"
-#: conf/global_settings.py:80
+#: conf/global_settings.py:81
msgid "Macedonian"
msgstr "馬其頓語"
-#: conf/global_settings.py:81
-#, fuzzy
+#: conf/global_settings.py:82
msgid "Malayalam"
-msgstr "左賀"
+msgstr "馬來亞拉姆語"
-#: conf/global_settings.py:82
-#, fuzzy
+#: conf/global_settings.py:83
msgid "Mongolian"
-msgstr "馬其頓語"
+msgstr "蒙古語"
-#: conf/global_settings.py:83
+#: conf/global_settings.py:84
msgid "Dutch"
msgstr "荷蘭語"
-#: conf/global_settings.py:84
+#: conf/global_settings.py:85
msgid "Norwegian"
msgstr "挪威語"
-#: conf/global_settings.py:85
-#, fuzzy
+#: conf/global_settings.py:86
msgid "Norwegian Bokmal"
-msgstr "挪威語"
+msgstr "挪威語(波克默爾)"
-#: conf/global_settings.py:86
-#, fuzzy
+#: conf/global_settings.py:87
msgid "Norwegian Nynorsk"
-msgstr "挪威語"
+msgstr "挪威語(尼諾斯克)"
-#: conf/global_settings.py:87
+#: conf/global_settings.py:88
msgid "Punjabi"
-msgstr ""
+msgstr "旁遮普語"
-#: conf/global_settings.py:88
+#: conf/global_settings.py:89
msgid "Polish"
msgstr "波蘭嶼"
-#: conf/global_settings.py:89
-#, fuzzy
+#: conf/global_settings.py:90
msgid "Portuguese"
msgstr "葡萄牙語"
-#: conf/global_settings.py:90
-#, fuzzy
+#: conf/global_settings.py:91
msgid "Brazilian Portuguese"
msgstr "巴西葡萄牙語"
-#: conf/global_settings.py:91
+#: conf/global_settings.py:92
msgid "Romanian"
msgstr "羅馬尼亞語"
-#: conf/global_settings.py:92
+#: conf/global_settings.py:93
msgid "Russian"
msgstr "俄語"
-#: conf/global_settings.py:93
+#: conf/global_settings.py:94
msgid "Slovak"
msgstr "斯洛伐克語"
-#: conf/global_settings.py:94
+#: conf/global_settings.py:95
msgid "Slovenian"
msgstr "斯洛維尼亞語"
-#: conf/global_settings.py:95
-#, fuzzy
+#: conf/global_settings.py:96
msgid "Albanian"
-msgstr "阿利坎特"
+msgstr "阿爾巴尼亞語"
-#: conf/global_settings.py:96
+#: conf/global_settings.py:97
msgid "Serbian"
msgstr "塞爾維亞語"
-#: conf/global_settings.py:97
-#, fuzzy
+#: conf/global_settings.py:98
msgid "Serbian Latin"
-msgstr "塞爾維亞語"
+msgstr "塞爾維亞拉丁語"
-#: conf/global_settings.py:98
+#: conf/global_settings.py:99
msgid "Swedish"
msgstr "瑞典語"
-#: conf/global_settings.py:99
+#: conf/global_settings.py:100
msgid "Tamil"
msgstr "坦米爾語"
-#: conf/global_settings.py:100
+#: conf/global_settings.py:101
msgid "Telugu"
msgstr "泰盧固語"
-#: conf/global_settings.py:101
-#, fuzzy
+#: conf/global_settings.py:102
msgid "Thai"
-msgstr "坦米爾語"
+msgstr "泰語"
-#: conf/global_settings.py:102
+#: conf/global_settings.py:103
msgid "Turkish"
msgstr "土耳其語"
-#: conf/global_settings.py:103
+#: conf/global_settings.py:104
msgid "Ukrainian"
msgstr "烏克蘭語"
-#: conf/global_settings.py:104
-#, fuzzy
+#: conf/global_settings.py:105
+msgid "Urdu"
+msgstr ""
+
+#: conf/global_settings.py:106
msgid "Vietnamese"
-msgstr "維也納州"
+msgstr "越南語"
-#: conf/global_settings.py:105
+#: conf/global_settings.py:107
msgid "Simplified Chinese"
msgstr "簡體中文"
-#: conf/global_settings.py:106
+#: conf/global_settings.py:108
msgid "Traditional Chinese"
msgstr "繁體中文"
-#: core/validators.py:20 forms/fields.py:67
+#: core/validators.py:21 forms/fields.py:67
msgid "Enter a valid value."
msgstr "輸入有效的值"
-#: core/validators.py:87 forms/fields.py:574
-msgid "Enter a valid URL."
-msgstr "輸入有效的URL"
-
#: core/validators.py:89 forms/fields.py:575
msgid "This URL appears to be a broken link."
msgstr "URL %s 似乎是是斷掉的連結。"
-#: core/validators.py:120 forms/fields.py:449
+#: core/validators.py:94 forms/fields.py:574
+msgid "Enter a valid URL."
+msgstr "輸入有效的URL"
+
+#: core/validators.py:138 forms/fields.py:449
msgid "Enter a valid e-mail address."
msgstr "輸入有效的電子郵件地址。"
-#: core/validators.py:123 forms/fields.py:958
-#, fuzzy
+#: core/validators.py:141 forms/fields.py:958
msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "輸入一個有效的 'slug',由字母、數字、底線與連字號組成。"
-#: core/validators.py:126 forms/fields.py:951
-#, fuzzy
+#: core/validators.py:144 forms/fields.py:951
msgid "Enter a valid IPv4 address."
-msgstr "輸入有效的 IPv4 地址。"
+msgstr "輸入有效的 IPv4 位址。"
-#: core/validators.py:129 db/models/fields/__init__.py:575
+#: core/validators.py:147 db/models/fields/__init__.py:575
msgid "Enter only digits separated by commas."
msgstr "輸入以逗號分隔的數字。"
-#: core/validators.py:135
-#, fuzzy, python-format
+#: core/validators.py:153
+#, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
-msgstr "確定你輸入的值最少為 %(min)d 個字(其長度為 %(length)d)。"
+msgstr "確認這個是否為 %(limit_value)s (目前是 %(show_value)s)."
-#: core/validators.py:153 forms/fields.py:222 forms/fields.py:275
-#, fuzzy, python-format
+#: core/validators.py:171 forms/fields.py:222 forms/fields.py:275
+#, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s."
-msgstr "這個值必须小於或等於 %s。"
+msgstr "確認這個數值是否小於或等於 %(limit_value)s。"
-#: core/validators.py:158 forms/fields.py:223 forms/fields.py:276
-#, fuzzy, python-format
+#: core/validators.py:176 forms/fields.py:223 forms/fields.py:276
+#, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s."
-msgstr "這個值必须大於或等於 %s。"
+msgstr "確認這個數值是否大於或等於 %(limit_value)s。"
-#: core/validators.py:164
-#, fuzzy, python-format
+#: core/validators.py:182
+#, python-format
msgid ""
"Ensure this value has at least %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "確定你輸入的值最少為 %(min)d 個字(其長度為 %(length)d)。"
+msgstr ""
+"請確認這個內容至少要 %(limit_value)d 個字元 (目前有 %(show_value)d 個字)。"
-#: core/validators.py:170
-#, fuzzy, python-format
+#: core/validators.py:188
+#, python-format
msgid ""
"Ensure this value has at most %(limit_value)d characters (it has %"
"(show_value)d)."
-msgstr "確定你輸入的值最多為 %(max)d 個字(其長度為 %(length)d)。"
+msgstr ""
+"請確認這個內容最多只能有 %(limit_value)d 個字元 (目前有 %(show_value)d 個"
+"字)。"
-#: db/models/base.py:767
+#: db/models/base.py:769
#, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
-msgstr ""
+msgstr "%(date_field)s 的 %(lookup)s 在 %(field_name)s 必須是唯一的。"
-#: db/models/base.py:782 db/models/base.py:790
-#, fuzzy, python-format
+#: db/models/base.py:784 db/models/base.py:792
+#, python-format
msgid "%(model_name)s with this %(field_label)s already exists."
-msgstr "%(model_name)s 有 %(field_label)s 已經存在。"
+msgstr "這個 %(field_label)s 在 %(model_name)s 已經存在。"
-#: db/models/base.py:789 forms/models.py:581
+#: db/models/base.py:791 forms/models.py:560
msgid "and"
msgstr "和"
#: db/models/fields/__init__.py:63
#, python-format
msgid "Value %r is not a valid choice."
-msgstr ""
+msgstr "數值 %r 並非是一個有效的選擇"
#: db/models/fields/__init__.py:64
msgid "This field cannot be null."
msgstr "這個值不能是 null。"
#: db/models/fields/__init__.py:65
-#, fuzzy
msgid "This field cannot be blank."
-msgstr "這個值不能是 null。"
+msgstr "這個欄位不能留白"
#: db/models/fields/__init__.py:70
#, python-format
msgid "Field of type: %(field_type)s"
-msgstr ""
+msgstr "欄位型態: %(field_type)s"
#: db/models/fields/__init__.py:451 db/models/fields/__init__.py:871
#: db/models/fields/__init__.py:980 db/models/fields/__init__.py:991
@@ -400,9 +387,9 @@ msgid "Boolean (Either True or False)"
msgstr "布林值 (True 或 False)"
#: db/models/fields/__init__.py:542 db/models/fields/__init__.py:1001
-#, fuzzy, python-format
+#, python-format
msgid "String (up to %(max_length)s)"
-msgstr "字串(最長 %(max_length)s)"
+msgstr "字串 (最長到 %(max_length)s 個字)"
#: db/models/fields/__init__.py:570
msgid "Comma-separated integers"
@@ -422,7 +409,6 @@ msgid "Invalid date: %s"
msgstr "無效的日期: %s"
#: db/models/fields/__init__.py:670
-#, fuzzy
msgid "Enter a valid date/time in YYYY-MM-DD HH:MM[:ss[.uuuuuu]] format."
msgstr "輸入一個 YYYY-MM-DD HH:MM[:ss[.uuuuuu]] 格式的有效日期/時間。"
@@ -431,27 +417,25 @@ msgid "Date (with time)"
msgstr "日期 (包括時間)"
#: db/models/fields/__init__.py:746
-#, fuzzy
msgid "This value must be a decimal number."
-msgstr "這個值必須是小數。"
+msgstr "這資料必須是十進位數。"
#: db/models/fields/__init__.py:748
msgid "Decimal number"
-msgstr "小數"
+msgstr "十進位數(小數可)"
#: db/models/fields/__init__.py:803
msgid "E-mail address"
msgstr "電子郵件地址"
#: db/models/fields/__init__.py:818 db/models/fields/files.py:220
-#: db/models/fields/files.py:339
+#: db/models/fields/files.py:326
msgid "File path"
msgstr "檔案路徑"
#: db/models/fields/__init__.py:841
-#, fuzzy
msgid "This value must be a float."
-msgstr "這個值必須是整數。"
+msgstr "這個值必須是一個浮點數。"
#: db/models/fields/__init__.py:843
msgid "Floating point number"
@@ -459,7 +443,7 @@ msgstr "浮點數"
#: db/models/fields/__init__.py:902
msgid "Big (8 byte) integer"
-msgstr ""
+msgstr "大整數(8位元組)"
#: db/models/fields/__init__.py:915
msgid "IP address"
@@ -482,9 +466,8 @@ msgid "Time"
msgstr "時間"
#: db/models/fields/__init__.py:1044
-#, fuzzy
msgid "Enter a valid time in HH:MM[:ss[.uuuuuu]] format."
-msgstr "輸入 HH:MM[:ss[.uuuuuu]] 格式的有效時間格式。"
+msgstr "輸入一個 HH:MM[:ss[.uuuuuu]] 格式的有效時間。"
#: db/models/fields/__init__.py:1120
msgid "URL"
@@ -494,24 +477,24 @@ msgstr "URL"
msgid "XML text"
msgstr "XML 文件"
-#: db/models/fields/related.py:804
+#: db/models/fields/related.py:815
#, python-format
msgid "Model %(model)s with pk %(pk)r does not exist."
-msgstr ""
+msgstr "PK 為 %(pk)r 的 Model %(model)s 不存在。"
-#: db/models/fields/related.py:806
+#: db/models/fields/related.py:817
msgid "Foreign Key (type determined by related field)"
-msgstr ""
+msgstr "外鍵 (型態由關連欄位決定)"
-#: db/models/fields/related.py:928
+#: db/models/fields/related.py:941
msgid "One-to-one relationship"
-msgstr ""
+msgstr "一對一關連"
-#: db/models/fields/related.py:990
+#: db/models/fields/related.py:1003
msgid "Many-to-many relationship"
-msgstr ""
+msgstr "多對多關連"
-#: db/models/fields/related.py:1010
+#: db/models/fields/related.py:1023
msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "按住 \"Control\", 或者在 Mac 上按 \"Command\", 以選取更多值"
@@ -525,7 +508,6 @@ msgid "Enter a whole number."
msgstr "輸入整數"
#: forms/fields.py:253 forms/fields.py:274
-#, fuzzy
msgid "Enter a number."
msgstr "輸入一個數字"
@@ -558,7 +540,7 @@ msgstr "輸入有效的日期/時間"
#: forms/fields.py:460
msgid "No file was submitted. Check the encoding type on the form."
-msgstr "没有檔案被送出。請檢查表單的編碼類型。"
+msgstr "沒有檔案被送出。請檢查表單的編碼類型。"
#: forms/fields.py:461
msgid "No file was submitted."
@@ -569,14 +551,14 @@ msgid "The submitted file is empty."
msgstr "送出的檔案是空的。"
#: forms/fields.py:463
-#, fuzzy, python-format
+#, python-format
msgid ""
"Ensure this filename has at most %(max)d characters (it has %(length)d)."
-msgstr "確定你輸入的值最多為 %(max)d 個字(其長度為 %(length)d)。"
+msgstr "請確認這個檔名最多只能有 %(max)d 個字元 (它現在是 %(length)d 個字)。"
#: forms/fields.py:464
msgid "Please either submit a file or check the clear checkbox, not both."
-msgstr ""
+msgstr "請提交一個檔案或確認清除核可項, 不能兩者都做。"
#: forms/fields.py:518
msgid ""
@@ -585,65 +567,63 @@ msgid ""
msgstr "上傳一個有效的圖片。你上傳的檔案不是圖片,否則就是壞掉的圖。"
#: forms/fields.py:650 forms/fields.py:725
-#, fuzzy, python-format
+#, python-format
msgid "Select a valid choice. %(value)s is not one of the available choices."
-msgstr "選擇一個有效的選項: '%(value)s' 不在可用的選項中。"
+msgstr "請選擇有效的項目, %(value)s 不是一個可用的選擇。"
-#: forms/fields.py:726 forms/fields.py:814 forms/models.py:1018
+#: forms/fields.py:726 forms/fields.py:814 forms/models.py:983
msgid "Enter a list of values."
msgstr "輸入一個列表的值"
-#: forms/formsets.py:308 forms/formsets.py:310
-#, fuzzy
+#: forms/formsets.py:305 forms/formsets.py:307
msgid "Order"
msgstr "排序"
-#: forms/formsets.py:312
+#: forms/formsets.py:309
msgid "Delete"
msgstr "刪除"
-#: forms/models.py:575
-#, fuzzy, python-format
+#: forms/models.py:554
+#, python-format
msgid "Please correct the duplicate data for %(field)s."
-msgstr "请更正下面的錯誤。"
+msgstr "請修正 %(field)s 的重覆資料"
-#: forms/models.py:579
+#: forms/models.py:558
#, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique."
-msgstr ""
+msgstr "請修正 %(field)s 的重覆資料, 必須為唯一值"
-#: forms/models.py:585
+#: forms/models.py:564
#, python-format
msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s."
msgstr ""
+"請修正 %(field_name)s 重複資料, %(date_field)s 的 %(lookup)s 必須是唯一值。"
-#: forms/models.py:593
-#, fuzzy
+#: forms/models.py:572
msgid "Please correct the duplicate values below."
-msgstr "请更正下面的錯誤。"
+msgstr "請修正下方重覆的數值"
-#: forms/models.py:868
+#: forms/models.py:833
msgid "The inline foreign key did not match the parent instance primary key."
-msgstr ""
+msgstr "內含的外鍵無法連接到對應的上層實體主鍵。"
-#: forms/models.py:929
+#: forms/models.py:894
msgid "Select a valid choice. That choice is not one of the available choices."
-msgstr "選擇有效的選項: 此選擇不在可用的选项中。"
+msgstr "選擇有效的選項: 此選擇不在可用的選項中。"
-#: forms/models.py:1019
+#: forms/models.py:984
#, python-format
msgid "Select a valid choice. %s is not one of the available choices."
msgstr "選擇一個有效的選項: '%s' 不在可用的選項中。"
-#: forms/models.py:1021
+#: forms/models.py:986
#, python-format
msgid "\"%s\" is not a valid value for a primary key."
-msgstr ""
+msgstr "\"%s\" 不是一個主鍵的有效資料。"
#: forms/widgets.py:299
-#, fuzzy
msgid "Currently"
msgstr "目前"
@@ -652,72 +632,71 @@ msgid "Change"
msgstr "變更"
#: forms/widgets.py:301
-#, fuzzy
msgid "Clear"
-msgstr "年"
+msgstr "清除"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Unknown"
msgstr "未知"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "Yes"
msgstr "是"
-#: forms/widgets.py:547
+#: forms/widgets.py:548
msgid "No"
msgstr "否"
-#: template/defaultfilters.py:774
+#: template/defaultfilters.py:767
msgid "yes,no,maybe"
msgstr "是、否、也許"
-#: template/defaultfilters.py:805
+#: template/defaultfilters.py:795 template/defaultfilters.py:800
#, python-format
msgid "%(size)d byte"
msgid_plural "%(size)d bytes"
-msgstr[0] ""
+msgstr[0] "%(size)d 位元組"
-#: template/defaultfilters.py:807
+#: template/defaultfilters.py:802
#, python-format
msgid "%s KB"
-msgstr ""
+msgstr "%s KB"
-#: template/defaultfilters.py:809
+#: template/defaultfilters.py:804
#, python-format
msgid "%s MB"
-msgstr ""
+msgstr "%s MB"
-#: template/defaultfilters.py:811
+#: template/defaultfilters.py:806
#, python-format
msgid "%s GB"
-msgstr ""
+msgstr "%s GB"
-#: template/defaultfilters.py:813
+#: template/defaultfilters.py:808
#, python-format
msgid "%s TB"
-msgstr ""
+msgstr "%s TB"
-#: template/defaultfilters.py:814
+#: template/defaultfilters.py:809
#, python-format
msgid "%s PB"
-msgstr ""
+msgstr "%s PB"
#: utils/dateformat.py:42
msgid "p.m."
-msgstr ""
+msgstr "p.m."
#: utils/dateformat.py:43
msgid "a.m."
-msgstr ""
+msgstr "a.m."
#: utils/dateformat.py:48
msgid "PM"
-msgstr ""
+msgstr "PM"
#: utils/dateformat.py:49
msgid "AM"
-msgstr ""
+msgstr "AM"
#: utils/dateformat.py:98
msgid "midnight"
@@ -756,12 +735,10 @@ msgid "Sunday"
msgstr "星期日"
#: utils/dates.py:10
-#, fuzzy
msgid "Mon"
msgstr "星期一"
#: utils/dates.py:10
-#, fuzzy
msgid "Tue"
msgstr "星期二"
@@ -774,17 +751,14 @@ msgid "Thu"
msgstr "星期四"
#: utils/dates.py:10
-#, fuzzy
msgid "Fri"
msgstr "星期五"
#: utils/dates.py:11
-#, fuzzy
msgid "Sat"
msgstr "星期六"
#: utils/dates.py:11
-#, fuzzy
msgid "Sun"
msgstr "星期日"
@@ -945,86 +919,73 @@ msgid "Dec."
msgstr "十二月"
#: utils/dates.py:45
-#, fuzzy
msgctxt "alt. month"
msgid "January"
msgstr "一月"
#: utils/dates.py:46
-#, fuzzy
msgctxt "alt. month"
msgid "February"
msgstr "二月"
#: utils/dates.py:47
-#, fuzzy
msgctxt "alt. month"
msgid "March"
msgstr "三月"
#: utils/dates.py:48
-#, fuzzy
msgctxt "alt. month"
msgid "April"
msgstr "四月"
#: utils/dates.py:49
-#, fuzzy
msgctxt "alt. month"
msgid "May"
msgstr "五月"
#: utils/dates.py:50
-#, fuzzy
msgctxt "alt. month"
msgid "June"
msgstr "六月"
#: utils/dates.py:51
-#, fuzzy
msgctxt "alt. month"
msgid "July"
msgstr "七月"
#: utils/dates.py:52
-#, fuzzy
msgctxt "alt. month"
msgid "August"
msgstr "八月"
#: utils/dates.py:53
-#, fuzzy
msgctxt "alt. month"
msgid "September"
msgstr "九月"
#: utils/dates.py:54
-#, fuzzy
msgctxt "alt. month"
msgid "October"
msgstr "十月"
#: utils/dates.py:55
-#, fuzzy
msgctxt "alt. month"
msgid "November"
msgstr "十一月"
#: utils/dates.py:56
-#, fuzzy
msgctxt "alt. month"
msgid "December"
msgstr "十二月"
#: utils/text.py:136
-#, fuzzy
msgid "or"
msgstr "或"
#. Translators: This string is used as a separator between list elements
#: utils/text.py:153
msgid ", "
-msgstr ""
+msgstr ", "
#: utils/timesince.py:21
msgid "year"
@@ -1057,7 +1018,6 @@ msgid_plural "minutes"
msgstr[0] "分鐘"
#: utils/timesince.py:45
-#, fuzzy
msgid "minutes"
msgstr "分鐘"
@@ -1071,23 +1031,23 @@ msgstr "%(number)d %(type)s"
msgid ", %(number)d %(type)s"
msgstr ", %(number)d %(type)s"
-#: utils/translation/trans_real.py:562
+#: utils/translation/trans_real.py:568
msgid "DATE_FORMAT"
msgstr "Y-m-d"
-#: utils/translation/trans_real.py:563
+#: utils/translation/trans_real.py:569
msgid "DATETIME_FORMAT"
msgstr "Y-m-d H:i:s"
-#: utils/translation/trans_real.py:564
+#: utils/translation/trans_real.py:570
msgid "TIME_FORMAT"
msgstr "H:i:s"
-#: utils/translation/trans_real.py:585
+#: utils/translation/trans_real.py:591
msgid "YEAR_MONTH_FORMAT"
msgstr "Y-m"
-#: utils/translation/trans_real.py:586
+#: utils/translation/trans_real.py:592
msgid "MONTH_DAY_FORMAT"
msgstr "m-d"
@@ -1104,4 +1064,56 @@ msgstr "%(verbose_name)s 變更成功。"
#: views/generic/create_update.py:207
#, python-format
msgid "The %(verbose_name)s was deleted."
-msgstr "%(verbose_name)s 已被删除。"
+msgstr "%(verbose_name)s 已被刪除。"
+
+#: views/generic/dates.py:33
+msgid "No year specified"
+msgstr ""
+
+#: views/generic/dates.py:58
+msgid "No month specified"
+msgstr ""
+
+#: views/generic/dates.py:99
+msgid "No day specified"
+msgstr ""
+
+#: views/generic/dates.py:138
+msgid "No week specified"
+msgstr ""
+
+#: views/generic/dates.py:198 views/generic/dates.py:214
+#, fuzzy, python-format
+msgid "No %(verbose_name_plural)s available"
+msgstr "%(verbose_name)s 已被刪除。"
+
+#: views/generic/dates.py:466
+#, python-format
+msgid ""
+"Future %(verbose_name_plural)s not available because %(class_name)s."
+"allow_future is False."
+msgstr ""
+
+#: views/generic/dates.py:500
+#, python-format
+msgid "Invalid date string '%(datestr)s' given format '%(format)s'"
+msgstr ""
+
+#: views/generic/detail.py:51
+#, fuzzy, python-format
+msgid "No %(verbose_name)s found matching the query"
+msgstr "%(verbose_name)s 變更成功。"
+
+#: views/generic/list.py:47
+msgid "Page is not 'last', nor can it be converted to an int."
+msgstr ""
+
+#: views/generic/list.py:52
+#, python-format
+msgid "Invalid page (%(page_number)s)"
+msgstr ""
+
+#: views/generic/list.py:119
+#, python-format
+msgid "Empty list and '%(class_name)s.allow_empty' is False."
+msgstr ""